From 12bbc1d1d69d008d87a2e47c3a39d66eccfe5bfd Mon Sep 17 00:00:00 2001 From: alandefreitas Date: Wed, 20 Nov 2024 16:54:27 -0300 Subject: [PATCH] fix(HandlebarsGenerator): sync HTML helper templates --- .../generator/adoc/layouts/index.adoc.hbs | 2 +- .../generator/adoc/partials/markup/a.adoc.hbs | 1 + .../adoc/partials/markup/code.adoc.hbs | 1 + .../generator/adoc/partials/markup/h.adoc.hbs | 1 + .../generator/adoc/partials/markup/p.adoc.hbs | 2 + .../adoc/partials/markup/span.adoc.hbs | 1 + .../adoc/partials/markup/table.adoc.hbs | 4 + .../adoc/partials/markup/tbody.adoc.hbs | 1 + .../adoc/partials/markup/td.adoc.hbs | 1 + .../adoc/partials/markup/th.adoc.hbs | 1 + .../adoc/partials/markup/thead.adoc.hbs | 2 + .../adoc/partials/markup/tr.adoc.hbs | 1 + .../adoc/partials/types/info-list.adoc.hbs | 11 - .../adoc/partials/types/info-member.adoc.hbs | 9 - .../adoc/partials/types/name-info.adoc.hbs | 7 - .../partials/types/qualified-path.adoc.hbs | 8 - .../adoc/partials/types/source.adoc.hbs | 2 - .../types/special-name-suffix.adoc.hbs | 9 - .../generator/common/partials/symbol.hbs | 1 + .../partials/types/declarator-after.hbs} | 0 .../partials/types/declarator-before.hbs} | 0 .../partials/types/declarator-id.hbs} | 2 +- .../partials/types/declarator.hbs} | 0 .../common/partials/types/info-list.hbs | 17 + .../common/partials/types/info-member.hbs | 15 + .../partials/types/name-info.hbs} | 4 +- .../partials/types/nested-name-specifier.hbs} | 0 .../partials/types/qualified-path.hbs} | 2 +- .../common/partials/types/source.hbs | 16 + .../partials/types/special-name-suffix.hbs | 18 + .../partials/types/template-arg.hbs} | 0 .../partials/types/template-args.hbs} | 0 .../partials/types/template-head.hbs} | 0 .../partials/types/template-param.hbs} | 0 .../partials/types/tranche.hbs} | 0 .../generator/html/layouts/index.html.hbs | 2 +- .../generator/html/partials/markup/a.html.hbs | 1 + .../html/partials/markup/code.html.hbs | 1 + .../generator/html/partials/markup/h.html.hbs | 1 + .../generator/html/partials/markup/p.html.hbs | 4 + .../html/partials/markup/span.html.hbs | 4 + .../html/partials/markup/table.html.hbs | 4 + .../html/partials/markup/tbody.html.hbs | 4 + .../html/partials/markup/td.html.hbs | 4 + .../html/partials/markup/th.html.hbs | 1 + .../html/partials/markup/thead.html.hbs | 4 + .../html/partials/markup/tr.html.hbs | 4 + .../partials/types/declarator-after.html.hbs | 16 - .../partials/types/declarator-before.html.hbs | 18 - .../partials/types/declarator-id.html.hbs | 11 - .../html/partials/types/declarator.html.hbs | 6 - .../html/partials/types/info-list.html.hbs | 23 - .../html/partials/types/info-member.html.hbs | 15 - .../types/nested-name-specifier.html.hbs | 8 - .../html/partials/types/source.html.hbs | 7 - .../types/special-name-suffix.html.hbs | 11 - .../html/partials/types/template-arg.html.hbs | 9 - .../partials/types/template-args.html.hbs | 5 - .../partials/types/template-head.html.hbs | 5 - .../partials/types/template-param.html.hbs | 14 - .../html/partials/types/tranche.html.hbs | 18 - test-files/golden-tests/alias-template.adoc | 35 +- test-files/golden-tests/alias-template.html | 141 +- test-files/golden-tests/attributes_1.adoc | 8 +- test-files/golden-tests/attributes_1.html | 44 +- test-files/golden-tests/brief-1.adoc | 13 +- test-files/golden-tests/brief-1.html | 63 +- test-files/golden-tests/brief-2.adoc | 33 +- test-files/golden-tests/brief-2.html | 123 +- test-files/golden-tests/canonical_1.adoc | 45 +- test-files/golden-tests/canonical_1.html | 167 +- .../class-template-partial-spec.adoc | 38 +- .../class-template-partial-spec.html | 128 +- .../golden-tests/class-template-spec.adoc | 152 +- .../golden-tests/class-template-spec.html | 562 ++- .../class-template-specializations-1.adoc | 792 ++-- .../class-template-specializations-1.html | 3251 ++++++++--------- .../class-template-specializations-2.adoc | 137 +- .../class-template-specializations-2.html | 443 ++- .../class-template-specializations-3.adoc | 202 +- .../class-template-specializations-3.html | 542 ++- test-files/golden-tests/class-template.adoc | 185 +- test-files/golden-tests/class-template.html | 659 ++-- test-files/golden-tests/commands.adoc | 8 +- test-files/golden-tests/commands.html | 48 +- test-files/golden-tests/concept.adoc | 24 +- test-files/golden-tests/concept.html | 126 +- .../golden-tests/dependency-propagation.adoc | 42 +- .../golden-tests/dependency-propagation.html | 169 +- test-files/golden-tests/duplicate-jdoc.adoc | 33 +- test-files/golden-tests/duplicate-jdoc.html | 123 +- test-files/golden-tests/empty.html | 2 +- test-files/golden-tests/enum.adoc | 39 +- test-files/golden-tests/enum.html | 99 +- .../golden-tests/explicit-conv-operator.adoc | 65 +- .../golden-tests/explicit-conv-operator.html | 267 +- test-files/golden-tests/explicit-ctor.adoc | 129 +- test-files/golden-tests/explicit-ctor.html | 287 +- .../golden-tests/explicit-deduct-guide.adoc | 33 +- .../golden-tests/explicit-deduct-guide.html | 135 +- .../explicit-object-parameter.adoc | 26 +- .../explicit-object-parameter.html | 91 +- .../golden-tests/filters/blacklist_0.adoc | 103 +- .../golden-tests/filters/blacklist_0.html | 393 +- .../golden-tests/filters/blacklist_test.adoc | 25 +- .../golden-tests/filters/blacklist_test.html | 101 +- test-files/golden-tests/filters/filters.adoc | 269 +- test-files/golden-tests/filters/filters.html | 1129 +++--- .../golden-tests/filters/whitelist_0.adoc | 128 +- .../golden-tests/filters/whitelist_0.html | 510 ++- .../golden-tests/filters/whitelist_test.adoc | 35 +- .../golden-tests/filters/whitelist_test.html | 151 +- test-files/golden-tests/friend-1.adoc | 24 +- test-files/golden-tests/friend-1.html | 138 +- test-files/golden-tests/friend-2.adoc | 24 +- test-files/golden-tests/friend-2.html | 138 +- test-files/golden-tests/friend-3.adoc | 39 +- test-files/golden-tests/friend-3.html | 197 +- test-files/golden-tests/friend-4.adoc | 39 +- test-files/golden-tests/friend-4.html | 197 +- test-files/golden-tests/friend-5.adoc | 39 +- test-files/golden-tests/friend-5.html | 189 +- test-files/golden-tests/friend-6.adoc | 47 +- test-files/golden-tests/friend-6.html | 235 +- .../golden-tests/function-parm-decay.adoc | 40 +- .../golden-tests/function-parm-decay.html | 142 +- .../golden-tests/function-template.adoc | 65 +- .../golden-tests/function-template.html | 211 +- .../golden-tests/function-tparm-decay.adoc | 40 +- .../golden-tests/function-tparm-decay.html | 142 +- .../implicit-instantiation-member-ref.adoc | 141 +- .../implicit-instantiation-member-ref.html | 443 ++- test-files/golden-tests/local-class.adoc | 16 +- test-files/golden-tests/local-class.html | 88 +- test-files/golden-tests/mem-fn.adoc | 305 +- test-files/golden-tests/mem-fn.html | 1207 +++--- .../golden-tests/namespace-alias-1.adoc | 8 +- .../golden-tests/namespace-alias-1.html | 46 +- .../golden-tests/namespace-alias-2.adoc | 8 +- .../golden-tests/namespace-alias-2.html | 47 +- .../golden-tests/namespace-alias-3.adoc | 8 +- .../golden-tests/namespace-alias-3.html | 47 +- test-files/golden-tests/namespace.adoc | 206 +- test-files/golden-tests/namespace.html | 917 +++-- .../golden-tests/nested-private-template.adoc | 29 +- .../golden-tests/nested-private-template.html | 111 +- .../golden-tests/no_unique_address.adoc | 34 +- .../golden-tests/no_unique_address.html | 120 +- test-files/golden-tests/noreturn.adoc | 44 +- test-files/golden-tests/noreturn.html | 222 +- test-files/golden-tests/ns-variables.adoc | 58 +- test-files/golden-tests/ns-variables.html | 206 +- .../golden-tests/out-of-line-record-def.adoc | 18 +- .../golden-tests/out-of-line-record-def.html | 89 +- test-files/golden-tests/overloaded-op-1.adoc | 18 +- test-files/golden-tests/overloaded-op-1.html | 88 +- test-files/golden-tests/overloaded-op-2.adoc | 18 +- test-files/golden-tests/overloaded-op-2.html | 88 +- test-files/golden-tests/para-1.adoc | 25 +- test-files/golden-tests/para-1.html | 91 +- test-files/golden-tests/para-2.adoc | 8 +- test-files/golden-tests/para-2.html | 48 +- test-files/golden-tests/param-direction.adoc | 53 +- test-files/golden-tests/param-direction.html | 183 +- test-files/golden-tests/param.adoc | 23 +- test-files/golden-tests/param.html | 87 +- test-files/golden-tests/pre-post.adoc | 8 +- test-files/golden-tests/pre-post.html | 44 +- test-files/golden-tests/record-1.adoc | 73 +- test-files/golden-tests/record-1.html | 253 +- test-files/golden-tests/record-access.adoc | 110 +- test-files/golden-tests/record-access.html | 472 ++- test-files/golden-tests/record-data.adoc | 169 +- test-files/golden-tests/record-data.html | 555 ++- .../golden-tests/record-inheritance.adoc | 85 +- .../golden-tests/record-inheritance.html | 303 +- test-files/golden-tests/ref.adoc | 398 +- test-files/golden-tests/ref.html | 1106 +++--- test-files/golden-tests/requires-clause.adoc | 27 +- test-files/golden-tests/requires-clause.html | 105 +- .../spec-mem-implicit-instantiation.adoc | 84 +- .../spec-mem-implicit-instantiation.html | 342 +- .../static-data-def-constexpr.adoc | 35 +- .../static-data-def-constexpr.html | 149 +- test-files/golden-tests/static-data-def.adoc | 103 +- test-files/golden-tests/static-data-def.html | 313 +- .../golden-tests/static-data-template.adoc | 38 +- .../golden-tests/static-data-template.html | 116 +- .../golden-tests/temp/c_mct_expl_inline.adoc | 49 +- .../golden-tests/temp/c_mct_expl_inline.html | 189 +- .../golden-tests/temp/c_mct_expl_outside.adoc | 49 +- .../golden-tests/temp/c_mct_expl_outside.html | 189 +- .../golden-tests/temp/c_mft_expl_inline.adoc | 28 +- .../golden-tests/temp/c_mft_expl_inline.html | 91 +- .../golden-tests/temp/c_mft_expl_outside.adoc | 28 +- .../golden-tests/temp/c_mft_expl_outside.html | 91 +- test-files/golden-tests/temp/ct_expl.adoc | 37 +- test-files/golden-tests/temp/ct_expl.html | 149 +- test-files/golden-tests/temp/ct_mc.adoc | 28 +- test-files/golden-tests/temp/ct_mc.html | 136 +- .../golden-tests/temp/ct_mc_expl_outside.adoc | 28 +- .../golden-tests/temp/ct_mc_expl_outside.html | 136 +- test-files/golden-tests/temp/ct_mct.adoc | 28 +- test-files/golden-tests/temp/ct_mct.html | 136 +- .../golden-tests/temp/ct_mct_expl_inline.adoc | 49 +- .../golden-tests/temp/ct_mct_expl_inline.html | 189 +- .../temp/ct_mct_expl_outside.adoc | 28 +- .../temp/ct_mct_expl_outside.html | 136 +- test-files/golden-tests/temp/ct_mf.adoc | 18 +- test-files/golden-tests/temp/ct_mf.html | 88 +- .../golden-tests/temp/ct_mf_expl_outside.adoc | 18 +- .../golden-tests/temp/ct_mf_expl_outside.html | 88 +- test-files/golden-tests/temp/ct_mft.adoc | 18 +- test-files/golden-tests/temp/ct_mft.html | 88 +- .../golden-tests/temp/ct_mft_expl_inline.adoc | 28 +- .../golden-tests/temp/ct_mft_expl_inline.html | 91 +- .../temp/ct_mft_expl_outside.adoc | 18 +- .../temp/ct_mft_expl_outside.html | 88 +- test-files/golden-tests/temp/ft_expl.adoc | 14 +- test-files/golden-tests/temp/ft_expl.html | 45 +- test-files/golden-tests/type-resolution.adoc | 260 +- test-files/golden-tests/type-resolution.html | 814 ++--- test-files/golden-tests/union.adoc | 60 +- test-files/golden-tests/union.html | 194 +- test-files/golden-tests/using-1.adoc | 16 +- test-files/golden-tests/using-1.html | 45 +- test-files/golden-tests/using-2.adoc | 27 +- test-files/golden-tests/using-2.html | 112 +- test-files/golden-tests/using-3.adoc | 67 +- test-files/golden-tests/using-3.html | 262 +- test-files/golden-tests/utf-8.adoc | 8 +- test-files/golden-tests/utf-8.html | 44 +- test-files/golden-tests/var-template.adoc | 62 +- test-files/golden-tests/var-template.html | 186 +- .../golden-tests/variadic-function.adoc | 35 +- .../golden-tests/variadic-function.html | 137 +- 236 files changed, 14323 insertions(+), 15076 deletions(-) create mode 100644 share/mrdocs/addons/generator/adoc/partials/markup/a.adoc.hbs create mode 100644 share/mrdocs/addons/generator/adoc/partials/markup/code.adoc.hbs create mode 100644 share/mrdocs/addons/generator/adoc/partials/markup/h.adoc.hbs create mode 100644 share/mrdocs/addons/generator/adoc/partials/markup/p.adoc.hbs create mode 100644 share/mrdocs/addons/generator/adoc/partials/markup/span.adoc.hbs create mode 100644 share/mrdocs/addons/generator/adoc/partials/markup/table.adoc.hbs create mode 100644 share/mrdocs/addons/generator/adoc/partials/markup/tbody.adoc.hbs create mode 100644 share/mrdocs/addons/generator/adoc/partials/markup/td.adoc.hbs create mode 100644 share/mrdocs/addons/generator/adoc/partials/markup/th.adoc.hbs create mode 100644 share/mrdocs/addons/generator/adoc/partials/markup/thead.adoc.hbs create mode 100644 share/mrdocs/addons/generator/adoc/partials/markup/tr.adoc.hbs delete mode 100644 share/mrdocs/addons/generator/adoc/partials/types/info-list.adoc.hbs delete mode 100644 share/mrdocs/addons/generator/adoc/partials/types/info-member.adoc.hbs delete mode 100644 share/mrdocs/addons/generator/adoc/partials/types/name-info.adoc.hbs delete mode 100644 share/mrdocs/addons/generator/adoc/partials/types/qualified-path.adoc.hbs delete mode 100644 share/mrdocs/addons/generator/adoc/partials/types/source.adoc.hbs delete mode 100644 share/mrdocs/addons/generator/adoc/partials/types/special-name-suffix.adoc.hbs create mode 100644 share/mrdocs/addons/generator/common/partials/symbol.hbs rename share/mrdocs/addons/generator/{adoc/partials/types/declarator-after.adoc.hbs => common/partials/types/declarator-after.hbs} (100%) rename share/mrdocs/addons/generator/{adoc/partials/types/declarator-before.adoc.hbs => common/partials/types/declarator-before.hbs} (100%) rename share/mrdocs/addons/generator/{adoc/partials/types/declarator-id.adoc.hbs => common/partials/types/declarator-id.hbs} (79%) rename share/mrdocs/addons/generator/{adoc/partials/types/declarator.adoc.hbs => common/partials/types/declarator.hbs} (100%) create mode 100644 share/mrdocs/addons/generator/common/partials/types/info-list.hbs create mode 100644 share/mrdocs/addons/generator/common/partials/types/info-member.hbs rename share/mrdocs/addons/generator/{html/partials/types/name-info.html.hbs => common/partials/types/name-info.hbs} (64%) rename share/mrdocs/addons/generator/{adoc/partials/types/nested-name-specifier.adoc.hbs => common/partials/types/nested-name-specifier.hbs} (100%) rename share/mrdocs/addons/generator/{html/partials/types/qualified-path.html.hbs => common/partials/types/qualified-path.hbs} (67%) create mode 100644 share/mrdocs/addons/generator/common/partials/types/source.hbs create mode 100644 share/mrdocs/addons/generator/common/partials/types/special-name-suffix.hbs rename share/mrdocs/addons/generator/{adoc/partials/types/template-arg.adoc.hbs => common/partials/types/template-arg.hbs} (100%) rename share/mrdocs/addons/generator/{adoc/partials/types/template-args.adoc.hbs => common/partials/types/template-args.hbs} (100%) rename share/mrdocs/addons/generator/{adoc/partials/types/template-head.adoc.hbs => common/partials/types/template-head.hbs} (100%) rename share/mrdocs/addons/generator/{adoc/partials/types/template-param.adoc.hbs => common/partials/types/template-param.hbs} (100%) rename share/mrdocs/addons/generator/{adoc/partials/types/tranche.adoc.hbs => common/partials/types/tranche.hbs} (100%) create mode 100644 share/mrdocs/addons/generator/html/partials/markup/a.html.hbs create mode 100644 share/mrdocs/addons/generator/html/partials/markup/code.html.hbs create mode 100644 share/mrdocs/addons/generator/html/partials/markup/h.html.hbs create mode 100644 share/mrdocs/addons/generator/html/partials/markup/p.html.hbs create mode 100644 share/mrdocs/addons/generator/html/partials/markup/span.html.hbs create mode 100644 share/mrdocs/addons/generator/html/partials/markup/table.html.hbs create mode 100644 share/mrdocs/addons/generator/html/partials/markup/tbody.html.hbs create mode 100644 share/mrdocs/addons/generator/html/partials/markup/td.html.hbs create mode 100644 share/mrdocs/addons/generator/html/partials/markup/th.html.hbs create mode 100644 share/mrdocs/addons/generator/html/partials/markup/thead.html.hbs create mode 100644 share/mrdocs/addons/generator/html/partials/markup/tr.html.hbs delete mode 100644 share/mrdocs/addons/generator/html/partials/types/declarator-after.html.hbs delete mode 100644 share/mrdocs/addons/generator/html/partials/types/declarator-before.html.hbs delete mode 100644 share/mrdocs/addons/generator/html/partials/types/declarator-id.html.hbs delete mode 100644 share/mrdocs/addons/generator/html/partials/types/declarator.html.hbs delete mode 100644 share/mrdocs/addons/generator/html/partials/types/info-list.html.hbs delete mode 100644 share/mrdocs/addons/generator/html/partials/types/info-member.html.hbs delete mode 100644 share/mrdocs/addons/generator/html/partials/types/nested-name-specifier.html.hbs delete mode 100644 share/mrdocs/addons/generator/html/partials/types/source.html.hbs delete mode 100644 share/mrdocs/addons/generator/html/partials/types/special-name-suffix.html.hbs delete mode 100644 share/mrdocs/addons/generator/html/partials/types/template-arg.html.hbs delete mode 100644 share/mrdocs/addons/generator/html/partials/types/template-args.html.hbs delete mode 100644 share/mrdocs/addons/generator/html/partials/types/template-head.html.hbs delete mode 100644 share/mrdocs/addons/generator/html/partials/types/template-param.html.hbs delete mode 100644 share/mrdocs/addons/generator/html/partials/types/tranche.html.hbs diff --git a/share/mrdocs/addons/generator/adoc/layouts/index.adoc.hbs b/share/mrdocs/addons/generator/adoc/layouts/index.adoc.hbs index 44f3f1131..72b42d602 100644 --- a/share/mrdocs/addons/generator/adoc/layouts/index.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/layouts/index.adoc.hbs @@ -2,4 +2,4 @@ {{#if relfileprefix}}:relfileprefix: {{relfileprefix}}{{/if}} [#{{sectionref}}] -{{> (concat 'symbols' '/' (lookup symbol 'kind')) symbol=symbol}} +{{> symbol symbol=symbol}} diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/a.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/a.adoc.hbs new file mode 100644 index 000000000..56c4b9d65 --- /dev/null +++ b/share/mrdocs/addons/generator/adoc/partials/markup/a.adoc.hbs @@ -0,0 +1 @@ +xref:{{href}}[{{> @partial-block }}] \ No newline at end of file diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/code.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/code.adoc.hbs new file mode 100644 index 000000000..39fd0fdaf --- /dev/null +++ b/share/mrdocs/addons/generator/adoc/partials/markup/code.adoc.hbs @@ -0,0 +1 @@ +`{{> @partial-block }}` \ No newline at end of file diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/h.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/h.adoc.hbs new file mode 100644 index 000000000..2f509771f --- /dev/null +++ b/share/mrdocs/addons/generator/adoc/partials/markup/h.adoc.hbs @@ -0,0 +1 @@ +={{select level (repeat "=" level) (select @root.config.multipage "==" "=")}} {{> @partial-block }} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/p.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/p.adoc.hbs new file mode 100644 index 000000000..dc593b566 --- /dev/null +++ b/share/mrdocs/addons/generator/adoc/partials/markup/p.adoc.hbs @@ -0,0 +1,2 @@ +{{> @partial-block }} + diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/span.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/span.adoc.hbs new file mode 100644 index 000000000..9770a5168 --- /dev/null +++ b/share/mrdocs/addons/generator/adoc/partials/markup/span.adoc.hbs @@ -0,0 +1 @@ +{{#if class}}[.{{class}}]#{{/if}}{{> @partial-block }}{{#if class}}#{{/if}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/table.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/table.adoc.hbs new file mode 100644 index 000000000..ff448d720 --- /dev/null +++ b/share/mrdocs/addons/generator/adoc/partials/markup/table.adoc.hbs @@ -0,0 +1,4 @@ +[{{#if cols}}cols={{cols}}{{/if}}] +|=== +{{> @partial-block }} +|=== diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/tbody.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/tbody.adoc.hbs new file mode 100644 index 000000000..3b48505b3 --- /dev/null +++ b/share/mrdocs/addons/generator/adoc/partials/markup/tbody.adoc.hbs @@ -0,0 +1 @@ +{{> @partial-block }} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/td.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/td.adoc.hbs new file mode 100644 index 000000000..e741192dd --- /dev/null +++ b/share/mrdocs/addons/generator/adoc/partials/markup/td.adoc.hbs @@ -0,0 +1 @@ +| {{> @partial-block }} diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/th.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/th.adoc.hbs new file mode 100644 index 000000000..5b6025d90 --- /dev/null +++ b/share/mrdocs/addons/generator/adoc/partials/markup/th.adoc.hbs @@ -0,0 +1 @@ +| {{> @partial-block }} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/thead.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/thead.adoc.hbs new file mode 100644 index 000000000..dc593b566 --- /dev/null +++ b/share/mrdocs/addons/generator/adoc/partials/markup/thead.adoc.hbs @@ -0,0 +1,2 @@ +{{> @partial-block }} + diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/tr.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/tr.adoc.hbs new file mode 100644 index 000000000..029dd901b --- /dev/null +++ b/share/mrdocs/addons/generator/adoc/partials/markup/tr.adoc.hbs @@ -0,0 +1 @@ +{{> @partial-block }} diff --git a/share/mrdocs/addons/generator/adoc/partials/types/info-list.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/types/info-list.adoc.hbs deleted file mode 100644 index accc3fcd9..000000000 --- a/share/mrdocs/addons/generator/adoc/partials/types/info-list.adoc.hbs +++ /dev/null @@ -1,11 +0,0 @@ -{{! List the "members" of a symbol as a table }} -{{#if members}} -=={{#unless @root.config.multipage}}={{/unless}} {{title}} -[cols=2,separator=¦] -|=== -¦Name ¦Description -{{#each (sort_by members "name")}} -{{>types/info-member .}} -{{/each}} -|=== -{{/if}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/adoc/partials/types/info-member.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/types/info-member.adoc.hbs deleted file mode 100644 index 43ff2950d..000000000 --- a/share/mrdocs/addons/generator/adoc/partials/types/info-member.adoc.hbs +++ /dev/null @@ -1,9 +0,0 @@ -{{! 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/adoc/partials/types/name-info.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/types/name-info.adoc.hbs deleted file mode 100644 index c42827aac..000000000 --- a/share/mrdocs/addons/generator/adoc/partials/types/name-info.adoc.hbs +++ /dev/null @@ -1,7 +0,0 @@ -{{! Renders a name info object }} -{{#if prefix~}} -{{>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}}{{>types/template-args args=args nolink=nolink}}{{/if~}}{{/if~}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/adoc/partials/types/qualified-path.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/types/qualified-path.adoc.hbs deleted file mode 100644 index 1ba51002c..000000000 --- a/share/mrdocs/addons/generator/adoc/partials/types/qualified-path.adoc.hbs +++ /dev/null @@ -1,8 +0,0 @@ -{{! 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)}}xref:{{symbol.ref}}[{{symbol.name}}]{{else}}{{symbol.name}}{{/if}}::{{/if~}} -{{/unless}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/adoc/partials/types/source.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/types/source.adoc.hbs deleted file mode 100644 index c97ffda63..000000000 --- a/share/mrdocs/addons/generator/adoc/partials/types/source.adoc.hbs +++ /dev/null @@ -1,2 +0,0 @@ -{{! 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/adoc/partials/types/special-name-suffix.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/types/special-name-suffix.adoc.hbs deleted file mode 100644 index 08e471c34..000000000 --- a/share/mrdocs/addons/generator/adoc/partials/types/special-name-suffix.adoc.hbs +++ /dev/null @@ -1,9 +0,0 @@ -{{! 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]# -{{~/if~}} -{{else if (eq kind "field")~}} -{{#if isVariant}}[.small]#[variant member]#{{/if~}} -{{/if}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/common/partials/symbol.hbs b/share/mrdocs/addons/generator/common/partials/symbol.hbs new file mode 100644 index 000000000..7075f0119 --- /dev/null +++ b/share/mrdocs/addons/generator/common/partials/symbol.hbs @@ -0,0 +1 @@ +{{> (concat 'symbols' '/' (lookup symbol 'kind')) symbol=symbol }} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/adoc/partials/types/declarator-after.adoc.hbs b/share/mrdocs/addons/generator/common/partials/types/declarator-after.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/types/declarator-after.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/types/declarator-after.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/types/declarator-before.adoc.hbs b/share/mrdocs/addons/generator/common/partials/types/declarator-before.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/types/declarator-before.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/types/declarator-before.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/types/declarator-id.adoc.hbs b/share/mrdocs/addons/generator/common/partials/types/declarator-id.hbs similarity index 79% rename from share/mrdocs/addons/generator/adoc/partials/types/declarator-id.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/types/declarator-id.hbs index c9d1f9755..250aea603 100644 --- a/share/mrdocs/addons/generator/adoc/partials/types/declarator-id.adoc.hbs +++ b/share/mrdocs/addons/generator/common/partials/types/declarator-id.hbs @@ -4,7 +4,7 @@ {{else if (eq kind "guide")~}} {{>types/declarator deduced nolink=nolink~}} {{else~}} - {{#if (and link.ref (not nolink))}}xref:{{link.ref}}[pass:[{{name}}]]{{else}}{{name}}{{/if~}} + {{#if (and link.ref (not nolink))}}{{#>markup/a href=link.ref}}{{name}}{{/markup/a}}{{else}}{{name}}{{/if~}} {{#if (or (eq template.kind "explicit") (eq template.kind "partial"))~}} {{>types/template-args args=template.args nolink=nolink~}} {{/if~}} diff --git a/share/mrdocs/addons/generator/adoc/partials/types/declarator.adoc.hbs b/share/mrdocs/addons/generator/common/partials/types/declarator.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/types/declarator.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/types/declarator.hbs diff --git a/share/mrdocs/addons/generator/common/partials/types/info-list.hbs b/share/mrdocs/addons/generator/common/partials/types/info-list.hbs new file mode 100644 index 000000000..acb85c94f --- /dev/null +++ b/share/mrdocs/addons/generator/common/partials/types/info-list.hbs @@ -0,0 +1,17 @@ +{{! List the "members" field of a symbol as a table with the symbol name and brief for each member. }} +{{#if members}} +{{#>markup/h level=(select @root.config.multipage 1 2)}}{{title}}{{/markup/h}} +{{#>markup/table cols=2}} +{{#>markup/thead}} +{{#>markup/tr~}} +{{#>markup/th}}Name{{/markup/th~}} +{{#>markup/th}}Description{{/markup/th}} +{{/markup/tr}} +{{/markup/thead}} +{{#>markup/tbody}} +{{#each (sort_by members "name")}} +{{>types/info-member .}} +{{/each}} +{{/markup/tbody}} +{{/markup/table}} +{{/if}} diff --git a/share/mrdocs/addons/generator/common/partials/types/info-member.hbs b/share/mrdocs/addons/generator/common/partials/types/info-member.hbs new file mode 100644 index 000000000..de908303a --- /dev/null +++ b/share/mrdocs/addons/generator/common/partials/types/info-member.hbs @@ -0,0 +1,15 @@ +{{! Helper for "info-list": renders a symbol as a row in a table of members }} +{{#>markup/tr~}} +{{#>markup/td~}} + {{#>markup/a href=ref}}{{#>markup/code}}{{>types/declarator-id . nolink=true}}{{/markup/code}}{{/markup/a}} {{>types/special-name-suffix .}} +{{~/markup/td}} +{{#>markup/td~}} + {{#if (ne kind "overload")~}} + {{~doc.brief}} + {{else~}} + {{#each (unique (pluck (pluck members "doc") "brief"))~}} + {{.}} + {{/each~}} + {{/if}} +{{~/markup/td}} +{{~/markup/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/common/partials/types/name-info.hbs similarity index 64% rename from share/mrdocs/addons/generator/html/partials/types/name-info.html.hbs rename to share/mrdocs/addons/generator/common/partials/types/name-info.hbs index c9e998813..ce6b968f7 100644 --- a/share/mrdocs/addons/generator/html/partials/types/name-info.html.hbs +++ b/share/mrdocs/addons/generator/common/partials/types/name-info.hbs @@ -2,6 +2,6 @@ {{#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))}}{{name}}{{else~}} +{{#if (or (eq name "see-below") (eq name "implementation-defined"))~}}{{ str '_'}}{{name}}{{ str '_'}}{{else~}} +{{#if (and symbol.ref (not nolink))}}{{#>markup/a href=symbol.ref}}{{name}}{{/markup/a}}{{else~}} {{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/adoc/partials/types/nested-name-specifier.adoc.hbs b/share/mrdocs/addons/generator/common/partials/types/nested-name-specifier.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/types/nested-name-specifier.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/types/nested-name-specifier.hbs diff --git a/share/mrdocs/addons/generator/html/partials/types/qualified-path.html.hbs b/share/mrdocs/addons/generator/common/partials/types/qualified-path.hbs similarity index 67% rename from share/mrdocs/addons/generator/html/partials/types/qualified-path.html.hbs rename to share/mrdocs/addons/generator/common/partials/types/qualified-path.hbs index 82adcf436..d65f141a9 100644 --- a/share/mrdocs/addons/generator/html/partials/types/qualified-path.html.hbs +++ b/share/mrdocs/addons/generator/common/partials/types/qualified-path.hbs @@ -4,5 +4,5 @@ {{>types/qualified-path symbol=symbol.parent nolink=nolink~}} {{else~}} {{/if~}} -{{#if symbol.name}}{{#if (not nolink)}}{{symbol.name}}{{else}}{{symbol.name}}{{/if}}::{{/if~}} +{{#if symbol.name}}{{#if (not nolink)}}{{#>markup/a href=symbol.ref}}{{symbol.name}}{{/markup/a}}{{else}}{{symbol.name}}{{/if}}::{{/if~}} {{/unless}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/common/partials/types/source.hbs b/share/mrdocs/addons/generator/common/partials/types/source.hbs new file mode 100644 index 000000000..2cfce3fb0 --- /dev/null +++ b/share/mrdocs/addons/generator/common/partials/types/source.hbs @@ -0,0 +1,16 @@ +{{! + Renders where the symbol is declared with a link + to the source file when the `base-url` config + option is defined +}} +{{#>markup/p}} +{{#>markup/span~}} + Declared in {{#>markup/code~}} + {{ str "<" }}{{#unless (and @root.config.base-url (eq dcl.kind "source"))~}} + {{dcl.file}} + {{~else~}} + {{#>markup/a href=(concat @root.config.base-url dcl.file '#L' dcl.line)}}{{dcl.file}}{{/markup/a}}> + {{~/unless~}}{{ str ">" }} + {{~/markup/code}} +{{~/markup/span}} +{{/markup/p}} diff --git a/share/mrdocs/addons/generator/common/partials/types/special-name-suffix.hbs b/share/mrdocs/addons/generator/common/partials/types/special-name-suffix.hbs new file mode 100644 index 000000000..dc3cc9d46 --- /dev/null +++ b/share/mrdocs/addons/generator/common/partials/types/special-name-suffix.hbs @@ -0,0 +1,18 @@ +{{! + 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")}} + {{#>markup/span class="small"}}[constructor]{{/markup/span}} + {{~else if (eq class "destructor")~}} + {{#>markup/span class="small"}}[destructor]{{/markup/span}} + {{~/if~}} +{{else if (eq kind "field")~}} + {{~#if isVariant~}} + {{#>markup/span class="small"}}[variant member]{{/markup/span}} + {{~/if~}} +{{~/if}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/adoc/partials/types/template-arg.adoc.hbs b/share/mrdocs/addons/generator/common/partials/types/template-arg.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/types/template-arg.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/types/template-arg.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/types/template-args.adoc.hbs b/share/mrdocs/addons/generator/common/partials/types/template-args.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/types/template-args.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/types/template-args.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/types/template-head.adoc.hbs b/share/mrdocs/addons/generator/common/partials/types/template-head.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/types/template-head.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/types/template-head.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/types/template-param.adoc.hbs b/share/mrdocs/addons/generator/common/partials/types/template-param.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/types/template-param.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/types/template-param.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/types/tranche.adoc.hbs b/share/mrdocs/addons/generator/common/partials/types/tranche.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/types/tranche.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/types/tranche.hbs diff --git a/share/mrdocs/addons/generator/html/layouts/index.html.hbs b/share/mrdocs/addons/generator/html/layouts/index.html.hbs index 1b45a7684..17c6ee8e2 100644 --- a/share/mrdocs/addons/generator/html/layouts/index.html.hbs +++ b/share/mrdocs/addons/generator/html/layouts/index.html.hbs @@ -1,2 +1,2 @@ {{! The section with a symbol in single page output or the symbol page in multi page output }} -{{> (concat 'symbols' '/' (lookup symbol 'kind')) symbol=symbol}} +{{> symbol symbol=symbol}} diff --git a/share/mrdocs/addons/generator/html/partials/markup/a.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/a.html.hbs new file mode 100644 index 000000000..a2eb31a84 --- /dev/null +++ b/share/mrdocs/addons/generator/html/partials/markup/a.html.hbs @@ -0,0 +1 @@ +{{> @partial-block }} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/markup/code.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/code.html.hbs new file mode 100644 index 000000000..4f6857b74 --- /dev/null +++ b/share/mrdocs/addons/generator/html/partials/markup/code.html.hbs @@ -0,0 +1 @@ +{{> @partial-block }} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/markup/h.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/h.html.hbs new file mode 100644 index 000000000..663e013cb --- /dev/null +++ b/share/mrdocs/addons/generator/html/partials/markup/h.html.hbs @@ -0,0 +1 @@ +{{> @partial-block }} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/markup/p.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/p.html.hbs new file mode 100644 index 000000000..370b133df --- /dev/null +++ b/share/mrdocs/addons/generator/html/partials/markup/p.html.hbs @@ -0,0 +1,4 @@ +

+ {{> @partial-block }} + +

diff --git a/share/mrdocs/addons/generator/html/partials/markup/span.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/span.html.hbs new file mode 100644 index 000000000..b6813ca43 --- /dev/null +++ b/share/mrdocs/addons/generator/html/partials/markup/span.html.hbs @@ -0,0 +1,4 @@ + + {{> @partial-block }} + + \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/markup/table.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/table.html.hbs new file mode 100644 index 000000000..7645419aa --- /dev/null +++ b/share/mrdocs/addons/generator/html/partials/markup/table.html.hbs @@ -0,0 +1,4 @@ + + {{> @partial-block }} + +
diff --git a/share/mrdocs/addons/generator/html/partials/markup/tbody.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/tbody.html.hbs new file mode 100644 index 000000000..7dfb65e4f --- /dev/null +++ b/share/mrdocs/addons/generator/html/partials/markup/tbody.html.hbs @@ -0,0 +1,4 @@ + + {{> @partial-block }} + + \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/markup/td.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/td.html.hbs new file mode 100644 index 000000000..146d0d5fd --- /dev/null +++ b/share/mrdocs/addons/generator/html/partials/markup/td.html.hbs @@ -0,0 +1,4 @@ + + {{> @partial-block }} + + \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/markup/th.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/th.html.hbs new file mode 100644 index 000000000..a0d769ca0 --- /dev/null +++ b/share/mrdocs/addons/generator/html/partials/markup/th.html.hbs @@ -0,0 +1 @@ +{{> @partial-block }} diff --git a/share/mrdocs/addons/generator/html/partials/markup/thead.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/thead.html.hbs new file mode 100644 index 000000000..15f35f663 --- /dev/null +++ b/share/mrdocs/addons/generator/html/partials/markup/thead.html.hbs @@ -0,0 +1,4 @@ + + {{> @partial-block }} + + diff --git a/share/mrdocs/addons/generator/html/partials/markup/tr.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/tr.html.hbs new file mode 100644 index 000000000..e1722dd45 --- /dev/null +++ b/share/mrdocs/addons/generator/html/partials/markup/tr.html.hbs @@ -0,0 +1,4 @@ + + {{> @partial-block }} + + \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/types/declarator-after.html.hbs b/share/mrdocs/addons/generator/html/partials/types/declarator-after.html.hbs deleted file mode 100644 index 4351dacfe..000000000 --- a/share/mrdocs/addons/generator/html/partials/types/declarator-after.html.hbs +++ /dev/null @@ -1,16 +0,0 @@ -{{! Helper for "declarator" partial }} -{{#if pointee-type~}} - {{#if (or (eq pointee-type.kind "array") (eq pointee-type.kind "function"))}}){{/if~}} - {{~>types/declarator-after pointee-type nolink=nolink~}} -{{else if (eq kind "array")~}} - [{{bounds-value}}] - {{~>types/declarator-after element-type nolink=nolink~}} -{{else if (eq kind "function")~}} - ({{#each param-types~}} - {{~>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~}} - {{~>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 deleted file mode 100644 index f46216c9e..000000000 --- a/share/mrdocs/addons/generator/html/partials/types/declarator-before.html.hbs +++ /dev/null @@ -1,18 +0,0 @@ -{{! 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 deleted file mode 100644 index cb24069c8..000000000 --- a/share/mrdocs/addons/generator/html/partials/types/declarator-id.html.hbs +++ /dev/null @@ -1,11 +0,0 @@ -{{! 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))}}{{name}}{{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 deleted file mode 100644 index dad2b1d44..000000000 --- a/share/mrdocs/addons/generator/html/partials/types/declarator.html.hbs +++ /dev/null @@ -1,6 +0,0 @@ -{{! 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/types/info-list.html.hbs b/share/mrdocs/addons/generator/html/partials/types/info-list.html.hbs deleted file mode 100644 index 76bb9280d..000000000 --- a/share/mrdocs/addons/generator/html/partials/types/info-list.html.hbs +++ /dev/null @@ -1,23 +0,0 @@ -{{! List the "members" of a symbol as a table }} -{{#if members}} -
-

{{title}}

- - - - - - - - - - - - - {{#each (sort_by members "name")}} - {{>types/info-member .}} - {{/each}} - -
NameDescription
-
-{{/if}} 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 deleted file mode 100644 index 95acf8f05..000000000 --- a/share/mrdocs/addons/generator/html/partials/types/info-member.html.hbs +++ /dev/null @@ -1,15 +0,0 @@ -{{! Helper for "info-list": renders a symbol as a row in a table of members }} - - - {{>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/html/partials/types/nested-name-specifier.html.hbs b/share/mrdocs/addons/generator/html/partials/types/nested-name-specifier.html.hbs deleted file mode 100644 index 83883cdc2..000000000 --- a/share/mrdocs/addons/generator/html/partials/types/nested-name-specifier.html.hbs +++ /dev/null @@ -1,8 +0,0 @@ -{{! 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/source.html.hbs b/share/mrdocs/addons/generator/html/partials/types/source.html.hbs deleted file mode 100644 index 429bee5cb..000000000 --- a/share/mrdocs/addons/generator/html/partials/types/source.html.hbs +++ /dev/null @@ -1,7 +0,0 @@ -{{! 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}}{{dcl.file}}{{/unless}}> - -

- 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 deleted file mode 100644 index 9eed9afd6..000000000 --- a/share/mrdocs/addons/generator/html/partials/types/special-name-suffix.html.hbs +++ /dev/null @@ -1,11 +0,0 @@ -{{! 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")}} - [constructor] - {{~else if (eq class "destructor")~}} - [destructor] - {{~/if~}} - {{else if (eq kind "field")~}} - {{#if isVariant}}[variant member]{{/if~}} -{{/if}} diff --git a/share/mrdocs/addons/generator/html/partials/types/template-arg.html.hbs b/share/mrdocs/addons/generator/html/partials/types/template-arg.html.hbs deleted file mode 100644 index e852d4e32..000000000 --- a/share/mrdocs/addons/generator/html/partials/types/template-arg.html.hbs +++ /dev/null @@ -1,9 +0,0 @@ -{{! Renders a template argument }} -{{#if (eq kind "type")~}} -{{~>types/declarator type nolink=nolink~}} -{{else if (eq kind "non-type")~}} -{{~value~}} -{{else if (eq kind "template")~}} -{{#if (and template (not nolink))}}xref:{{template.ref}}[{{name~}}]{{else~}}{{name~}}{{/if~}} -{{/if~}} -{{~#if is-pack}}...{{/if~}} 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 deleted file mode 100644 index d105b2916..000000000 --- a/share/mrdocs/addons/generator/html/partials/types/template-args.html.hbs +++ /dev/null @@ -1,5 +0,0 @@ -{{! 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 deleted file mode 100644 index a568240fb..000000000 --- a/share/mrdocs/addons/generator/html/partials/types/template-head.html.hbs +++ /dev/null @@ -1,5 +0,0 @@ -{{! 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 deleted file mode 100644 index 29ec26401..000000000 --- a/share/mrdocs/addons/generator/html/partials/types/template-param.html.hbs +++ /dev/null @@ -1,14 +0,0 @@ -{{! 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 deleted file mode 100644 index 11a8a4abd..000000000 --- a/share/mrdocs/addons/generator/html/partials/types/tranche.html.hbs +++ /dev/null @@ -1,18 +0,0 @@ -{{! 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/test-files/golden-tests/alias-template.adoc b/test-files/golden-tests/alias-template.adoc index 50b398f36..7f18cba1b 100644 --- a/test-files/golden-tests/alias-template.adoc +++ b/test-files/golden-tests/alias-template.adoc @@ -6,17 +6,22 @@ == Global namespace === Types -[cols=2,separator=¦] +[cols=2] |=== -¦Name ¦Description -¦xref:#A[`A`] ¦ - -¦xref:#B[`B`] ¦ - -¦xref:#C[`C`] ¦ - -¦xref:#D[`D`] ¦ - +| Name | Description + +| xref:#A[`A`] +| + +| xref:#B[`B`] +| + +| xref:#C[`C`] +| + +| xref:#D[`D`] +| + |=== @@ -97,11 +102,13 @@ struct D; ---- === Types -[cols=2,separator=¦] +[cols=2] |=== -¦Name ¦Description -¦xref:#D-E[`E`] ¦ +| Name | Description +| xref:#D-E[`E`] +| + |=== @@ -109,7 +116,7 @@ struct D; [#D-E] -== xref:#D[pass:[D]]::E +== xref:#D[D]::E diff --git a/test-files/golden-tests/alias-template.html b/test-files/golden-tests/alias-template.html index 1d32ee06e..8f63ee020 100644 --- a/test-files/golden-tests/alias-template.html +++ b/test-files/golden-tests/alias-template.html @@ -9,52 +9,49 @@

Global namespace

-
-

Types

- - - - - - - - - - - - +

Types

+
NameDescription
+ - - - - - - - - - - - - -
- A - - -
- B - - -
- C - - -
- D - - -
-
-
+ Name +Description + + + + + + + + A + + + + + + + B + + + + + + + C + + + + + + + D + + + + + + + +
@@ -71,7 +68,6 @@

Synopsis

Declared in

- 
@@ -81,7 +77,7 @@ 
Synopsis
-
+ @@ -100,7 +96,6 @@

Synopsis

Declared in

- 
@@ -112,7 +107,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -131,7 +126,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -156,7 +150,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -166,31 +159,28 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                E 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        E 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -209,7 +199,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/attributes_1.adoc b/test-files/golden-tests/attributes_1.adoc
index 4a2480b9d..6b2abddaf 100644
--- a/test-files/golden-tests/attributes_1.adoc
+++ b/test-files/golden-tests/attributes_1.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f[`f`]  ¦
+| Name | Description 
 
+| xref:#f[`f`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/attributes_1.html b/test-files/golden-tests/attributes_1.html
index f9e80eea2..88490793b 100644
--- a/test-files/golden-tests/attributes_1.html
+++ b/test-files/golden-tests/attributes_1.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-            

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
diff --git a/test-files/golden-tests/brief-1.adoc b/test-files/golden-tests/brief-1.adoc
index 83fd54c00..ebb53702b 100644
--- a/test-files/golden-tests/brief-1.adoc
+++ b/test-files/golden-tests/brief-1.adoc
@@ -6,20 +6,23 @@
 == Global namespace
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f5[`f5`]  ¦
+| Name | Description 
 
+| xref:#f5[`f5`] 
+| 
 brief
 *bold*
 it
 continues to the line.
 
-¦xref:#f6[`f6`]  ¦
-
+    
+| xref:#f6[`f6`] 
+| 
 brief
 
+    
 |===
 
 
diff --git a/test-files/golden-tests/brief-1.html b/test-files/golden-tests/brief-1.html
index f944281c2..551b7c45f 100644
--- a/test-files/golden-tests/brief-1.html
+++ b/test-files/golden-tests/brief-1.html
@@ -9,42 +9,39 @@
         
Global namespace

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
+
+
+
+                
+            
+
+                
+                    
-                            
-                                
-                                
+                
+                    
-                            
-                

                 

-                                    f5 
-                                
-
brief bold it continues to the line.

-                            
+                    		NameDescription

+                        f5 
+                    
+                        
brief bold it continues to the line.

+                        
 
-                                        
                

-                                    f6 
-                                
-
brief

                             
+                    

+                        f6 
+                    
+                        
brief

+                        
 
-                                        
        

-            

-            

+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -63,7 +60,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -93,7 +89,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
diff --git a/test-files/golden-tests/brief-2.adoc b/test-files/golden-tests/brief-2.adoc
index fefbf3381..940ec52a1 100644
--- a/test-files/golden-tests/brief-2.adoc
+++ b/test-files/golden-tests/brief-2.adoc
@@ -6,35 +6,42 @@
 == Global namespace
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f1[`f1`]  ¦
+| Name | Description 
 
+| xref:#f1[`f1`] 
+| 
 brief
 
-¦xref:#f2[`f2`]  ¦
-
+    
+| xref:#f2[`f2`] 
+| 
 brief
 
-¦xref:#f3[`f3`]  ¦
-
+    
+| xref:#f3[`f3`] 
+| 
 brief
 
-¦xref:#f4[`f4`]  ¦
-
+    
+| xref:#f4[`f4`] 
+| 
 brief                    x
 
-¦xref:#f5[`f5`]  ¦
-
+    
+| xref:#f5[`f5`] 
+| 
 br
 ief
 
-¦xref:#f6[`f6`]  ¦
-
+    
+| xref:#f6[`f6`] 
+| 
 br
 ief
 
+    
 |===
 
 
diff --git a/test-files/golden-tests/brief-2.html b/test-files/golden-tests/brief-2.html
index 3418ecb79..eb91edd32 100644
--- a/test-files/golden-tests/brief-2.html
+++ b/test-files/golden-tests/brief-2.html
@@ -9,78 +9,75 @@
         
Global namespace

     
     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
+
+
+
+                
+            
+
+                
+                    
-                            
-                                
-                                
+                
+                    
-                            
-                                
-                                
+                
+                    
-                            
-                                
-                                
+                
+                    
-                            
-                                
-                                
+                
+                    
-                            
-                                
-                                
+                
+                    
-                            
-                

                 

-                                    f1 
-                                
-
brief

-                            
+                    		NameDescription

+                        f1 
+                    
+                        
brief

+                        
 
-                                        
                

-                                    f2 
-                                
-
brief

                             
+                    

+                        f2 
+                    
+                        
brief

+                        
 
-                                        
                

-                                    f3 
-                                
-
brief

                             
+                    

+                        f3 
+                    
+                        
brief

+                        
 
-                                        
                

-                                    f4 
-                                
-
brief                    x

                             
+                    

+                        f4 
+                    
+                        
brief                    x

+                        
 
-                                        
                

-                                    f5 
-                                
-
br ief

                             
+                    

+                        f5 
+                    
+                        
br ief

+                        
 
-                                        
                

-                                    f6 
-                                
-
br ief

                             
+                    

+                        f6 
+                    
+                        
br ief

+                        
 
-                                        
        

-            

-            

+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -99,7 +96,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -129,7 +125,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -159,7 +154,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -189,7 +183,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -225,7 +218,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -255,7 +247,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/canonical_1.adoc b/test-files/golden-tests/canonical_1.adoc
index cca9d8ff2..589bb8867 100644
--- a/test-files/golden-tests/canonical_1.adoc
+++ b/test-files/golden-tests/canonical_1.adoc
@@ -6,25 +6,34 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
-
-¦xref:#B[`B`]  ¦
-
-¦xref:#Ba[`Ba`]  ¦
-
-¦xref:#Bx[`Bx`]  ¦
-
-¦xref:#a[`a`]  ¦
-
-¦xref:#b[`b`]  ¦
-
-¦xref:#bA[`bA`]  ¦
-
-¦xref:#ba[`ba`]  ¦
-
+| Name | Description 
+
+| xref:#A[`A`] 
+| 
+    
+| xref:#B[`B`] 
+| 
+    
+| xref:#Ba[`Ba`] 
+| 
+    
+| xref:#Bx[`Bx`] 
+| 
+    
+| xref:#a[`a`] 
+| 
+    
+| xref:#b[`b`] 
+| 
+    
+| xref:#bA[`bA`] 
+| 
+    
+| xref:#ba[`ba`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/canonical_1.html b/test-files/golden-tests/canonical_1.html
index 5b659d0e0..c964759a2 100644
--- a/test-files/golden-tests/canonical_1.html
+++ b/test-files/golden-tests/canonical_1.html
@@ -9,80 +9,77 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
                

-                                B 
-                            
-
-                                    
                

-                                Ba 
-                            
-
-                                    
                

-                                Bx 
-                            
-
-                                    
                

-                                a 
-                            
-
-                                    
                

-                                b 
-                            
-
-                                    
                

-                                bA 
-                            
-
-                                    
                

-                                ba 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+                    
+                        Ba 
+                    
+                        
+                            
+                    
+                
+                    
+                        Bx 
+                    
+                        
+                            
+                    
+                
+                    
+                        a 
+                    
+                        
+                            
+                    
+                
+                    
+                        b 
+                    
+                        
+                            
+                    
+                
+                    
+                        bA 
+                    
+                        
+                            
+                    
+                
+                    
+                        ba 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -99,7 +96,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -108,7 +104,7 @@ 
Synopsis

     

 
     

-                                                                                                                

+                            
 
 
 
@@ -127,7 +123,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -136,7 +131,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -155,7 +150,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -164,7 +158,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -183,7 +177,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -192,7 +185,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -211,7 +204,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -220,7 +212,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -239,7 +231,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -248,7 +239,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -267,7 +258,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -276,7 +266,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -295,7 +285,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -304,7 +293,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
diff --git a/test-files/golden-tests/class-template-partial-spec.adoc b/test-files/golden-tests/class-template-partial-spec.adoc
index a32c1988c..1c42caf4d 100644
--- a/test-files/golden-tests/class-template-partial-spec.adoc
+++ b/test-files/golden-tests/class-template-partial-spec.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
+| Name | Description 
 
+| xref:#A[`A`] 
+| 
+    
 |===
 
 
@@ -31,15 +33,19 @@ struct A;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-B-0a[`B`]  ¦
-
-¦xref:#A-B-06[`B`]  ¦
-
-¦xref:#A-B-04[`B`]  ¦
-
+| Name | Description 
+
+| xref:#A-B-0a[`B`] 
+| 
+    
+| xref:#A-B-06[`B`] 
+| 
+    
+| xref:#A-B-04[`B`] 
+| 
+    
 |===
 
 
@@ -47,7 +53,7 @@ struct A;
 
 
 [#A-B-0a]
-== xref:#A[pass:[A]]::B
+== xref:#A[A]::B
 
 
 
@@ -69,7 +75,7 @@ struct B;
 
 
 [#A-B-06]
-== xref:#A[pass:[A]]::B
+== xref:#A[A]::B
 
 
 
@@ -80,7 +86,7 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template
-struct xref:#A-B-0a[pass:[B]];
+struct xref:#A-B-0a[B];
 ----
 
 
@@ -89,7 +95,7 @@ struct xref:#A-B-0a[pass:[B]];
 
 
 [#A-B-04]
-== xref:#A[pass:[A]]::B
+== xref:#A[A]::B
 
 
 
@@ -100,7 +106,7 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
-struct xref:#A-B-0a[pass:[B]];
+struct xref:#A-B-0a[B];
 ----
 
 
diff --git a/test-files/golden-tests/class-template-partial-spec.html b/test-files/golden-tests/class-template-partial-spec.html
index d8ecc2013..f16b7e8ec 100644
--- a/test-files/golden-tests/class-template-partial-spec.html
+++ b/test-files/golden-tests/class-template-partial-spec.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -60,45 +56,42 @@ 
Synopsis

     

 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                B 
-                            
-
-                                    
                

-                                B 
-                            
-
-                                    
                

-                                B 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -117,7 +110,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -129,7 +121,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -148,7 +140,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -158,7 +149,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -177,7 +168,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -187,7 +177,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
diff --git a/test-files/golden-tests/class-template-spec.adoc b/test-files/golden-tests/class-template-spec.adoc
index d6fa64a39..24136bfe4 100644
--- a/test-files/golden-tests/class-template-spec.adoc
+++ b/test-files/golden-tests/class-template-spec.adoc
@@ -6,27 +6,37 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e[`A`]  ¦
-
-¦xref:#A-00[`A`]  ¦
-
-¦xref:#A-0c[`A`]  ¦
-
-¦xref:#B-00[`B`]  ¦
-
-¦xref:#B-07[`B`]  ¦
-
-¦xref:#B-06[`B`]  ¦
-
-¦xref:#C-0f[`C`]  ¦
-
-¦xref:#C-0a[`C`]  ¦
-
-¦xref:#C-0e[`C`]  ¦
-
+| Name | Description 
+
+| xref:#A-0e[`A`] 
+| 
+    
+| xref:#A-00[`A`] 
+| 
+    
+| xref:#A-0c[`A`] 
+| 
+    
+| xref:#B-00[`B`] 
+| 
+    
+| xref:#B-07[`B`] 
+| 
+    
+| xref:#B-06[`B`] 
+| 
+    
+| xref:#C-0f[`C`] 
+| 
+    
+| xref:#C-0a[`C`] 
+| 
+    
+| xref:#C-0e[`C`] 
+| 
+    
 |===
 
 
@@ -47,11 +57,13 @@ struct A;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e-f[`f`]  ¦
+| Name | Description 
 
+| xref:#A-0e-f[`f`] 
+| 
+    
 |===
 
 
@@ -59,7 +71,7 @@ struct A;
 
 
 [#A-0e-f]
-== xref:#A-0e[pass:[A]]::f
+== xref:#A-0e[A]::f
 
 
 
@@ -94,15 +106,17 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
-struct xref:#A-0e[pass:[A]];
+struct xref:#A-0e[A];
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-00-g[`g`]  ¦
+| Name | Description 
 
+| xref:#A-00-g[`g`] 
+| 
+    
 |===
 
 
@@ -110,7 +124,7 @@ struct xref:#A-0e[pass:[A]];
 
 
 [#A-00-g]
-== xref:#A-00[pass:[A]]::g
+== xref:#A-00[A]::g
 
 
 
@@ -145,15 +159,17 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
-struct xref:#A-0e[pass:[A]];
+struct xref:#A-0e[A];
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0c-h[`h`]  ¦
+| Name | Description 
 
+| xref:#A-0c-h[`h`] 
+| 
+    
 |===
 
 
@@ -161,7 +177,7 @@ struct xref:#A-0e[pass:[A]];
 
 
 [#A-0c-h]
-== xref:#A-0c[pass:[A]]::h
+== xref:#A-0c[A]::h
 
 
 
@@ -200,11 +216,13 @@ struct B;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#B-00-f[`f`]  ¦
+| Name | Description 
 
+| xref:#B-00-f[`f`] 
+| 
+    
 |===
 
 
@@ -212,7 +230,7 @@ struct B;
 
 
 [#B-00-f]
-== xref:#B-00[pass:[B]]::f
+== xref:#B-00[B]::f
 
 
 
@@ -247,15 +265,17 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template
-struct xref:#B-00[pass:[B]];
+struct xref:#B-00[B];
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#B-07-g[`g`]  ¦
+| Name | Description 
 
+| xref:#B-07-g[`g`] 
+| 
+    
 |===
 
 
@@ -263,7 +283,7 @@ struct xref:#B-00[pass:[B]];
 
 
 [#B-07-g]
-== xref:#B-07[pass:[B]]::g
+== xref:#B-07[B]::g
 
 
 
@@ -298,15 +318,17 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template
-struct xref:#B-00[pass:[B]];
+struct xref:#B-00[B];
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#B-06-h[`h`]  ¦
+| Name | Description 
 
+| xref:#B-06-h[`h`] 
+| 
+    
 |===
 
 
@@ -314,7 +336,7 @@ struct xref:#B-00[pass:[B]];
 
 
 [#B-06-h]
-== xref:#B-06[pass:[B]]::h
+== xref:#B-06[B]::h
 
 
 
@@ -355,11 +377,13 @@ struct C;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C-0f-f[`f`]  ¦
+| Name | Description 
 
+| xref:#C-0f-f[`f`] 
+| 
+    
 |===
 
 
@@ -367,7 +391,7 @@ struct C;
 
 
 [#C-0f-f]
-== xref:#C-0f[pass:[C]]::f
+== xref:#C-0f[C]::f
 
 
 
@@ -402,15 +426,17 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
-struct xref:#C-0f[pass:[C]];
+struct xref:#C-0f[C];
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C-0a-g[`g`]  ¦
+| Name | Description 
 
+| xref:#C-0a-g[`g`] 
+| 
+    
 |===
 
 
@@ -418,7 +444,7 @@ struct xref:#C-0f[pass:[C]];
 
 
 [#C-0a-g]
-== xref:#C-0a[pass:[C]]::g
+== xref:#C-0a[C]::g
 
 
 
@@ -453,15 +479,17 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template
-struct xref:#C-0f[pass:[C]];
+struct xref:#C-0f[C];
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C-0e-h[`h`]  ¦
+| Name | Description 
 
+| xref:#C-0e-h[`h`] 
+| 
+    
 |===
 
 
@@ -469,7 +497,7 @@ struct xref:#C-0f[pass:[C]];
 
 
 [#C-0e-h]
-== xref:#C-0e[pass:[C]]::h
+== xref:#C-0e[C]::h
 
 
 
diff --git a/test-files/golden-tests/class-template-spec.html b/test-files/golden-tests/class-template-spec.html
index 84b493c48..82ebc67ae 100644
--- a/test-files/golden-tests/class-template-spec.html
+++ b/test-files/golden-tests/class-template-spec.html
@@ -9,87 +9,84 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
                

-                                A 
-                            
-
-                                    
                

-                                A 
-                            
-
-                                    
                

-                                B 
-                            
-
-                                    
                

-                                B 
-                            
-
-                                    
                

-                                B 
-                            
-
-                                    
                

-                                C 
-                            
-
-                                    
                

-                                C 
-                            
-
-                                    
                

-                                C 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+                    
+                        C 
+                    
+                        
+                            
+                    
+                
+                    
+                        C 
+                    
+                        
+                            
+                    
+                
+                    
+                        C 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -106,7 +103,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -116,31 +112,28 @@ 
Synopsis

     

 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -159,7 +152,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -187,7 +179,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -197,31 +188,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    g 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        g 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -240,7 +228,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -268,7 +255,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -278,31 +264,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    h 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        h 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -321,7 +304,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -349,7 +331,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -359,31 +340,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -402,7 +380,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -430,7 +407,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -440,31 +416,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    g 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        g 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -483,7 +456,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -511,7 +483,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -521,31 +492,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    h 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        h 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -564,7 +532,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -592,7 +559,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -604,31 +570,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -647,7 +610,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -675,7 +637,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -685,31 +646,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    g 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        g 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -728,7 +686,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -756,7 +713,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -766,31 +722,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    h 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        h 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -809,7 +762,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/class-template-specializations-1.adoc b/test-files/golden-tests/class-template-specializations-1.adoc
index 3c07d68d1..9662ceda1 100644
--- a/test-files/golden-tests/class-template-specializations-1.adoc
+++ b/test-files/golden-tests/class-template-specializations-1.adoc
@@ -6,115 +6,169 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
-|===
-¦Name ¦Description
-¦xref:#R0[`R0`]  ¦
-
-¦xref:#R1[`R1`]  ¦
-
-¦xref:#R10[`R10`]  ¦
-
-¦xref:#R11[`R11`]  ¦
-
-¦xref:#R12[`R12`]  ¦
-
-¦xref:#R13[`R13`]  ¦
-
-¦xref:#R14[`R14`]  ¦
-
-¦xref:#R15[`R15`]  ¦
-
-¦xref:#R16[`R16`]  ¦
-
-¦xref:#R17[`R17`]  ¦
-
-¦xref:#R18[`R18`]  ¦
-
-¦xref:#R19[`R19`]  ¦
-
-¦xref:#R2[`R2`]  ¦
-
-¦xref:#R20[`R20`]  ¦
-
-¦xref:#R21[`R21`]  ¦
-
-¦xref:#R22[`R22`]  ¦
-
-¦xref:#R23[`R23`]  ¦
-
-¦xref:#R24[`R24`]  ¦
-
-¦xref:#R25[`R25`]  ¦
-
-¦xref:#R26[`R26`]  ¦
-
-¦xref:#R27[`R27`]  ¦
-
-¦xref:#R28[`R28`]  ¦
-
-¦xref:#R29[`R29`]  ¦
-
-¦xref:#R3[`R3`]  ¦
-
-¦xref:#R30[`R30`]  ¦
-
-¦xref:#R31[`R31`]  ¦
-
-¦xref:#R32[`R32`]  ¦
-
-¦xref:#R33[`R33`]  ¦
-
-¦xref:#R34[`R34`]  ¦
-
-¦xref:#R35[`R35`]  ¦
-
-¦xref:#R36[`R36`]  ¦
-
-¦xref:#R37[`R37`]  ¦
-
-¦xref:#R38[`R38`]  ¦
-
-¦xref:#R39[`R39`]  ¦
-
-¦xref:#R4[`R4`]  ¦
-
-¦xref:#R40[`R40`]  ¦
-
-¦xref:#R41[`R41`]  ¦
-
-¦xref:#R42[`R42`]  ¦
-
-¦xref:#R43[`R43`]  ¦
-
-¦xref:#R44[`R44`]  ¦
-
-¦xref:#R45[`R45`]  ¦
-
-¦xref:#R46[`R46`]  ¦
-
-¦xref:#R47[`R47`]  ¦
-
-¦xref:#R48[`R48`]  ¦
-
-¦xref:#R5[`R5`]  ¦
-
-¦xref:#R6[`R6`]  ¦
-
-¦xref:#R7[`R7`]  ¦
-
-¦xref:#R8[`R8`]  ¦
-
-¦xref:#R9[`R9`]  ¦
-
-¦xref:#S0-02[`S0<1, int*>`]  ¦
-
-¦xref:#S0-0c4[`S0<1, T*>`]  ¦
-
-¦xref:#S0-0be[`S0<0>`]  ¦
-
-¦xref:#S0-0cf[`S0`]  ¦
-
+[cols=2]
+|===
+| Name | Description 
+
+| xref:#R0[`R0`] 
+| 
+    
+| xref:#R1[`R1`] 
+| 
+    
+| xref:#R10[`R10`] 
+| 
+    
+| xref:#R11[`R11`] 
+| 
+    
+| xref:#R12[`R12`] 
+| 
+    
+| xref:#R13[`R13`] 
+| 
+    
+| xref:#R14[`R14`] 
+| 
+    
+| xref:#R15[`R15`] 
+| 
+    
+| xref:#R16[`R16`] 
+| 
+    
+| xref:#R17[`R17`] 
+| 
+    
+| xref:#R18[`R18`] 
+| 
+    
+| xref:#R19[`R19`] 
+| 
+    
+| xref:#R2[`R2`] 
+| 
+    
+| xref:#R20[`R20`] 
+| 
+    
+| xref:#R21[`R21`] 
+| 
+    
+| xref:#R22[`R22`] 
+| 
+    
+| xref:#R23[`R23`] 
+| 
+    
+| xref:#R24[`R24`] 
+| 
+    
+| xref:#R25[`R25`] 
+| 
+    
+| xref:#R26[`R26`] 
+| 
+    
+| xref:#R27[`R27`] 
+| 
+    
+| xref:#R28[`R28`] 
+| 
+    
+| xref:#R29[`R29`] 
+| 
+    
+| xref:#R3[`R3`] 
+| 
+    
+| xref:#R30[`R30`] 
+| 
+    
+| xref:#R31[`R31`] 
+| 
+    
+| xref:#R32[`R32`] 
+| 
+    
+| xref:#R33[`R33`] 
+| 
+    
+| xref:#R34[`R34`] 
+| 
+    
+| xref:#R35[`R35`] 
+| 
+    
+| xref:#R36[`R36`] 
+| 
+    
+| xref:#R37[`R37`] 
+| 
+    
+| xref:#R38[`R38`] 
+| 
+    
+| xref:#R39[`R39`] 
+| 
+    
+| xref:#R4[`R4`] 
+| 
+    
+| xref:#R40[`R40`] 
+| 
+    
+| xref:#R41[`R41`] 
+| 
+    
+| xref:#R42[`R42`] 
+| 
+    
+| xref:#R43[`R43`] 
+| 
+    
+| xref:#R44[`R44`] 
+| 
+    
+| xref:#R45[`R45`] 
+| 
+    
+| xref:#R46[`R46`] 
+| 
+    
+| xref:#R47[`R47`] 
+| 
+    
+| xref:#R48[`R48`] 
+| 
+    
+| xref:#R5[`R5`] 
+| 
+    
+| xref:#R6[`R6`] 
+| 
+    
+| xref:#R7[`R7`] 
+| 
+    
+| xref:#R8[`R8`] 
+| 
+    
+| xref:#R9[`R9`] 
+| 
+    
+| xref:#S0-02[`S0<1, int*>`] 
+| 
+    
+| xref:#S0-0c4[`S0<1, T*>`] 
+| 
+    
+| xref:#S0-0be[`S0<0>`] 
+| 
+    
+| xref:#S0-0cf[`S0`] 
+| 
+    
 |===
 
 
@@ -137,20 +191,25 @@ struct S0;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1[`S1`]  ¦
-
-¦xref:#S0-0cf-S5[`S5`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1[`S1`] 
+| 
+    
+| xref:#S0-0cf-S5[`S5`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-f0[`f0`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-f0[`f0`] 
+| 
+    
 |===
 
 
@@ -158,7 +217,7 @@ struct S0;
 
 
 [#S0-0cf-f0]
-== xref:#S0-0cf[pass:[S0]]::f0
+== xref:#S0-0cf[S0]::f0
 
 
 
@@ -182,7 +241,7 @@ f0();
 
 
 [#S0-0cf-S1]
-== xref:#S0-0cf[pass:[S0]]::S1
+== xref:#S0-0cf[S0]::S1
 
 
 
@@ -196,18 +255,22 @@ struct S1;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-S2[`S2`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-S2[`S2`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-f1[`f1`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-f1[`f1`] 
+| 
+    
 |===
 
 
@@ -215,7 +278,7 @@ struct S1;
 
 
 [#S0-0cf-S1-f1]
-== xref:#S0-0cf[pass:[S0]]::xref:#S0-0cf-S1[pass:[S1]]::f1
+== xref:#S0-0cf[S0]::xref:#S0-0cf-S1[S1]::f1
 
 
 
@@ -239,7 +302,7 @@ f1();
 
 
 [#S0-0cf-S1-S2]
-== xref:#S0-0cf[pass:[S0]]::xref:#S0-0cf-S1[pass:[S1]]::S2
+== xref:#S0-0cf[S0]::xref:#S0-0cf-S1[S1]::S2
 
 
 
@@ -256,20 +319,25 @@ struct S2;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-S2-S3[`S3`]  ¦
-
-¦xref:#S0-0cf-S1-S2-S4[`S4`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-S2-S3[`S3`] 
+| 
+    
+| xref:#S0-0cf-S1-S2-S4[`S4`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-S2-f2[`f2`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-S2-f2[`f2`] 
+| 
+    
 |===
 
 
@@ -277,7 +345,7 @@ struct S2;
 
 
 [#S0-0cf-S1-S2-f2]
-== xref:#S0-0cf[pass:[S0]]::xref:#S0-0cf-S1[pass:[S1]]::xref:#S0-0cf-S1-S2[pass:[S2]]::f2
+== xref:#S0-0cf[S0]::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]::f2
 
 
 
@@ -301,7 +369,7 @@ f2();
 
 
 [#S0-0cf-S1-S2-S3]
-== xref:#S0-0cf[pass:[S0]]::xref:#S0-0cf-S1[pass:[S1]]::xref:#S0-0cf-S1-S2[pass:[S2]]::S3
+== xref:#S0-0cf[S0]::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]::S3
 
 
 
@@ -315,11 +383,13 @@ struct S3;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-S2-S3-f3[`f3`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-S2-S3-f3[`f3`] 
+| 
+    
 |===
 
 
@@ -327,7 +397,7 @@ struct S3;
 
 
 [#S0-0cf-S1-S2-S3-f3]
-== xref:#S0-0cf[pass:[S0]]::xref:#S0-0cf-S1[pass:[S1]]::xref:#S0-0cf-S1-S2[pass:[S2]]::xref:#S0-0cf-S1-S2-S3[pass:[S3]]::f3
+== xref:#S0-0cf[S0]::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]::xref:#S0-0cf-S1-S2-S3[S3]::f3
 
 
 
@@ -351,7 +421,7 @@ f3();
 
 
 [#S0-0cf-S1-S2-S4]
-== xref:#S0-0cf[pass:[S0]]::xref:#S0-0cf-S1[pass:[S1]]::xref:#S0-0cf-S1-S2[pass:[S2]]::S4
+== xref:#S0-0cf[S0]::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]::S4
 
 
 
@@ -368,11 +438,13 @@ struct S4;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-S2-S4-f4[`f4`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-S2-S4-f4[`f4`] 
+| 
+    
 |===
 
 
@@ -380,7 +452,7 @@ struct S4;
 
 
 [#S0-0cf-S1-S2-S4-f4]
-== xref:#S0-0cf[pass:[S0]]::xref:#S0-0cf-S1[pass:[S1]]::xref:#S0-0cf-S1-S2[pass:[S2]]::xref:#S0-0cf-S1-S2-S4[pass:[S4]]::f4
+== xref:#S0-0cf[S0]::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]::xref:#S0-0cf-S1-S2-S4[S4]::f4
 
 
 
@@ -404,7 +476,7 @@ f4();
 
 
 [#S0-0cf-S5]
-== xref:#S0-0cf[pass:[S0]]::S5
+== xref:#S0-0cf[S0]::S5
 
 
 
@@ -421,18 +493,22 @@ struct S5;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6[`S6`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6[`S6`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-f5[`f5`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-f5[`f5`] 
+| 
+    
 |===
 
 
@@ -440,7 +516,7 @@ struct S5;
 
 
 [#S0-0cf-S5-f5]
-== xref:#S0-0cf[pass:[S0]]::xref:#S0-0cf-S5[pass:[S5]]::f5
+== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::f5
 
 
 
@@ -464,7 +540,7 @@ f5();
 
 
 [#S0-0cf-S5-S6]
-== xref:#S0-0cf[pass:[S0]]::xref:#S0-0cf-S5[pass:[S5]]::S6
+== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::S6
 
 
 
@@ -478,18 +554,22 @@ struct S6;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-S7[`S7`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-S7[`S7`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-f6[`f6`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-f6[`f6`] 
+| 
+    
 |===
 
 
@@ -497,7 +577,7 @@ struct S6;
 
 
 [#S0-0cf-S5-S6-f6]
-== xref:#S0-0cf[pass:[S0]]::xref:#S0-0cf-S5[pass:[S5]]::xref:#S0-0cf-S5-S6[pass:[S6]]::f6
+== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::xref:#S0-0cf-S5-S6[S6]::f6
 
 
 
@@ -521,7 +601,7 @@ f6();
 
 
 [#S0-0cf-S5-S6-S7]
-== xref:#S0-0cf[pass:[S0]]::xref:#S0-0cf-S5[pass:[S5]]::xref:#S0-0cf-S5-S6[pass:[S6]]::S7
+== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::xref:#S0-0cf-S5-S6[S6]::S7
 
 
 
@@ -538,20 +618,25 @@ struct S7;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-S7-S8[`S8`]  ¦
-
-¦xref:#S0-0cf-S5-S6-S7-S9[`S9`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-S7-S8[`S8`] 
+| 
+    
+| xref:#S0-0cf-S5-S6-S7-S9[`S9`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-S7-f7[`f7`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-S7-f7[`f7`] 
+| 
+    
 |===
 
 
@@ -559,7 +644,7 @@ struct S7;
 
 
 [#S0-0cf-S5-S6-S7-f7]
-== xref:#S0-0cf[pass:[S0]]::xref:#S0-0cf-S5[pass:[S5]]::xref:#S0-0cf-S5-S6[pass:[S6]]::xref:#S0-0cf-S5-S6-S7[pass:[S7]]::f7
+== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]::f7
 
 
 
@@ -583,7 +668,7 @@ f7();
 
 
 [#S0-0cf-S5-S6-S7-S8]
-== xref:#S0-0cf[pass:[S0]]::xref:#S0-0cf-S5[pass:[S5]]::xref:#S0-0cf-S5-S6[pass:[S6]]::xref:#S0-0cf-S5-S6-S7[pass:[S7]]::S8
+== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]::S8
 
 
 
@@ -597,11 +682,13 @@ struct S8;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-S7-S8-f8[`f8`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-S7-S8-f8[`f8`] 
+| 
+    
 |===
 
 
@@ -609,7 +696,7 @@ struct S8;
 
 
 [#S0-0cf-S5-S6-S7-S8-f8]
-== xref:#S0-0cf[pass:[S0]]::xref:#S0-0cf-S5[pass:[S5]]::xref:#S0-0cf-S5-S6[pass:[S6]]::xref:#S0-0cf-S5-S6-S7[pass:[S7]]::xref:#S0-0cf-S5-S6-S7-S8[pass:[S8]]::f8
+== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]::xref:#S0-0cf-S5-S6-S7-S8[S8]::f8
 
 
 
@@ -633,7 +720,7 @@ f8();
 
 
 [#S0-0cf-S5-S6-S7-S9]
-== xref:#S0-0cf[pass:[S0]]::xref:#S0-0cf-S5[pass:[S5]]::xref:#S0-0cf-S5-S6[pass:[S6]]::xref:#S0-0cf-S5-S6-S7[pass:[S7]]::S9
+== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]::S9
 
 
 
@@ -650,11 +737,13 @@ struct S9;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-S7-S9-f9[`f9`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-S7-S9-f9[`f9`] 
+| 
+    
 |===
 
 
@@ -662,7 +751,7 @@ struct S9;
 
 
 [#S0-0cf-S5-S6-S7-S9-f9]
-== xref:#S0-0cf[pass:[S0]]::xref:#S0-0cf-S5[pass:[S5]]::xref:#S0-0cf-S5-S6[pass:[S6]]::xref:#S0-0cf-S5-S6-S7[pass:[S7]]::xref:#S0-0cf-S5-S6-S7-S9[pass:[S9]]::f9
+== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]::xref:#S0-0cf-S5-S6-S7-S9[S9]::f9
 
 
 
@@ -697,7 +786,7 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
-struct xref:#S0-0cf[pass:[S0]]<0>;
+struct xref:#S0-0cf[S0]<0>;
 ----
 
 
@@ -717,7 +806,7 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template
-struct xref:#S0-0cf[pass:[S0]]<1, T*>;
+struct xref:#S0-0cf[S0]<1, T*>;
 ----
 
 
@@ -737,7 +826,7 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
-struct xref:#S0-0cf[pass:[S0]]<1, int*>;
+struct xref:#S0-0cf[S0]<1, int*>;
 ----
 
 
@@ -818,20 +907,25 @@ struct R0
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1[`S1`]  ¦
-
-¦xref:#S0-0cf-S5[`S5`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1[`S1`] 
+| 
+    
+| xref:#S0-0cf-S5[`S5`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-f0[`f0`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-f0[`f0`] 
+| 
+    
 |===
 
 
@@ -1394,20 +1488,25 @@ struct R28
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1[`S1`]  ¦
-
-¦xref:#S0-0cf-S5[`S5`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1[`S1`] 
+| 
+    
+| xref:#S0-0cf-S5[`S5`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-f0[`f0`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-f0[`f0`] 
+| 
+    
 |===
 
 
@@ -1430,20 +1529,25 @@ struct R29
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1[`S1`]  ¦
-
-¦xref:#S0-0cf-S5[`S5`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1[`S1`] 
+| 
+    
+| xref:#S0-0cf-S5[`S5`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-f0[`f0`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-f0[`f0`] 
+| 
+    
 |===
 
 
@@ -1466,18 +1570,22 @@ struct R30
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-S2[`S2`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-S2[`S2`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-f1[`f1`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-f1[`f1`] 
+| 
+    
 |===
 
 
@@ -1503,20 +1611,25 @@ struct R31
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-S2-S3[`S3`]  ¦
-
-¦xref:#S0-0cf-S1-S2-S4[`S4`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-S2-S3[`S3`] 
+| 
+    
+| xref:#S0-0cf-S1-S2-S4[`S4`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-S2-f2[`f2`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-S2-f2[`f2`] 
+| 
+    
 |===
 
 
@@ -1539,20 +1652,25 @@ struct R32
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-S2-S3[`S3`]  ¦
-
-¦xref:#S0-0cf-S1-S2-S4[`S4`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-S2-S3[`S3`] 
+| 
+    
+| xref:#S0-0cf-S1-S2-S4[`S4`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-S2-f2[`f2`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-S2-f2[`f2`] 
+| 
+    
 |===
 
 
@@ -1575,20 +1693,25 @@ struct R33
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-S2-S3[`S3`]  ¦
-
-¦xref:#S0-0cf-S1-S2-S4[`S4`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-S2-S3[`S3`] 
+| 
+    
+| xref:#S0-0cf-S1-S2-S4[`S4`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-S2-f2[`f2`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-S2-f2[`f2`] 
+| 
+    
 |===
 
 
@@ -1611,11 +1734,13 @@ struct R34
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-S2-S3-f3[`f3`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-S2-S3-f3[`f3`] 
+| 
+    
 |===
 
 
@@ -1641,11 +1766,13 @@ struct R35
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-S2-S4-f4[`f4`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-S2-S4-f4[`f4`] 
+| 
+    
 |===
 
 
@@ -1668,11 +1795,13 @@ struct R36
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-S2-S4-f4[`f4`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-S2-S4-f4[`f4`] 
+| 
+    
 |===
 
 
@@ -1695,11 +1824,13 @@ struct R37
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S1-S2-S4-f4[`f4`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S1-S2-S4-f4[`f4`] 
+| 
+    
 |===
 
 
@@ -1725,18 +1856,22 @@ struct R38
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6[`S6`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6[`S6`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-f5[`f5`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-f5[`f5`] 
+| 
+    
 |===
 
 
@@ -1759,18 +1894,22 @@ struct R39
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6[`S6`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6[`S6`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-f5[`f5`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-f5[`f5`] 
+| 
+    
 |===
 
 
@@ -1793,18 +1932,22 @@ struct R40
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6[`S6`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6[`S6`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-f5[`f5`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-f5[`f5`] 
+| 
+    
 |===
 
 
@@ -1827,18 +1970,22 @@ struct R41
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-S7[`S7`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-S7[`S7`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-f6[`f6`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-f6[`f6`] 
+| 
+    
 |===
 
 
@@ -1864,20 +2011,25 @@ struct R42
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-S7-S8[`S8`]  ¦
-
-¦xref:#S0-0cf-S5-S6-S7-S9[`S9`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-S7-S8[`S8`] 
+| 
+    
+| xref:#S0-0cf-S5-S6-S7-S9[`S9`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-S7-f7[`f7`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-S7-f7[`f7`] 
+| 
+    
 |===
 
 
@@ -1900,20 +2052,25 @@ struct R43
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-S7-S8[`S8`]  ¦
-
-¦xref:#S0-0cf-S5-S6-S7-S9[`S9`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-S7-S8[`S8`] 
+| 
+    
+| xref:#S0-0cf-S5-S6-S7-S9[`S9`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-S7-f7[`f7`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-S7-f7[`f7`] 
+| 
+    
 |===
 
 
@@ -1936,20 +2093,25 @@ struct R44
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-S7-S8[`S8`]  ¦
-
-¦xref:#S0-0cf-S5-S6-S7-S9[`S9`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-S7-S8[`S8`] 
+| 
+    
+| xref:#S0-0cf-S5-S6-S7-S9[`S9`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-S7-f7[`f7`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-S7-f7[`f7`] 
+| 
+    
 |===
 
 
@@ -1972,11 +2134,13 @@ struct R45
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-S7-S8-f8[`f8`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-S7-S8-f8[`f8`] 
+| 
+    
 |===
 
 
@@ -2002,11 +2166,13 @@ struct R46
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-S7-S9-f9[`f9`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-S7-S9-f9[`f9`] 
+| 
+    
 |===
 
 
@@ -2029,11 +2195,13 @@ struct R47
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-S7-S9-f9[`f9`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-S7-S9-f9[`f9`] 
+| 
+    
 |===
 
 
@@ -2056,11 +2224,13 @@ struct R48
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-0cf-S5-S6-S7-S9-f9[`f9`]  ¦
+| Name | Description 
 
+| xref:#S0-0cf-S5-S6-S7-S9-f9[`f9`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/class-template-specializations-1.html b/test-files/golden-tests/class-template-specializations-1.html
index 8c2c2f9f2..854fa771f 100644
--- a/test-files/golden-tests/class-template-specializations-1.html
+++ b/test-files/golden-tests/class-template-specializations-1.html
@@ -9,395 +9,392 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
-                
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            




NameDescription

-                                R0 
-                            
-
-                                    
                

-                                R1 
-                            
-
-                                    
                

-                                R10 
-                            
-
-                                    
                

-                                R11 
-                            
-
-                                    
                

-                                R12 
-                            
-
-                                    
                

-                                R13 
-                            
-
-                                    
                

-                                R14 
-                            
-
-                                    
                

-                                R15 
-                            
-
-                                    
                

-                                R16 
-                            
-
-                                    
                

-                                R17 
-                            
-
-                                    
                

-                                R18 
-                            
-
-                                    
                

-                                R19 
-                            
-
-                                    
                

-                                R2 
-                            
-
-                                    
                

-                                R20 
-                            
-
-                                    
                

-                                R21 
-                            
-
-                                    
                

-                                R22 
-                            
-
-                                    
                

-                                R23 
-                            
-
-                                    
                

-                                R24 
-                            
-
-                                    
                

-                                R25 
-                            
-
-                                    
                

-                                R26 
-                            
-
-                                    
                

-                                R27 
-                            
-
-                                    
                

-                                R28 
-                            
-
-                                    
                

-                                R29 
-                            
-
-                                    
                

-                                R3 
-                            
-
-                                    
                

-                                R30 
-                            
-
-                                    
                

-                                R31 
-                            
-
-                                    
                

-                                R32 
-                            
-
-                                    
                

-                                R33 
-                            
-
-                                    
                

-                                R34 
-                            
-
-                                    
                

-                                R35 
-                            
-
-                                    
                

-                                R36 
-                            
-
-                                    
                

-                                R37 
-                            
-
-                                    
                

-                                R38 
-                            
-
-                                    
                

-                                R39 
-                            
-
-                                    
                

-                                R4 
-                            
-
-                                    
                

-                                R40 
-                            
-
-                                    
                

-                                R41 
-                            
-
-                                    
                

-                                R42 
-                            
-
-                                    
                

-                                R43 
-                            
-
-                                    
                

-                                R44 
-                            
-
-                                    
                

-                                R45 
-                            
-
-                                    
                

-                                R46 
-                            
-
-                                    
                

-                                R47 
-                            
-
-                                    
                

-                                R48 
-                            
-
-                                    
                

-                                R5 
-                            
-
-                                    
                

-                                R6 
-                            
-
-                                    
                

-                                R7 
-                            
-
-                                    
                

-                                R8 
-                            
-
-                                    
                

-                                R9 
-                            
-
-                                    
                

-                                S0<1, int*> 
-                            
-
-                                    
                

-                                S0<1, T*> 
-                            
-
-                                    
                

-                                S0<0> 
-                            
-
-                                    
                

-                                S0 
-                            
-
-                                    
        

-        

-                

+        
 Types

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+            
+        
NameDescription

+                        R0 
+                    
+                        
+                            
+                    

+                        R1 
+                    
+                        
+                            
+                    

+                        R10 
+                    
+                        
+                            
+                    

+                        R11 
+                    
+                        
+                            
+                    

+                        R12 
+                    
+                        
+                            
+                    

+                        R13 
+                    
+                        
+                            
+                    

+                        R14 
+                    
+                        
+                            
+                    

+                        R15 
+                    
+                        
+                            
+                    

+                        R16 
+                    
+                        
+                            
+                    

+                        R17 
+                    
+                        
+                            
+                    

+                        R18 
+                    
+                        
+                            
+                    

+                        R19 
+                    
+                        
+                            
+                    

+                        R2 
+                    
+                        
+                            
+                    

+                        R20 
+                    
+                        
+                            
+                    

+                        R21 
+                    
+                        
+                            
+                    

+                        R22 
+                    
+                        
+                            
+                    

+                        R23 
+                    
+                        
+                            
+                    

+                        R24 
+                    
+                        
+                            
+                    

+                        R25 
+                    
+                        
+                            
+                    

+                        R26 
+                    
+                        
+                            
+                    

+                        R27 
+                    
+                        
+                            
+                    

+                        R28 
+                    
+                        
+                            
+                    

+                        R29 
+                    
+                        
+                            
+                    

+                        R3 
+                    
+                        
+                            
+                    

+                        R30 
+                    
+                        
+                            
+                    

+                        R31 
+                    
+                        
+                            
+                    

+                        R32 
+                    
+                        
+                            
+                    

+                        R33 
+                    
+                        
+                            
+                    

+                        R34 
+                    
+                        
+                            
+                    

+                        R35 
+                    
+                        
+                            
+                    

+                        R36 
+                    
+                        
+                            
+                    

+                        R37 
+                    
+                        
+                            
+                    

+                        R38 
+                    
+                        
+                            
+                    

+                        R39 
+                    
+                        
+                            
+                    

+                        R4 
+                    
+                        
+                            
+                    

+                        R40 
+                    
+                        
+                            
+                    

+                        R41 
+                    
+                        
+                            
+                    

+                        R42 
+                    
+                        
+                            
+                    

+                        R43 
+                    
+                        
+                            
+                    

+                        R44 
+                    
+                        
+                            
+                    

+                        R45 
+                    
+                        
+                            
+                    

+                        R46 
+                    
+                        
+                            
+                    

+                        R47 
+                    
+                        
+                            
+                    

+                        R48 
+                    
+                        
+                            
+                    

+                        R5 
+                    
+                        
+                            
+                    

+                        R6 
+                    
+                        
+                            
+                    

+                        R7 
+                    
+                        
+                            
+                    

+                        R8 
+                    
+                        
+                            
+                    

+                        R9 
+                    
+                        
+                            
+                    

+                        S0<1, int*> 
+                    
+                        
+                            
+                    

+                        S0<1, T*> 
+                    
+                        
+                            
+                    

+                        S0<0> 
+                    
+                        
+                            
+                    

+                        S0 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -414,7 +411,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -426,62 +422,56 @@ 
Synopsis

     

 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                S1 
-                            
+                    NameDescription
                

-                                S5 
-                            
 
-                                    
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                
+            
+
+                
+                    
+                
+                    
+                
+            
+        




NameDescription

+                        S1 
+                    
+                        
+                            
+                    

+                        S5 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f0 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f0 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -500,7 +490,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -528,7 +517,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -537,55 +525,49 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                S2 
-                            
+                    NameDescription
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+
+                
+            
+
+                
+                    
+                
+            
+        




NameDescription

+                        S2 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f1 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f1 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -604,7 +586,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -632,7 +613,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -644,62 +624,56 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                S3 
-                            
+                    NameDescription
                

-                                S4 
-                            
 
-                                    
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                
+            
+
+                
+                    
+                
+                    
+                
+            
+        




NameDescription

+                        S3 
+                    
+                        
+                            
+                    

+                        S4 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f2 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f2 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -718,7 +692,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -746,7 +719,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -755,31 +727,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f3 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f3 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -798,7 +767,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -826,7 +794,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -838,31 +805,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f4 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f4 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -881,7 +845,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -909,7 +872,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -921,55 +883,49 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                S6 
-                            
+                    NameDescription
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+
+                
+            
+
-                                
-                                
+                
+            
+        




NameDescription

                 

-                                    f5 
-                                
+                    
+                        S6 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
+                
+                    
+
+
 
-                                        
-                            
-                
NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f5 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -988,7 +944,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1016,7 +971,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1025,55 +979,49 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                S7 
-                            
+                    NameDescription
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+
+                
+            
+
-                                
-                                
+                
+            
+        




NameDescription

                 

-                                    f6 
-                                
+                    
+                        S7 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
+                
+                    
+
+
 
-                                        
-                            
-                
NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f6 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -1092,7 +1040,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1120,7 +1067,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1132,62 +1078,56 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                S8 
-                            
+                    NameDescription
                

-                                S9 
-                            
 
-                                    
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                
+            
+
+                
+                    
+                
+                    
+                
+            
+        




NameDescription

+                        S8 
+                    
+                        
+                            
+                    

+                        S9 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f7 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f7 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -1206,7 +1146,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1234,7 +1173,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1243,31 +1181,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f8 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f8 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -1286,7 +1221,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1314,7 +1248,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1326,31 +1259,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f9 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f9 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -1369,7 +1299,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1397,7 +1326,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1407,7 +1335,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -1426,7 +1354,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1436,7 +1363,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -1455,7 +1382,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1465,7 +1391,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -1484,7 +1410,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1494,62 +1419,56 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                S1 
-                            
+                    NameDescription
                

-                                S5 
-                            
 
-                                    
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                
+            
+
+                
+                    
+                
+                    
+                
+            
+        




NameDescription

+                        S1 
+                    
+                        
+                            
+                    

+                        S5 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f0 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f0 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -1568,7 +1487,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1578,7 +1496,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -1597,7 +1515,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1607,7 +1524,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -1626,7 +1543,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1636,7 +1552,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -1655,7 +1571,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1665,7 +1580,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -1684,7 +1599,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1694,7 +1608,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -1713,7 +1627,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1723,7 +1636,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -1742,7 +1655,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1752,7 +1664,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -1771,7 +1683,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1781,7 +1692,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -1800,7 +1711,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1810,7 +1720,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -1829,7 +1739,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1839,7 +1748,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -1858,7 +1767,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1868,7 +1776,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -1887,7 +1795,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1897,7 +1804,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -1916,7 +1823,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1926,7 +1832,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -1945,7 +1851,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1955,7 +1860,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -1974,7 +1879,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1984,7 +1888,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -2003,7 +1907,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2013,7 +1916,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -2032,7 +1935,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2042,7 +1944,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -2061,7 +1963,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2071,7 +1972,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -2090,7 +1991,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2100,7 +2000,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -2119,7 +2019,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2129,7 +2028,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -2148,7 +2047,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2158,7 +2056,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -2177,7 +2075,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2187,7 +2084,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -2206,7 +2103,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2216,7 +2112,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -2235,7 +2131,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2245,7 +2140,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -2264,7 +2159,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2274,7 +2168,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -2293,7 +2187,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2303,7 +2196,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -2322,7 +2215,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2332,7 +2224,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -2351,7 +2243,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2361,62 +2252,56 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                S1 
-                            
+                    NameDescription
                

-                                S5 
-                            
 
-                                    
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                
+            
+
+                
+                    
+                
+                    
+                
+            
+        




NameDescription

+                        S1 
+                    
+                        
+                            
+                    

+                        S5 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f0 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f0 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -2435,7 +2320,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2445,62 +2329,56 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                S1 
-                            
+                    NameDescription
                

-                                S5 
-                            
 
-                                    
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                
+            
+
-                                
-                                
+                
+                    
+                
+            
+        




NameDescription

                 

-                                    f0 
-                                
+                    
+                        S1 
+                    
+                        
+                            
+                    

+                        S5 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
+                
+                    
+
+
 
-                                        
-                            
-                
NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f0 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -2519,7 +2397,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2529,55 +2406,49 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                S2 
-                            
+                    NameDescription
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+
+                
+            
+
-                                
-                                
+                
+            
+        




NameDescription

                 

-                                    f1 
-                                
+                    
+                        S2 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
+                
+                    
+
+
 
-                                        
-                            
-                
NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f1 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -2596,7 +2467,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2609,62 +2479,56 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                S3 
-                            
+                    NameDescription
                

-                                S4 
-                            
 
-                                    
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                
+            
+
+                
+                    
+                
+                    
+                
+            
+        




NameDescription

+                        S3 
+                    
+                        
+                            
+                    

+                        S4 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f2 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f2 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -2683,7 +2547,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2693,62 +2556,56 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                S3 
-                            
+                    NameDescription
                

-                                S4 
-                            
 
-                                    
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                
+            
+
+                
+                    
+                
+                    
+                
+            
+        




NameDescription

+                        S3 
+                    
+                        
+                            
+                    

+                        S4 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f2 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f2 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -2767,7 +2624,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2777,62 +2633,56 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                S3 
-                            
+                    NameDescription
                

-                                S4 
-                            
 
-                                    
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                
+            
+
-                                
-                                
+                
+                    
+                
+            
+        




NameDescription

                 

-                                    f2 
-                                
+                    
+                        S3 
+                    
+                        
+                            
+                    

+                        S4 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
+                
+                    
+
+
 
-                                        
-                            
-                
NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f2 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -2851,7 +2701,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2861,31 +2710,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f3 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f3 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -2904,7 +2750,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2917,31 +2762,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f4 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f4 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -2960,7 +2802,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2970,31 +2811,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f4 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f4 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -3013,7 +2851,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -3023,31 +2860,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f4 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f4 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -3066,7 +2900,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -3079,55 +2912,49 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                S6 
-                            
+                    NameDescription
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+
+                
+            
+
-                                
-                                
+                
+            
+        




NameDescription

                 

-                                    f5 
-                                
+                    
+                        S6 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
+                
+                    
+
+
 
-                                        
-                            
-                
NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f5 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -3146,7 +2973,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -3156,55 +2982,49 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                S6 
-                            
+                    NameDescription
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+
+                
+            
+
-                                
-                                
+                
+            
+        




NameDescription

                 

-                                    f5 
-                                
+                    
+                        S6 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
+                
+                    
+
+
 
-                                        
-                            
-                
NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f5 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -3223,7 +3043,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -3233,55 +3052,49 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                S6 
-                            
+                    NameDescription
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+
+                
+            
+
+                
+                    
+                
+            
+        




NameDescription

+                        S6 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f5 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f5 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -3300,7 +3113,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -3310,55 +3122,49 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                S7 
-                            
+                    NameDescription
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+
+                
+            
+
+                
+                    
+                
+            
+        




NameDescription

+                        S7 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f6 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f6 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -3377,7 +3183,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -3390,62 +3195,56 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                S8 
-                            
+                    NameDescription
                

-                                S9 
-                            
 
-                                    
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                
+            
+
-                                
-                                
+                
+                    
+                
+            
+        




NameDescription

                 

-                                    f7 
-                                
+                    
+                        S8 
+                    
+                        
+                            
+                    

+                        S9 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
+                
+                    
+
+
 
-                                        
-                            
-                
NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f7 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -3464,7 +3263,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -3474,62 +3272,56 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                S8 
-                            
+                    NameDescription
                

-                                S9 
-                            
 
-                                    
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                
+            
+
+                
+                    
+                
+                    
+                
+            
+        




NameDescription

+                        S8 
+                    
+                        
+                            
+                    

+                        S9 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f7 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f7 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -3548,7 +3340,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -3558,62 +3349,56 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                S8 
-                            
+                    NameDescription
                

-                                S9 
-                            
 
-                                    
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                
+            
+
+                
+                    
+                
+                    
+                
+            
+        




NameDescription

+                        S8 
+                    
+                        
+                            
+                    

+                        S9 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f7 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f7 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -3632,7 +3417,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -3642,31 +3426,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f8 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f8 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -3685,7 +3466,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -3698,31 +3478,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f9 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f9 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -3741,7 +3518,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -3751,31 +3527,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f9 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f9 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -3794,7 +3567,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -3804,31 +3576,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
-                
-                                
-                                
-                            
-                




NameDescription

-                                    f9 
-                                
-
-                                        
        

-            

-                                                                                                    

+        
 Member Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f9 
+                    
+                        
+                            
+                    

+                    
 
 
 
diff --git a/test-files/golden-tests/class-template-specializations-2.adoc b/test-files/golden-tests/class-template-specializations-2.adoc
index 0855864e1..e3b80daea 100644
--- a/test-files/golden-tests/class-template-specializations-2.adoc
+++ b/test-files/golden-tests/class-template-specializations-2.adoc
@@ -6,15 +6,19 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e[`A`]  ¦
-
-¦xref:#A-03[`A`]  ¦
-
-¦xref:#A-06[`A`]  ¦
-
+| Name | Description 
+
+| xref:#A-0e[`A`] 
+| 
+    
+| xref:#A-03[`A`] 
+| 
+    
+| xref:#A-06[`A`] 
+| 
+    
 |===
 
 
@@ -51,19 +55,23 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template
-struct xref:#A-0e[pass:[A]];
+struct xref:#A-0e[A];
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-03-B-05[`B`]  ¦
-
-¦xref:#A-03-B-01[`B`]  ¦
-
-¦xref:#A-03-B-0b[`B`]  ¦
-
+| Name | Description 
+
+| xref:#A-03-B-05[`B`] 
+| 
+    
+| xref:#A-03-B-01[`B`] 
+| 
+    
+| xref:#A-03-B-0b[`B`] 
+| 
+    
 |===
 
 
@@ -71,7 +79,7 @@ struct xref:#A-0e[pass:[A]];
 
 
 [#A-03-B-05]
-== xref:#A-03[pass:[A]]::B
+== xref:#A-03[A]::B
 
 
 
@@ -91,7 +99,7 @@ struct B;
 
 
 [#A-03-B-01]
-== xref:#A-03[pass:[A]]::B
+== xref:#A-03[A]::B
 
 
 
@@ -102,15 +110,17 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template
-struct xref:#A-03-B-05[pass:[B]];
+struct xref:#A-03-B-05[B];
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-03-B-01-C[`C`]  ¦
+| Name | Description 
 
+| xref:#A-03-B-01-C[`C`] 
+| 
+    
 |===
 
 
@@ -118,7 +128,7 @@ struct xref:#A-03-B-05[pass:[B]];
 
 
 [#A-03-B-01-C]
-== xref:#A-03[pass:[A]]::xref:#A-03-B-01[pass:[B]]::C
+== xref:#A-03[A]::xref:#A-03-B-01[B]::C
 
 
 
@@ -137,7 +147,7 @@ struct C;
 
 
 [#A-03-B-0b]
-== xref:#A-03[pass:[A]]::B
+== xref:#A-03[A]::B
 
 
 
@@ -148,7 +158,7 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
-struct xref:#A-03-B-05[pass:[B]];
+struct xref:#A-03-B-05[B];
 ----
 
 
@@ -168,17 +178,20 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
-struct xref:#A-0e[pass:[A]];
+struct xref:#A-0e[A];
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-06-D-0b[`D`]  ¦
-
-¦xref:#A-06-D-04[`D`]  ¦
-
+| Name | Description 
+
+| xref:#A-06-D-0b[`D`] 
+| 
+    
+| xref:#A-06-D-04[`D`] 
+| 
+    
 |===
 
 
@@ -186,7 +199,7 @@ struct xref:#A-0e[pass:[A]];
 
 
 [#A-06-D-0b]
-== xref:#A-06[pass:[A]]::D
+== xref:#A-06[A]::D
 
 
 
@@ -201,13 +214,16 @@ struct D;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-06-D-0b-E-01[`E`]  ¦
-
-¦xref:#A-06-D-0b-E-04[`E`]  ¦
-
+| Name | Description 
+
+| xref:#A-06-D-0b-E-01[`E`] 
+| 
+    
+| xref:#A-06-D-0b-E-04[`E`] 
+| 
+    
 |===
 
 
@@ -215,7 +231,7 @@ struct D;
 
 
 [#A-06-D-0b-E-01]
-== xref:#A-06[pass:[A]]::xref:#A-06-D-0b[pass:[D]]::E
+== xref:#A-06[A]::xref:#A-06-D-0b[D]::E
 
 
 
@@ -235,7 +251,7 @@ struct E;
 
 
 [#A-06-D-0b-E-04]
-== xref:#A-06[pass:[A]]::xref:#A-06-D-0b[pass:[D]]::E
+== xref:#A-06[A]::xref:#A-06-D-0b[D]::E
 
 
 
@@ -246,15 +262,17 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template
-struct xref:#A-06-D-0b-E-01[pass:[E]];
+struct xref:#A-06-D-0b-E-01[E];
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-06-D-0b-E-04-F[`F`]  ¦
+| Name | Description 
 
+| xref:#A-06-D-0b-E-04-F[`F`] 
+| 
+    
 |===
 
 
@@ -262,7 +280,7 @@ struct xref:#A-06-D-0b-E-01[pass:[E]];
 
 
 [#A-06-D-0b-E-04-F]
-== xref:#A-06[pass:[A]]::xref:#A-06-D-0b[pass:[D]]::xref:#A-06-D-0b-E-04[pass:[E]]::F
+== xref:#A-06[A]::xref:#A-06-D-0b[D]::xref:#A-06-D-0b-E-04[E]::F
 
 
 
@@ -281,7 +299,7 @@ struct F;
 
 
 [#A-06-D-04]
-== xref:#A-06[pass:[A]]::D
+== xref:#A-06[A]::D
 
 
 
@@ -292,17 +310,20 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
-struct xref:#A-06-D-0b[pass:[D]];
+struct xref:#A-06-D-0b[D];
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-06-D-04-G-06[`G`]  ¦
-
-¦xref:#A-06-D-04-G-0c[`G`]  ¦
-
+| Name | Description 
+
+| xref:#A-06-D-04-G-06[`G`] 
+| 
+    
+| xref:#A-06-D-04-G-0c[`G`] 
+| 
+    
 |===
 
 
@@ -310,7 +331,7 @@ struct xref:#A-06-D-0b[pass:[D]];
 
 
 [#A-06-D-04-G-06]
-== xref:#A-06[pass:[A]]::xref:#A-06-D-04[pass:[D]]::G
+== xref:#A-06[A]::xref:#A-06-D-04[D]::G
 
 
 
@@ -330,7 +351,7 @@ struct G;
 
 
 [#A-06-D-04-G-0c]
-== xref:#A-06[pass:[A]]::xref:#A-06-D-04[pass:[D]]::G
+== xref:#A-06[A]::xref:#A-06-D-04[D]::G
 
 
 
@@ -341,7 +362,7 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template
-struct xref:#A-06-D-04-G-06[pass:[G]];
+struct xref:#A-06-D-04-G-06[G];
 ----
 
 
diff --git a/test-files/golden-tests/class-template-specializations-2.html b/test-files/golden-tests/class-template-specializations-2.html
index 3c2e37bd7..d7a8a464b 100644
--- a/test-files/golden-tests/class-template-specializations-2.html
+++ b/test-files/golden-tests/class-template-specializations-2.html
@@ -9,45 +9,42 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
                

-                                A 
-                            
-
-                                    
                

-                                A 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -64,7 +61,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -74,7 +70,7 @@ 
Synopsis

     

 
     

-                                                                                                                

+                            
 
 
 
@@ -93,7 +89,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -103,45 +98,42 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                B 
-                            
-
-                                    
                

-                                B 
-                            
-
-                                    
                

-                                B 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -160,7 +152,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -170,7 +161,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -189,7 +180,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -199,31 +189,28 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                C 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        C 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -242,7 +229,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -251,7 +237,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -270,7 +256,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -280,7 +265,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -299,7 +284,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -309,38 +293,35 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                D 
-                            
-
-                                    
                

-                                D 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        D 
+                    
+                        
+                            
+                    
+                
+                    
+                        D 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -359,7 +340,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -369,38 +349,35 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                E 
-                            
-
-                                    
                

-                                E 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        E 
+                    
+                        
+                            
+                    
+                
+                    
+                        E 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -419,7 +396,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -429,7 +405,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -448,7 +424,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -458,31 +433,28 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                F 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        F 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -501,7 +473,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -510,7 +481,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -529,7 +500,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -539,38 +509,35 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                G 
-                            
-
-                                    
                

-                                G 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        G 
+                    
+                        
+                            
+                    
+                
+                    
+                        G 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -589,7 +556,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -599,7 +565,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -618,7 +584,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -628,7 +593,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
diff --git a/test-files/golden-tests/class-template-specializations-3.adoc b/test-files/golden-tests/class-template-specializations-3.adoc
index a3acc1980..135a1d489 100644
--- a/test-files/golden-tests/class-template-specializations-3.adoc
+++ b/test-files/golden-tests/class-template-specializations-3.adoc
@@ -6,13 +6,16 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e[`A`]  ¦
-
-¦xref:#E[`E`]  ¦
-
+| Name | Description 
+
+| xref:#A-0e[`A`] 
+| 
+    
+| xref:#E[`E`] 
+| 
+    
 |===
 
 
@@ -33,13 +36,16 @@ struct A;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e-B-07[`B`]  ¦
-
-¦xref:#A-0e-B-00[`B`]  ¦
-
+| Name | Description 
+
+| xref:#A-0e-B-07[`B`] 
+| 
+    
+| xref:#A-0e-B-00[`B`] 
+| 
+    
 |===
 
 
@@ -47,7 +53,7 @@ struct A;
 
 
 [#A-0e-B-07]
-== xref:#A-0e[pass:[A]]::B
+== xref:#A-0e[A]::B
 
 
 
@@ -62,15 +68,19 @@ struct B;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e-B-07-C[`C`]  ¦
-
-¦xref:#A-0e-B-07-D-09[`D`]  ¦
-
-¦xref:#A-0e-B-07-D-0f[`D`]  ¦
-
+| Name | Description 
+
+| xref:#A-0e-B-07-C[`C`] 
+| 
+    
+| xref:#A-0e-B-07-D-09[`D`] 
+| 
+    
+| xref:#A-0e-B-07-D-0f[`D`] 
+| 
+    
 |===
 
 
@@ -78,7 +88,7 @@ struct B;
 
 
 [#A-0e-B-07-C]
-== xref:#A-0e[pass:[A]]::xref:#A-0e-B-07[pass:[B]]::C
+== xref:#A-0e[A]::xref:#A-0e-B-07[B]::C
 
 
 
@@ -97,7 +107,7 @@ struct C;
 
 
 [#A-0e-B-07-D-09]
-== xref:#A-0e[pass:[A]]::xref:#A-0e-B-07[pass:[B]]::D
+== xref:#A-0e[A]::xref:#A-0e-B-07[B]::D
 
 
 
@@ -117,7 +127,7 @@ struct D;
 
 
 [#A-0e-B-07-D-0f]
-== xref:#A-0e[pass:[A]]::xref:#A-0e-B-07[pass:[B]]::D
+== xref:#A-0e[A]::xref:#A-0e-B-07[B]::D
 
 
 
@@ -128,7 +138,7 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
-struct xref:#A-0e-B-07-D-09[pass:[D]];
+struct xref:#A-0e-B-07-D-09[D];
 ----
 
 
@@ -137,7 +147,7 @@ struct xref:#A-0e-B-07-D-09[pass:[D]];
 
 
 [#A-0e-B-00]
-== xref:#A-0e[pass:[A]]::B
+== xref:#A-0e[A]::B
 
 
 
@@ -148,19 +158,23 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
-struct xref:#A-0e-B-07[pass:[B]];
+struct xref:#A-0e-B-07[B];
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e-B-00-C[`C`]  ¦
-
-¦xref:#A-0e-B-00-D-09[`D`]  ¦
-
-¦xref:#A-0e-B-00-D-0d[`D`]  ¦
-
+| Name | Description 
+
+| xref:#A-0e-B-00-C[`C`] 
+| 
+    
+| xref:#A-0e-B-00-D-09[`D`] 
+| 
+    
+| xref:#A-0e-B-00-D-0d[`D`] 
+| 
+    
 |===
 
 
@@ -168,7 +182,7 @@ struct xref:#A-0e-B-07[pass:[B]];
 
 
 [#A-0e-B-00-C]
-== xref:#A-0e[pass:[A]]::xref:#A-0e-B-00[pass:[B]]::C
+== xref:#A-0e[A]::xref:#A-0e-B-00[B]::C
 
 
 
@@ -187,7 +201,7 @@ struct C;
 
 
 [#A-0e-B-00-D-09]
-== xref:#A-0e[pass:[A]]::xref:#A-0e-B-00[pass:[B]]::D
+== xref:#A-0e[A]::xref:#A-0e-B-00[B]::D
 
 
 
@@ -207,7 +221,7 @@ struct D;
 
 
 [#A-0e-B-00-D-0d]
-== xref:#A-0e[pass:[A]]::xref:#A-0e-B-00[pass:[B]]::D
+== xref:#A-0e[A]::xref:#A-0e-B-00[B]::D
 
 
 
@@ -218,7 +232,7 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
-struct xref:#A-0e-B-00-D-09[pass:[D]];
+struct xref:#A-0e-B-00-D-09[D];
 ----
 
 
@@ -247,39 +261,55 @@ struct E;
 ----
 
 ===  Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#E-m0[`m0`]  ¦
-
-¦xref:#E-m1[`m1`]  ¦
-
-¦xref:#E-m10[`m10`]  ¦
-
-¦xref:#E-m11[`m11`]  ¦
-
-¦xref:#E-m12[`m12`]  ¦
-
-¦xref:#E-m13[`m13`]  ¦
-
-¦xref:#E-m14[`m14`]  ¦
-
-¦xref:#E-m2[`m2`]  ¦
-
-¦xref:#E-m3[`m3`]  ¦
-
-¦xref:#E-m4[`m4`]  ¦
-
-¦xref:#E-m5[`m5`]  ¦
-
-¦xref:#E-m6[`m6`]  ¦
-
-¦xref:#E-m7[`m7`]  ¦
-
-¦xref:#E-m8[`m8`]  ¦
-
-¦xref:#E-m9[`m9`]  ¦
-
+| Name | Description 
+
+| xref:#E-m0[`m0`] 
+| 
+    
+| xref:#E-m1[`m1`] 
+| 
+    
+| xref:#E-m10[`m10`] 
+| 
+    
+| xref:#E-m11[`m11`] 
+| 
+    
+| xref:#E-m12[`m12`] 
+| 
+    
+| xref:#E-m13[`m13`] 
+| 
+    
+| xref:#E-m14[`m14`] 
+| 
+    
+| xref:#E-m2[`m2`] 
+| 
+    
+| xref:#E-m3[`m3`] 
+| 
+    
+| xref:#E-m4[`m4`] 
+| 
+    
+| xref:#E-m5[`m5`] 
+| 
+    
+| xref:#E-m6[`m6`] 
+| 
+    
+| xref:#E-m7[`m7`] 
+| 
+    
+| xref:#E-m8[`m8`] 
+| 
+    
+| xref:#E-m9[`m9`] 
+| 
+    
 |===
 
 
@@ -287,7 +317,7 @@ struct E;
 
 
 [#E-m0]
-== xref:#E[pass:[E]]::m0
+== xref:#E[E]::m0
 
 
 
@@ -304,7 +334,7 @@ xref:#A-0e[A]::xref:#A-0e-B-00[B] m0;
 
 
 [#E-m1]
-== xref:#E[pass:[E]]::m1
+== xref:#E[E]::m1
 
 
 
@@ -321,7 +351,7 @@ xref:#A-0e[A]::xref:#A-0e-B-00[B] m1;
 
 
 [#E-m2]
-== xref:#E[pass:[E]]::m2
+== xref:#E[E]::m2
 
 
 
@@ -338,7 +368,7 @@ xref:#A-0e[A]::xref:#A-0c-B[B] m2;
 
 
 [#E-m3]
-== xref:#E[pass:[E]]::m3
+== xref:#E[E]::m3
 
 
 
@@ -355,7 +385,7 @@ xref:#A-0e[A]::xref:#A-0e-B-07[B] m3;
 
 
 [#E-m4]
-== xref:#E[pass:[E]]::m4
+== xref:#E[E]::m4
 
 
 
@@ -372,7 +402,7 @@ xref:#A-0e[A]::xref:#A-00-B[B] m4;
 
 
 [#E-m5]
-== xref:#E[pass:[E]]::m5
+== xref:#E[E]::m5
 
 
 
@@ -389,7 +419,7 @@ xref:#A-0e[A]::xref:#A-0e-B-00[B]::xref:#A-0e-B-00-C[C] m5;
 
 
 [#E-m6]
-== xref:#E[pass:[E]]::m6
+== xref:#E[E]::m6
 
 
 
@@ -406,7 +436,7 @@ xref:#A-0e[A]::xref:#A-0e-B-00[B]::xref:#A-0e-B-00-C[C] m6;
 
 
 [#E-m7]
-== xref:#E[pass:[E]]::m7
+== xref:#E[E]::m7
 
 
 
@@ -423,7 +453,7 @@ xref:#A-0e[A]::xref:#A-0c-B[B]::xref:#A-0c-B-C[C] m7;
 
 
 [#E-m8]
-== xref:#E[pass:[E]]::m8
+== xref:#E[E]::m8
 
 
 
@@ -440,7 +470,7 @@ xref:#A-0e[A]::xref:#A-0e-B-07[B]::xref:#A-0e-B-07-C[C] m8;
 
 
 [#E-m9]
-== xref:#E[pass:[E]]::m9
+== xref:#E[E]::m9
 
 
 
@@ -457,7 +487,7 @@ xref:#A-0e[A]::xref:#A-00-B[B]::xref:#A-00-B-C[C] m9;
 
 
 [#E-m10]
-== xref:#E[pass:[E]]::m10
+== xref:#E[E]::m10
 
 
 
@@ -474,7 +504,7 @@ xref:#A-0e[A]::xref:#A-0e-B-00[B]::xref:#A-0e-B-00-D-0d[D]
 
 
 [#E-m11]
-== xref:#E[pass:[E]]::m11
+== xref:#E[E]::m11
 
 
 
@@ -491,7 +521,7 @@ xref:#A-0e[A]::xref:#A-0e-B-00[B]::xref:#A-0e-B-00-D-0d[D] m
 
 
 [#E-m12]
-== xref:#E[pass:[E]]::m12
+== xref:#E[E]::m12
 
 
 
@@ -508,7 +538,7 @@ xref:#A-0e[A]::xref:#A-0c-B[B]::xref:#A-0c-B-D-0b[D] m12;
 
 
 [#E-m13]
-== xref:#E[pass:[E]]::m13
+== xref:#E[E]::m13
 
 
 
@@ -525,7 +555,7 @@ xref:#A-0e[A]::xref:#A-0e-B-07[B]::xref:#A-0e-B-07-D-0f[D]<
 
 
 [#E-m14]
-== xref:#E[pass:[E]]::m14
+== xref:#E[E]::m14
 
 
 
diff --git a/test-files/golden-tests/class-template-specializations-3.html b/test-files/golden-tests/class-template-specializations-3.html
index fa1890690..4d45221f9 100644
--- a/test-files/golden-tests/class-template-specializations-3.html
+++ b/test-files/golden-tests/class-template-specializations-3.html
@@ -9,38 +9,35 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
                

-                                E 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+                    
+                        E 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -57,7 +54,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -67,38 +63,35 @@ 
Synopsis

     

 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                B 
-                            
-
-                                    
                

-                                B 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -117,7 +110,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -127,45 +119,42 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                C 
-                            
-
-                                    
                

-                                D 
-                            
-
-                                    
                

-                                D 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        C 
+                    
+                        
+                            
+                    
+                
+                    
+                        D 
+                    
+                        
+                            
+                    
+                
+                    
+                        D 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -184,7 +173,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -193,7 +181,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -212,7 +200,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -222,7 +209,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -241,7 +228,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -251,7 +237,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -270,7 +256,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -280,45 +265,42 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                C 
-                            
-
-                                    
                

-                                D 
-                            
-
-                                    
                

-                                D 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        C 
+                    
+                        
+                            
+                    
+                
+                    
+                        D 
+                    
+                        
+                            
+                    
+                
+                    
+                        D 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -337,7 +319,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -346,7 +327,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -365,7 +346,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -375,7 +355,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -394,7 +374,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -404,7 +383,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -423,7 +402,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -432,129 +410,126 @@ 
Synopsis

     
 
     

-                    

-                
 Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Data Members

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                
NameDescription

                 

-                                    m0 
-                                
-
-                                        
                

-                                    m1 
-                                
-
-                                        
                

-                                    m10 
-                                
-
-                                        
                

-                                    m11 
-                                
-
-                                        
                

-                                    m12 
-                                
-
-                                        
                

-                                    m13 
-                                
-
-                                        
                

-                                    m14 
-                                
-
-                                        
                

-                                    m2 
-                                
-
-                                        
                

-                                    m3 
-                                
-
-                                        
                

-                                    m4 
-                                
-
-                                        
                

-                                    m5 
-                                
-
-                                        
                

-                                    m6 
-                                
-
-                                        
                

-                                    m7 
-                                
-
-                                        
                

-                                    m8 
-                                
-
-                                        
                

-                                    m9 
-                                
-
-                                        
        

-            

-                                                                                            

+                    
+                        m0 
+                    
+                        
+                            
+                    
+                
+                    
+                        m1 
+                    
+                        
+                            
+                    
+                
+                    
+                        m10 
+                    
+                        
+                            
+                    
+                
+                    
+                        m11 
+                    
+                        
+                            
+                    
+                
+                    
+                        m12 
+                    
+                        
+                            
+                    
+                
+                    
+                        m13 
+                    
+                        
+                            
+                    
+                
+                    
+                        m14 
+                    
+                        
+                            
+                    
+                
+                    
+                        m2 
+                    
+                        
+                            
+                    
+                
+                    
+                        m3 
+                    
+                        
+                            
+                    
+                
+                    
+                        m4 
+                    
+                        
+                            
+                    
+                
+                    
+                        m5 
+                    
+                        
+                            
+                    
+                
+                    
+                        m6 
+                    
+                        
+                            
+                    
+                
+                    
+                        m7 
+                    
+                        
+                            
+                    
+                
+                    
+                        m8 
+                    
+                        
+                            
+                    
+                
+                    
+                        m9 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -573,7 +548,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -597,7 +571,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -621,7 +594,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -645,7 +617,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -669,7 +640,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -693,7 +663,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -717,7 +686,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -741,7 +709,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -765,7 +732,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -789,7 +755,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -813,7 +778,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -837,7 +801,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -861,7 +824,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -885,7 +847,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -909,7 +870,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/class-template.adoc b/test-files/golden-tests/class-template.adoc
index ea4c4e7d7..83a9e5cae 100644
--- a/test-files/golden-tests/class-template.adoc
+++ b/test-files/golden-tests/class-template.adoc
@@ -6,19 +6,25 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C0[`C0`]  ¦
-
-¦xref:#C1[`C1`]  ¦
-
-¦xref:#C2[`C2`]  ¦
-
-¦xref:#C3[`C3`]  ¦
-
-¦xref:#S[`S`]  ¦
-
+| Name | Description 
+
+| xref:#C0[`C0`] 
+| 
+    
+| xref:#C1[`C1`] 
+| 
+    
+| xref:#C2[`C2`] 
+| 
+    
+| xref:#C3[`C3`] 
+| 
+    
+| xref:#S[`S`] 
+| 
+    
 |===
 
 
@@ -58,22 +64,28 @@ struct C0;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C0-N0[`N0`]  ¦
+| Name | Description 
 
+| xref:#C0-N0[`N0`] 
+| 
+    
 |===
 ===  Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C0-w[`w`]  ¦
-
-¦xref:#C0-x[`x`]  ¦
-
-¦xref:#C0-y[`y`]  ¦
-
+| Name | Description 
+
+| xref:#C0-w[`w`] 
+| 
+    
+| xref:#C0-x[`x`] 
+| 
+    
+| xref:#C0-y[`y`] 
+| 
+    
 |===
 
 
@@ -81,7 +93,7 @@ struct C0;
 
 
 [#C0-w]
-== xref:#C0[pass:[C0]]::w
+== xref:#C0[C0]::w
 
 
 
@@ -98,7 +110,7 @@ int w;
 
 
 [#C0-x]
-== xref:#C0[pass:[C0]]::x
+== xref:#C0[C0]::x
 
 
 
@@ -115,7 +127,7 @@ xref:#S[S] x;
 
 
 [#C0-y]
-== xref:#C0[pass:[C0]]::y
+== xref:#C0[C0]::y
 
 
 
@@ -132,7 +144,7 @@ T y;
 
 
 [#C0-N0]
-== xref:#C0[pass:[C0]]::N0
+== xref:#C0[C0]::N0
 
 
 
@@ -146,11 +158,13 @@ struct N0;
 ----
 
 ===  Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C0-N0-z[`z`]  ¦
+| Name | Description 
 
+| xref:#C0-N0-z[`z`] 
+| 
+    
 |===
 
 
@@ -158,7 +172,7 @@ struct N0;
 
 
 [#C0-N0-z]
-== xref:#C0[pass:[C0]]::xref:#C0-N0[pass:[N0]]::z
+== xref:#C0[C0]::xref:#C0-N0[N0]::z
 
 
 
@@ -189,18 +203,22 @@ struct C1;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C1-N1[`N1`]  ¦
+| Name | Description 
 
+| xref:#C1-N1[`N1`] 
+| 
+    
 |===
 ===  Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C1-w[`w`]  ¦
+| Name | Description 
 
+| xref:#C1-w[`w`] 
+| 
+    
 |===
 
 
@@ -208,7 +226,7 @@ struct C1;
 
 
 [#C1-w]
-== xref:#C1[pass:[C1]]::w
+== xref:#C1[C1]::w
 
 
 
@@ -225,7 +243,7 @@ int w;
 
 
 [#C1-N1]
-== xref:#C1[pass:[C1]]::N1
+== xref:#C1[C1]::N1
 
 
 
@@ -240,15 +258,19 @@ struct N1;
 ----
 
 ===  Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C1-N1-x[`x`]  ¦
-
-¦xref:#C1-N1-y[`y`]  ¦
-
-¦xref:#C1-N1-z[`z`]  ¦
-
+| Name | Description 
+
+| xref:#C1-N1-x[`x`] 
+| 
+    
+| xref:#C1-N1-y[`y`] 
+| 
+    
+| xref:#C1-N1-z[`z`] 
+| 
+    
 |===
 
 
@@ -256,7 +278,7 @@ struct N1;
 
 
 [#C1-N1-x]
-== xref:#C1[pass:[C1]]::xref:#C1-N1[pass:[N1]]::x
+== xref:#C1[C1]::xref:#C1-N1[N1]::x
 
 
 
@@ -273,7 +295,7 @@ xref:#S[S] x;
 
 
 [#C1-N1-y]
-== xref:#C1[pass:[C1]]::xref:#C1-N1[pass:[N1]]::y
+== xref:#C1[C1]::xref:#C1-N1[N1]::y
 
 
 
@@ -290,7 +312,7 @@ T y;
 
 
 [#C1-N1-z]
-== xref:#C1[pass:[C1]]::xref:#C1-N1[pass:[N1]]::z
+== xref:#C1[C1]::xref:#C1-N1[N1]::z
 
 
 
@@ -322,18 +344,22 @@ struct C2;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C2-N2[`N2`]  ¦
+| Name | Description 
 
+| xref:#C2-N2[`N2`] 
+| 
+    
 |===
 ===  Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C2-v[`v`]  ¦
+| Name | Description 
 
+| xref:#C2-v[`v`] 
+| 
+    
 |===
 
 
@@ -341,7 +367,7 @@ struct C2;
 
 
 [#C2-v]
-== xref:#C2[pass:[C2]]::v
+== xref:#C2[C2]::v
 
 
 
@@ -358,7 +384,7 @@ int v;
 
 
 [#C2-N2]
-== xref:#C2[pass:[C2]]::N2
+== xref:#C2[C2]::N2
 
 
 
@@ -373,17 +399,22 @@ struct N2;
 ----
 
 ===  Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C2-N2-w[`w`]  ¦
-
-¦xref:#C2-N2-x[`x`]  ¦
-
-¦xref:#C2-N2-y[`y`]  ¦
-
-¦xref:#C2-N2-z[`z`]  ¦
-
+| Name | Description 
+
+| xref:#C2-N2-w[`w`] 
+| 
+    
+| xref:#C2-N2-x[`x`] 
+| 
+    
+| xref:#C2-N2-y[`y`] 
+| 
+    
+| xref:#C2-N2-z[`z`] 
+| 
+    
 |===
 
 
@@ -391,7 +422,7 @@ struct N2;
 
 
 [#C2-N2-w]
-== xref:#C2[pass:[C2]]::xref:#C2-N2[pass:[N2]]::w
+== xref:#C2[C2]::xref:#C2-N2[N2]::w
 
 
 
@@ -408,7 +439,7 @@ xref:#S[S] w;
 
 
 [#C2-N2-x]
-== xref:#C2[pass:[C2]]::xref:#C2-N2[pass:[N2]]::x
+== xref:#C2[C2]::xref:#C2-N2[N2]::x
 
 
 
@@ -425,7 +456,7 @@ T x;
 
 
 [#C2-N2-y]
-== xref:#C2[pass:[C2]]::xref:#C2-N2[pass:[N2]]::y
+== xref:#C2[C2]::xref:#C2-N2[N2]::y
 
 
 
@@ -442,7 +473,7 @@ U y;
 
 
 [#C2-N2-z]
-== xref:#C2[pass:[C2]]::xref:#C2-N2[pass:[N2]]::z
+== xref:#C2[C2]::xref:#C2-N2[N2]::z
 
 
 
@@ -474,11 +505,13 @@ struct C3;
 ----
 
 ===  Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C3-v[`v`]  ¦
+| Name | Description 
 
+| xref:#C3-v[`v`] 
+| 
+    
 |===
 
 
@@ -486,7 +519,7 @@ struct C3;
 
 
 [#C3-v]
-== xref:#C3[pass:[C3]]::v
+== xref:#C3[C3]::v
 
 
 
diff --git a/test-files/golden-tests/class-template.html b/test-files/golden-tests/class-template.html
index 845efc8b7..afdfaf02b 100644
--- a/test-files/golden-tests/class-template.html
+++ b/test-files/golden-tests/class-template.html
@@ -9,59 +9,56 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                C0 
-                            
-
-                                    
                

-                                C1 
-                            
-
-                                    
                

-                                C2 
-                            
-
-                                    
                

-                                C3 
-                            
-
-                                    
                

-                                S 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        C0 
+                    
+                        
+                            
+                    
+                
+                    
+                        C1 
+                    
+                        
+                            
+                    
+                
+                    
+                        C2 
+                    
+                        
+                            
+                    
+                
+                    
+                        C3 
+                    
+                        
+                            
+                    
+                
+                    
+                        S 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -78,7 +75,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -87,7 +83,7 @@ 
Synopsis

     

 
     

-                                                                                                                

+                            
 
 
 
@@ -106,7 +102,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -116,69 +111,63 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                N0 
-                            
-
-                                    
        

-        

-            

-                
 Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                




NameDescription
NameDescription

                 

-                                    w 
-                                
-
-                                        
                

-                                    x 
-                                
-
-                                        
                

-                                    y 
-                                
-
-                                        
        

-            

-                                                                                            

+                    
+                        N0 
+                    
+                        
+                            
+                    
+                
+            
+        
+
 Data Members

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+                    
+                
+            
+        
NameDescription

+                        w 
+                    
+                        
+                            
+                    

+                        x 
+                    
+                        
+                            
+                    

+                        y 
+                    
+                        
+                            
+                    

+                    
 
 
 
@@ -197,7 +186,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -221,7 +209,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -245,7 +232,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -269,7 +255,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -278,31 +263,28 @@ 
Synopsis

     
 
     

-                    

-                
 Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Data Members

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    z 
-                                
+                    NameDescription
        

-            

-                                                                                            

+
+                
+            
+
+                
+                    
+                        z 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -321,7 +303,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -345,7 +326,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -354,55 +334,49 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                N1 
-                            
-
-                                    
        

-        

-            

-                
 Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        




NameDescription
NameDescription

+                        N1 
+                    
+                        
+                            
+                    

+
 Data Members

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    w 
-                                
+                    NameDescription
        

-            

-                                                                                            

+
+                
+            
+
+                
+                    
+                        w 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -421,7 +395,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -445,7 +418,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -455,45 +427,42 @@ 
Synopsis

     
 
     

-                    

-                
 Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Data Members

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                
NameDescription

                 

-                                    x 
-                                
-
-                                        
                

-                                    y 
-                                
-
-                                        
                

-                                    z 
-                                
-
-                                        
        

-            

-                                                                                            

+                    
+                        x 
+                    
+                        
+                            
+                    
+                
+                    
+                        y 
+                    
+                        
+                            
+                    
+                
+                    
+                        z 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -512,7 +481,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -536,7 +504,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -560,7 +527,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -584,7 +550,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -594,55 +559,49 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                N2 
-                            
-
-                                    
        

-        

-            

-                
 Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        




NameDescription
NameDescription

+                        N2 
+                    
+                        
+                            
+                    

+
 Data Members

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    v 
-                                
+                    NameDescription
        

-            

-                                                                                            

+
+                
+            
+
+                
+                    
+                        v 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -661,7 +620,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -685,7 +643,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -695,52 +652,49 @@ 
Synopsis

     
 
     

-                    

-                
 Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Data Members

+




NameDescription

+            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                

                 

-                                    w 
-                                
-
-                                        
                

-                                    x 
-                                
-
-                                        
                

-                                    y 
-                                
-
-                                        
                

-                                    z 
-                                
-
-                                        
        

-            

-                                                                                            

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        w 
+                    
+                        
+                            
+                    
+                
+                    
+                        x 
+                    
+                        
+                            
+                    
+                
+                    
+                        y 
+                    
+                        
+                            
+                    
+                
+                    
+                        z 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -759,7 +713,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -783,7 +736,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -807,7 +759,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -831,7 +782,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -855,7 +805,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -865,31 +814,28 @@ 
Synopsis

     
 
     

-                    

-                
 Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Data Members

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    v 
-                                
+                    NameDescription
        

-            

-                                                                                            

+
+                
+            
+
+                
+                    
+                        v 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -908,7 +854,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/commands.adoc b/test-files/golden-tests/commands.adoc
index 38340cec6..a7b282dc1 100644
--- a/test-files/golden-tests/commands.adoc
+++ b/test-files/golden-tests/commands.adoc
@@ -6,13 +6,15 @@
 == Global namespace
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f1[`f1`]  ¦
+| Name | Description 
 
+| xref:#f1[`f1`] 
+| 
 brief
 
+    
 |===
 
 
diff --git a/test-files/golden-tests/commands.html b/test-files/golden-tests/commands.html
index 517c17cc0..d0cd91b36 100644
--- a/test-files/golden-tests/commands.html
+++ b/test-files/golden-tests/commands.html
@@ -9,33 +9,30 @@
         
Global namespace

     
     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
+
+
+
+                
+            
+
+                
+                    
-                            
-                

                 

-                                    f1 
-                                
-
brief

-                            
+                    		NameDescription

+                        f1 
+                    
+                        
brief

+                        
 
-                                        
        

-            

-            

+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -54,7 +51,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
diff --git a/test-files/golden-tests/concept.adoc b/test-files/golden-tests/concept.adoc
index 49afa1120..4abd82c62 100644
--- a/test-files/golden-tests/concept.adoc
+++ b/test-files/golden-tests/concept.adoc
@@ -6,25 +6,31 @@
 == Global namespace
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f[`f`]  ¦
+| Name | Description 
 
+| xref:#f[`f`] 
+| 
+    
 |===
 === Variables
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#x[`x`]  ¦
+| Name | Description 
 
+| xref:#x[`x`] 
+| 
+    
 |===
 === Concepts
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C[`C`]  ¦
+| Name | Description 
 
+| xref:#C[`C`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/concept.html b/test-files/golden-tests/concept.html
index 16dd02e0c..9031ce915 100644
--- a/test-files/golden-tests/concept.html
+++ b/test-files/golden-tests/concept.html
@@ -9,78 +9,69 @@
         
Global namespace

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-    

-                
Variables

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+
+                
+            
+
-                                
-                                
+                
+            
+        




NameDescription

                 

-                                    x 
-                                
+                    
+                        f 
+                    
+                        
+                            
+                    

+
Variables

+
+            
+                
+                    
+
 
-                                        
-                            
-                
NameDescription
        

-            

-    

-                
Concepts

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+
+                
+            
+
+                
+                    
+                
+            
+        




NameDescription

+                        x 
+                    
+                        
+                            
+                    

+
Concepts

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    C 
-                                
+                    NameDescription
        

-            

+
+                
+            
+
+                
+                    
+                        C 
+                    
+                        
+                            
+                    
+                
+            
+        
     

 
 

@@ -97,7 +88,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -121,7 +111,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -150,7 +139,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/dependency-propagation.adoc b/test-files/golden-tests/dependency-propagation.adoc
index ef066421f..30e3a7d60 100644
--- a/test-files/golden-tests/dependency-propagation.adoc
+++ b/test-files/golden-tests/dependency-propagation.adoc
@@ -6,18 +6,22 @@
 == Global namespace
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N[`N`]  ¦
+| Name | Description 
 
+| xref:#N[`N`] 
+| 
+    
 |===
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#E[`E`]  ¦
+| Name | Description 
 
+| xref:#E[`E`] 
+| 
+    
 |===
 
 
@@ -46,21 +50,25 @@ struct E
 == N
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N-A[`A`]  ¦
-
-¦xref:#N-B[`B`]  ¦
-
-¦xref:#N-C[`C`]  ¦
-
+| Name | Description 
+
+| xref:#N-A[`A`] 
+| 
+    
+| xref:#N-B[`B`] 
+| 
+    
+| xref:#N-C[`C`] 
+| 
+    
 |===
 
 
 
 [#N-C]
-== xref:#N[pass:[N]]::C
+== xref:#N[N]::C
 
 
 
@@ -78,7 +86,7 @@ using C = xref:#N-B[B];
 
 
 [#N-B]
-== xref:#N[pass:[N]]::B
+== xref:#N[N]::B
 
 
 
@@ -96,7 +104,7 @@ using B = xref:#N-A[A];
 
 
 [#N-A]
-== xref:#N[pass:[N]]::A
+== xref:#N[N]::A
 
 
 
diff --git a/test-files/golden-tests/dependency-propagation.html b/test-files/golden-tests/dependency-propagation.html
index a2a3d9770..4ce4bc081 100644
--- a/test-files/golden-tests/dependency-propagation.html
+++ b/test-files/golden-tests/dependency-propagation.html
@@ -9,55 +9,49 @@
         
Global namespace

     
     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                N 
-                            
-
-                                    
        

-        

-

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+                    
+
+
+
+                
+            
+
-                            
-                            
-                        
-            




NameDescription
NameDescription

                 

-                                E 
-                            
-
-                                    
        

-        

-                

+                    
+                        N 
+                    
+                        
+                            
+                    
+                
+            
+        
+
 Types

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        E 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -74,7 +68,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -84,7 +77,7 @@ 
Synopsis

     

 
     

-                                                                                                                

+                            
 
 
 
@@ -93,45 +86,42 @@ 
Synopsis

         
Namespace N

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
                

-                                B 
-                            
-
-                                    
                

-                                C 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+                    
+                        C 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -148,7 +138,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -173,7 +162,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -198,7 +186,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -208,7 +195,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
diff --git a/test-files/golden-tests/duplicate-jdoc.adoc b/test-files/golden-tests/duplicate-jdoc.adoc
index ebcd74a47..fa5179824 100644
--- a/test-files/golden-tests/duplicate-jdoc.adoc
+++ b/test-files/golden-tests/duplicate-jdoc.adoc
@@ -6,33 +6,40 @@
 == Global namespace
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f0[`f0`]  ¦
+| Name | Description 
 
+| xref:#f0[`f0`] 
+| 
 f0 brief
 
-¦xref:#f1[`f1`]  ¦
-
+    
+| xref:#f1[`f1`] 
+| 
 f1 brief
 
-¦xref:#g0[`g0`]  ¦
-
+    
+| xref:#g0[`g0`] 
+| 
 g0 brief
 
-¦xref:#g1[`g1`]  ¦
-
+    
+| xref:#g1[`g1`] 
+| 
 g1 brief
 
-¦xref:#h0[`h0`]  ¦
-
+    
+| xref:#h0[`h0`] 
+| 
 h0 brief
 
-¦xref:#h1[`h1`]  ¦
-
+    
+| xref:#h1[`h1`] 
+| 
 h1 brief
 
+    
 |===
 
 
diff --git a/test-files/golden-tests/duplicate-jdoc.html b/test-files/golden-tests/duplicate-jdoc.html
index 58a0d09ff..0967048d9 100644
--- a/test-files/golden-tests/duplicate-jdoc.html
+++ b/test-files/golden-tests/duplicate-jdoc.html
@@ -9,78 +9,75 @@
         
Global namespace

     
     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
+
+
+
+                
+            
+
+                
+                    
-                            
-                                
-                                
+                
+                    
-                            
-                                
-                                
+                
+                    
-                            
-                                
-                                
+                
+                    
-                            
-                                
-                                
+                
+                    
-                            
-                                
-                                
+                
+                    
-                            
-                

                 

-                                    f0 
-                                
-
f0 brief

-                            
+                    		NameDescription

+                        f0 
+                    
+                        
f0 brief

+                        
 
-                                        
                

-                                    f1 
-                                
-
f1 brief

                             
+                    

+                        f1 
+                    
+                        
f1 brief

+                        
 
-                                        
                

-                                    g0 
-                                
-
g0 brief

                             
+                    

+                        g0 
+                    
+                        
g0 brief

+                        
 
-                                        
                

-                                    g1 
-                                
-
g1 brief

                             
+                    

+                        g1 
+                    
+                        
g1 brief

+                        
 
-                                        
                

-                                    h0 
-                                
-
h0 brief

                             
+                    

+                        h0 
+                    
+                        
h0 brief

+                        
 
-                                        
                

-                                    h1 
-                                
-
h1 brief

                             
+                    

+                        h1 
+                    
+                        
h1 brief

+                        
 
-                                        
        

-            

-            

+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -99,7 +96,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -129,7 +125,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -159,7 +154,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -210,7 +204,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -261,7 +254,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -292,7 +284,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/empty.html b/test-files/golden-tests/empty.html
index 9c4801c6f..3d21a50bd 100644
--- a/test-files/golden-tests/empty.html
+++ b/test-files/golden-tests/empty.html
@@ -9,7 +9,7 @@
         
Global namespace

     
     

-                        

+            
 
 
 
diff --git a/test-files/golden-tests/enum.adoc b/test-files/golden-tests/enum.adoc
index 82d6c338a..4c00193e3 100644
--- a/test-files/golden-tests/enum.adoc
+++ b/test-files/golden-tests/enum.adoc
@@ -6,21 +6,26 @@
 == Global namespace
 
 ===  Enums
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#E0[`E0`]  ¦
+| Name | Description 
 
+| xref:#E0[`E0`] 
+| 
 E0 brief.
 
-¦xref:#E1[`E1`]  ¦
-
-¦xref:#E2[`E2`]  ¦
-
+    
+| xref:#E1[`E1`] 
+| 
+    
+| xref:#E2[`E2`] 
+| 
 E2 brief.
 
-¦xref:#E3[`E3`]  ¦
-
+    
+| xref:#E3[`E3`] 
+| 
+    
 |===
 
 
@@ -62,7 +67,7 @@ E0 description.
 
 
 [#E0-e0]
-== xref:#E0[pass:[E0]]::e0
+== xref:#E0[E0]::e0
 
 
 e0 brief.
@@ -87,7 +92,7 @@ e0 description.
 
 
 [#E0-e1]
-== xref:#E0[pass:[E0]]::e1
+== xref:#E0[E0]::e1
 
 
 e1 brief.
@@ -137,7 +142,7 @@ enum E1 : char;
 
 
 [#E1-e2]
-== xref:#E1[pass:[E1]]::e2
+== xref:#E1[E1]::e2
 
 
 
@@ -154,7 +159,7 @@ e2
 
 
 [#E1-e3]
-== xref:#E1[pass:[E1]]::e3
+== xref:#E1[E1]::e3
 
 
 
@@ -207,7 +212,7 @@ E2 description.
 
 
 [#E2-e4]
-== xref:#E2[pass:[E2]]::e4
+== xref:#E2[E2]::e4
 
 
 e4 brief.
@@ -232,7 +237,7 @@ e4 description.
 
 
 [#E2-e5]
-== xref:#E2[pass:[E2]]::e5
+== xref:#E2[E2]::e5
 
 
 e5 brief.
@@ -282,7 +287,7 @@ enum E3 : char;
 
 
 [#E3-e6]
-== xref:#E3[pass:[E3]]::e6
+== xref:#E3[E3]::e6
 
 
 
@@ -299,7 +304,7 @@ e6
 
 
 [#E3-e7]
-== xref:#E3[pass:[E3]]::e7
+== xref:#E3[E3]::e7
 
 
 
diff --git a/test-files/golden-tests/enum.html b/test-files/golden-tests/enum.html
index b3e1c9af5..6dbea57b8 100644
--- a/test-files/golden-tests/enum.html
+++ b/test-files/golden-tests/enum.html
@@ -9,56 +9,53 @@
         
Global namespace

     
     

-        

-            
 Enums

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Enums

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-                            
-                            
+            
+
+                
+                    
-                        
-                            
-                            
+                
+                    
+                
+                    
-                        
-            

                 

-                                E0 
-                            
-
E0 brief.

-                        
+                    		NameDescription
                

-                                E1 
-                            
-
-                                    
                

-                                E2 
-                            
-
E2 brief.

+
+                

+                        E0 
+                    
+                        
E0 brief.

                         
 
-                                    
                

-                                E3 
-                            
+                            
+                    

+                        E1 
+                    
+                        
+                            
+                    

+                        E2 
+                    
+                        
E2 brief.

+                        
 
-                                    
        

-        

-                

+                            
+                    
+                
+                    
+                        E3 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -77,7 +74,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -135,7 +131,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -166,7 +161,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -195,7 +189,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -241,7 +234,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -264,7 +256,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -289,7 +280,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -347,7 +337,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -378,7 +367,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -407,7 +395,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -453,7 +440,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -476,7 +462,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/explicit-conv-operator.adoc b/test-files/golden-tests/explicit-conv-operator.adoc
index b75101039..e0bac5d3d 100644
--- a/test-files/golden-tests/explicit-conv-operator.adoc
+++ b/test-files/golden-tests/explicit-conv-operator.adoc
@@ -6,17 +6,22 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#Explicit[`Explicit`]  ¦
-
-¦xref:#ExplicitExpression[`ExplicitExpression`]  ¦
-
-¦xref:#ExplicitFalse[`ExplicitFalse`]  ¦
-
-¦xref:#ExplicitTrue[`ExplicitTrue`]  ¦
-
+| Name | Description 
+
+| xref:#Explicit[`Explicit`] 
+| 
+    
+| xref:#ExplicitExpression[`ExplicitExpression`] 
+| 
+    
+| xref:#ExplicitFalse[`ExplicitFalse`] 
+| 
+    
+| xref:#ExplicitTrue[`ExplicitTrue`] 
+| 
+    
 |===
 
 
@@ -36,11 +41,13 @@ struct Explicit;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#Explicit-2conversion[`operator bool`]  ¦
+| Name | Description 
 
+| xref:#Explicit-2conversion[`operator bool`] 
+| 
+    
 |===
 
 
@@ -48,7 +55,7 @@ struct Explicit;
 
 
 [#Explicit-2conversion]
-== xref:#Explicit[pass:[Explicit]]::operator bool
+== xref:#Explicit[Explicit]::operator bool
 
 
 
@@ -86,11 +93,13 @@ struct ExplicitFalse;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#ExplicitFalse-2conversion[`operator bool`]  ¦
+| Name | Description 
 
+| xref:#ExplicitFalse-2conversion[`operator bool`] 
+| 
+    
 |===
 
 
@@ -98,7 +107,7 @@ struct ExplicitFalse;
 
 
 [#ExplicitFalse-2conversion]
-== xref:#ExplicitFalse[pass:[ExplicitFalse]]::operator bool
+== xref:#ExplicitFalse[ExplicitFalse]::operator bool
 
 
 
@@ -136,11 +145,13 @@ struct ExplicitTrue;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#ExplicitTrue-2conversion[`operator bool`]  ¦
+| Name | Description 
 
+| xref:#ExplicitTrue-2conversion[`operator bool`] 
+| 
+    
 |===
 
 
@@ -148,7 +159,7 @@ struct ExplicitTrue;
 
 
 [#ExplicitTrue-2conversion]
-== xref:#ExplicitTrue[pass:[ExplicitTrue]]::operator bool
+== xref:#ExplicitTrue[ExplicitTrue]::operator bool
 
 
 
@@ -187,11 +198,13 @@ struct ExplicitExpression;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#ExplicitExpression-2conversion[`operator bool`]  ¦
+| Name | Description 
 
+| xref:#ExplicitExpression-2conversion[`operator bool`] 
+| 
+    
 |===
 
 
@@ -199,7 +212,7 @@ struct ExplicitExpression;
 
 
 [#ExplicitExpression-2conversion]
-== xref:#ExplicitExpression[pass:[ExplicitExpression]]::operator bool
+== xref:#ExplicitExpression[ExplicitExpression]::operator bool
 
 
 
diff --git a/test-files/golden-tests/explicit-conv-operator.html b/test-files/golden-tests/explicit-conv-operator.html
index ad57099b0..92e770db6 100644
--- a/test-files/golden-tests/explicit-conv-operator.html
+++ b/test-files/golden-tests/explicit-conv-operator.html
@@ -9,52 +9,49 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                Explicit 
-                            
-
-                                    
                

-                                ExplicitExpression 
-                            
-
-                                    
                

-                                ExplicitFalse 
-                            
-
-                                    
                

-                                ExplicitTrue 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        Explicit 
+                    
+                        
+                            
+                    
+                
+                    
+                        ExplicitExpression 
+                    
+                        
+                            
+                    
+                
+                    
+                        ExplicitFalse 
+                    
+                        
+                            
+                    
+                
+                    
+                        ExplicitTrue 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -71,7 +68,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -80,31 +76,28 @@ 
Synopsis

     

 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    operator bool 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        operator bool 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -123,7 +116,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -150,7 +142,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -159,31 +150,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    operator bool 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        operator bool 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -202,7 +190,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -229,7 +216,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -238,31 +224,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    operator bool 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        operator bool 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -281,7 +264,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -308,7 +290,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -318,31 +299,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    operator bool 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        operator bool 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -361,7 +339,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/explicit-ctor.adoc b/test-files/golden-tests/explicit-ctor.adoc
index 19438eda0..0d6706e42 100644
--- a/test-files/golden-tests/explicit-ctor.adoc
+++ b/test-files/golden-tests/explicit-ctor.adoc
@@ -6,17 +6,22 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#Explicit[`Explicit`]  ¦
-
-¦xref:#ExplicitExpression[`ExplicitExpression`]  ¦
-
-¦xref:#ExplicitFalse[`ExplicitFalse`]  ¦
-
-¦xref:#ExplicitTrue[`ExplicitTrue`]  ¦
-
+| Name | Description 
+
+| xref:#Explicit[`Explicit`] 
+| 
+    
+| xref:#ExplicitExpression[`ExplicitExpression`] 
+| 
+    
+| xref:#ExplicitFalse[`ExplicitFalse`] 
+| 
+    
+| xref:#ExplicitTrue[`ExplicitTrue`] 
+| 
+    
 |===
 
 
@@ -36,10 +41,12 @@ struct Explicit;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:Explicit-2constructor[`Explicit`] [.small]#[constructor]# ¦
+| Name | Description 
+
+| xref:Explicit-2constructor[`Explicit`]         [.small]#[constructor]#
+| 
 |===
 
 
@@ -47,7 +54,7 @@ struct Explicit;
 
 [#Explicit-2constructor]
 
-== xref:#Explicit[pass:[Explicit]]::Explicit
+== xref:#Explicit[Explicit]::Explicit
 
   
 
@@ -57,25 +64,25 @@ struct Explicit;
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit
-xref:#Explicit-2constructor-02[pass:[Explicit]]();
+xref:#Explicit-2constructor-02[Explicit]();
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit
-xref:#Explicit-2constructor-00[pass:[Explicit]](xref:#Explicit[Explicit] const&);
+xref:#Explicit-2constructor-00[Explicit](xref:#Explicit[Explicit] const&);
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit
-xref:#Explicit-2constructor-0b[pass:[Explicit]](xref:#Explicit[Explicit]&&) noexcept;
+xref:#Explicit-2constructor-0b[Explicit](xref:#Explicit[Explicit]&&) noexcept;
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit
-xref:#Explicit-2constructor-03[pass:[Explicit]](
+xref:#Explicit-2constructor-03[Explicit](
     int,
     int);
 ----
@@ -90,7 +97,7 @@ xref:#Explicit-2constructor-03[pass:[Explicit]](
 
 
 [#Explicit-2constructor-02]
-== xref:#Explicit[pass:[Explicit]]::Explicit
+== xref:#Explicit[Explicit]::Explicit
 
 
 
@@ -114,7 +121,7 @@ Explicit();
 
 
 [#Explicit-2constructor-00]
-== xref:#Explicit[pass:[Explicit]]::Explicit
+== xref:#Explicit[Explicit]::Explicit
 
 
 
@@ -138,7 +145,7 @@ Explicit(xref:#Explicit[Explicit] const&);
 
 
 [#Explicit-2constructor-0b]
-== xref:#Explicit[pass:[Explicit]]::Explicit
+== xref:#Explicit[Explicit]::Explicit
 
 
 
@@ -162,7 +169,7 @@ Explicit(xref:#Explicit[Explicit]&&) noexcept;
 
 
 [#Explicit-2constructor-03]
-== xref:#Explicit[pass:[Explicit]]::Explicit
+== xref:#Explicit[Explicit]::Explicit
 
 
 
@@ -202,10 +209,12 @@ struct ExplicitTrue;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:ExplicitTrue-2constructor[`ExplicitTrue`] [.small]#[constructor]# ¦
+| Name | Description 
+
+| xref:ExplicitTrue-2constructor[`ExplicitTrue`]         [.small]#[constructor]#
+| 
 |===
 
 
@@ -213,7 +222,7 @@ struct ExplicitTrue;
 
 [#ExplicitTrue-2constructor]
 
-== xref:#ExplicitTrue[pass:[ExplicitTrue]]::ExplicitTrue
+== xref:#ExplicitTrue[ExplicitTrue]::ExplicitTrue
 
   
 
@@ -223,25 +232,25 @@ struct ExplicitTrue;
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit(true)
-xref:#ExplicitTrue-2constructor-0d[pass:[ExplicitTrue]]();
+xref:#ExplicitTrue-2constructor-0d[ExplicitTrue]();
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit(true)
-xref:#ExplicitTrue-2constructor-04[pass:[ExplicitTrue]](xref:#ExplicitTrue[ExplicitTrue] const&);
+xref:#ExplicitTrue-2constructor-04[ExplicitTrue](xref:#ExplicitTrue[ExplicitTrue] const&);
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit(true)
-xref:#ExplicitTrue-2constructor-08[pass:[ExplicitTrue]](xref:#ExplicitTrue[ExplicitTrue]&&) noexcept;
+xref:#ExplicitTrue-2constructor-08[ExplicitTrue](xref:#ExplicitTrue[ExplicitTrue]&&) noexcept;
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit(true)
-xref:#ExplicitTrue-2constructor-05[pass:[ExplicitTrue]](
+xref:#ExplicitTrue-2constructor-05[ExplicitTrue](
     int,
     int);
 ----
@@ -256,7 +265,7 @@ xref:#ExplicitTrue-2constructor-05[pass:[ExplicitTrue]](
 
 
 [#ExplicitTrue-2constructor-0d]
-== xref:#ExplicitTrue[pass:[ExplicitTrue]]::ExplicitTrue
+== xref:#ExplicitTrue[ExplicitTrue]::ExplicitTrue
 
 
 
@@ -280,7 +289,7 @@ ExplicitTrue();
 
 
 [#ExplicitTrue-2constructor-04]
-== xref:#ExplicitTrue[pass:[ExplicitTrue]]::ExplicitTrue
+== xref:#ExplicitTrue[ExplicitTrue]::ExplicitTrue
 
 
 
@@ -304,7 +313,7 @@ ExplicitTrue(xref:#ExplicitTrue[ExplicitTrue] const&);
 
 
 [#ExplicitTrue-2constructor-08]
-== xref:#ExplicitTrue[pass:[ExplicitTrue]]::ExplicitTrue
+== xref:#ExplicitTrue[ExplicitTrue]::ExplicitTrue
 
 
 
@@ -328,7 +337,7 @@ ExplicitTrue(xref:#ExplicitTrue[ExplicitTrue]&&) noexcept;
 
 
 [#ExplicitTrue-2constructor-05]
-== xref:#ExplicitTrue[pass:[ExplicitTrue]]::ExplicitTrue
+== xref:#ExplicitTrue[ExplicitTrue]::ExplicitTrue
 
 
 
@@ -368,10 +377,12 @@ struct ExplicitFalse;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:ExplicitFalse-2constructor[`ExplicitFalse`] [.small]#[constructor]# ¦
+| Name | Description 
+
+| xref:ExplicitFalse-2constructor[`ExplicitFalse`]         [.small]#[constructor]#
+| 
 |===
 
 
@@ -379,7 +390,7 @@ struct ExplicitFalse;
 
 [#ExplicitFalse-2constructor]
 
-== xref:#ExplicitFalse[pass:[ExplicitFalse]]::ExplicitFalse
+== xref:#ExplicitFalse[ExplicitFalse]::ExplicitFalse
 
   
 
@@ -389,25 +400,25 @@ struct ExplicitFalse;
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit(false)
-xref:#ExplicitFalse-2constructor-01[pass:[ExplicitFalse]]();
+xref:#ExplicitFalse-2constructor-01[ExplicitFalse]();
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit(false)
-xref:#ExplicitFalse-2constructor-08[pass:[ExplicitFalse]](xref:#ExplicitFalse[ExplicitFalse] const&);
+xref:#ExplicitFalse-2constructor-08[ExplicitFalse](xref:#ExplicitFalse[ExplicitFalse] const&);
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit(false)
-xref:#ExplicitFalse-2constructor-0a[pass:[ExplicitFalse]](xref:#ExplicitFalse[ExplicitFalse]&&) noexcept;
+xref:#ExplicitFalse-2constructor-0a[ExplicitFalse](xref:#ExplicitFalse[ExplicitFalse]&&) noexcept;
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit(false)
-xref:#ExplicitFalse-2constructor-04[pass:[ExplicitFalse]](
+xref:#ExplicitFalse-2constructor-04[ExplicitFalse](
     int,
     int);
 ----
@@ -422,7 +433,7 @@ xref:#ExplicitFalse-2constructor-04[pass:[ExplicitFalse]](
 
 
 [#ExplicitFalse-2constructor-01]
-== xref:#ExplicitFalse[pass:[ExplicitFalse]]::ExplicitFalse
+== xref:#ExplicitFalse[ExplicitFalse]::ExplicitFalse
 
 
 
@@ -446,7 +457,7 @@ ExplicitFalse();
 
 
 [#ExplicitFalse-2constructor-08]
-== xref:#ExplicitFalse[pass:[ExplicitFalse]]::ExplicitFalse
+== xref:#ExplicitFalse[ExplicitFalse]::ExplicitFalse
 
 
 
@@ -470,7 +481,7 @@ ExplicitFalse(xref:#ExplicitFalse[ExplicitFalse] const&);
 
 
 [#ExplicitFalse-2constructor-0a]
-== xref:#ExplicitFalse[pass:[ExplicitFalse]]::ExplicitFalse
+== xref:#ExplicitFalse[ExplicitFalse]::ExplicitFalse
 
 
 
@@ -494,7 +505,7 @@ ExplicitFalse(xref:#ExplicitFalse[ExplicitFalse]&&) noexcept;
 
 
 [#ExplicitFalse-2constructor-04]
-== xref:#ExplicitFalse[pass:[ExplicitFalse]]::ExplicitFalse
+== xref:#ExplicitFalse[ExplicitFalse]::ExplicitFalse
 
 
 
@@ -535,10 +546,12 @@ struct ExplicitExpression;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:ExplicitExpression-2constructor[`ExplicitExpression`] [.small]#[constructor]# ¦
+| Name | Description 
+
+| xref:ExplicitExpression-2constructor[`ExplicitExpression`]         [.small]#[constructor]#
+| 
 |===
 
 
@@ -546,7 +559,7 @@ struct ExplicitExpression;
 
 [#ExplicitExpression-2constructor]
 
-== xref:#ExplicitExpression[pass:[ExplicitExpression]]::ExplicitExpression
+== xref:#ExplicitExpression[ExplicitExpression]::ExplicitExpression
 
   
 
@@ -556,25 +569,25 @@ struct ExplicitExpression;
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit(B)
-xref:#ExplicitExpression-2constructor-0b[pass:[ExplicitExpression]]();
+xref:#ExplicitExpression-2constructor-0b[ExplicitExpression]();
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit(B)
-xref:#ExplicitExpression-2constructor-04[pass:[ExplicitExpression]](xref:#ExplicitExpression[ExplicitExpression] const&);
+xref:#ExplicitExpression-2constructor-04[ExplicitExpression](xref:#ExplicitExpression[ExplicitExpression] const&);
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit(B)
-xref:#ExplicitExpression-2constructor-08[pass:[ExplicitExpression]](xref:#ExplicitExpression[ExplicitExpression]&&) noexcept;
+xref:#ExplicitExpression-2constructor-08[ExplicitExpression](xref:#ExplicitExpression[ExplicitExpression]&&) noexcept;
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit(B)
-xref:#ExplicitExpression-2constructor-02[pass:[ExplicitExpression]](
+xref:#ExplicitExpression-2constructor-02[ExplicitExpression](
     int,
     int);
 ----
@@ -589,7 +602,7 @@ xref:#ExplicitExpression-2constructor-02[pass:[ExplicitExpression]](
 
 
 [#ExplicitExpression-2constructor-0b]
-== xref:#ExplicitExpression[pass:[ExplicitExpression]]::ExplicitExpression
+== xref:#ExplicitExpression[ExplicitExpression]::ExplicitExpression
 
 
 
@@ -613,7 +626,7 @@ ExplicitExpression();
 
 
 [#ExplicitExpression-2constructor-04]
-== xref:#ExplicitExpression[pass:[ExplicitExpression]]::ExplicitExpression
+== xref:#ExplicitExpression[ExplicitExpression]::ExplicitExpression
 
 
 
@@ -637,7 +650,7 @@ ExplicitExpression(xref:#ExplicitExpression[ExplicitExpression] const&);
 
 
 [#ExplicitExpression-2constructor-08]
-== xref:#ExplicitExpression[pass:[ExplicitExpression]]::ExplicitExpression
+== xref:#ExplicitExpression[ExplicitExpression]::ExplicitExpression
 
 
 
@@ -661,7 +674,7 @@ ExplicitExpression(xref:#ExplicitExpression[ExplicitExpression]&&) noexcept;
 
 
 [#ExplicitExpression-2constructor-02]
-== xref:#ExplicitExpression[pass:[ExplicitExpression]]::ExplicitExpression
+== xref:#ExplicitExpression[ExplicitExpression]::ExplicitExpression
 
 
 
diff --git a/test-files/golden-tests/explicit-ctor.html b/test-files/golden-tests/explicit-ctor.html
index a62188395..90db63485 100644
--- a/test-files/golden-tests/explicit-ctor.html
+++ b/test-files/golden-tests/explicit-ctor.html
@@ -9,52 +9,49 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                Explicit 
-                            
-
-                                    
                

-                                ExplicitExpression 
-                            
-
-                                    
                

-                                ExplicitFalse 
-                            
-
-                                    
                

-                                ExplicitTrue 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        Explicit 
+                    
+                        
+                            
+                    
+                
+                    
+                        ExplicitExpression 
+                    
+                        
+                            
+                    
+                
+                    
+                        ExplicitFalse 
+                    
+                        
+                            
+                    
+                
+                    
+                        ExplicitTrue 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -71,7 +68,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -80,30 +76,29 @@ 
Synopsis

     

 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    Explicit         [constructor]
-                                
-    
        

-            

-                                                                                                    

+                    
+                        Explicit         
+                                [constructor]
+                            
+                    
+                        
+                    
+                
+            
+        
+                    
 
 
 
@@ -157,7 +152,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -184,7 +178,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -211,7 +204,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -238,7 +230,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -267,7 +258,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -276,30 +266,29 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
-                            
-                

                 

-                                    ExplicitTrue         [constructor]
-                                
-    
        

-            

-                                                                                                    

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        ExplicitTrue         
+                                [constructor]
+                            
+                    
+                        
+                    
+                
+            
+        
+                    
 
 
 
@@ -353,7 +342,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -380,7 +368,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -407,7 +394,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -434,7 +420,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -463,7 +448,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -472,30 +456,29 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
-                            
-                

                 

-                                    ExplicitFalse         [constructor]
-                                
-    
        

-            

-                                                                                                    

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        ExplicitFalse         
+                                [constructor]
+                            
+                    
+                        
+                    
+                
+            
+        
+                    
 
 
 
@@ -549,7 +532,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -576,7 +558,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -603,7 +584,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -630,7 +610,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -659,7 +638,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -669,30 +647,29 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    ExplicitExpression         [constructor]
-                                
-    
        

-            

-                                                                                                    

+                    
+                        ExplicitExpression         
+                                [constructor]
+                            
+                    
+                        
+                    
+                
+            
+        
+                    
 
 
 
@@ -746,7 +723,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -773,7 +749,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -800,7 +775,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -827,7 +801,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/explicit-deduct-guide.adoc b/test-files/golden-tests/explicit-deduct-guide.adoc
index 6e0856693..3bb7b1b9e 100644
--- a/test-files/golden-tests/explicit-deduct-guide.adoc
+++ b/test-files/golden-tests/explicit-deduct-guide.adoc
@@ -6,24 +6,31 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#X-0e[`X`]  ¦
+| Name | Description 
 
+| xref:#X-0e[`X`] 
+| 
+    
 |===
 ===  Deduction Guides
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#X-0d[`X<0>`]  ¦
-
-¦xref:#X-00[`X<0>`]  ¦
-
-¦xref:#X-0b[`X<0>`]  ¦
-
-¦xref:#X-06[`X<0>`]  ¦
-
+| Name | Description 
+
+| xref:#X-0d[`X<0>`] 
+| 
+    
+| xref:#X-00[`X<0>`] 
+| 
+    
+| xref:#X-0b[`X<0>`] 
+| 
+    
+| xref:#X-06[`X<0>`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/explicit-deduct-guide.html b/test-files/golden-tests/explicit-deduct-guide.html
index 66276f417..16c644f30 100644
--- a/test-files/golden-tests/explicit-deduct-guide.html
+++ b/test-files/golden-tests/explicit-deduct-guide.html
@@ -9,75 +9,69 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                X 
-                            
-
-                                    
        

-        

-            

-            
 Deduction Guides

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+                    
+
+
+
+                
+            
+
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            




NameDescription
NameDescription

                 

-                                X<0> 
-                            
-
-                                    
                

-                                X<0> 
-                            
-
-                                    
                

-                                X<0> 
-                            
-
-                                    
                

-                                X<0> 
-                            
-
-                                    
        

-        

+                    
+                        X 
+                    
+                        
+                            
+                    
+                
+            
+        
+
 Deduction Guides

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+            
+        
NameDescription

+                        X<0> 
+                    
+                        
+                            
+                    

+                        X<0> 
+                    
+                        
+                            
+                    

+                        X<0> 
+                    
+                        
+                            
+                    

+                        X<0> 
+                    
+                        
+                            
+                    

     

 
 

@@ -95,7 +89,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -105,7 +98,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -124,7 +117,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -148,7 +140,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -172,7 +163,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -196,7 +186,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/explicit-object-parameter.adoc b/test-files/golden-tests/explicit-object-parameter.adoc
index 5d1358a4b..d18dadde8 100644
--- a/test-files/golden-tests/explicit-object-parameter.adoc
+++ b/test-files/golden-tests/explicit-object-parameter.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#Optional[`Optional`]  ¦
+| Name | Description 
 
+| xref:#Optional[`Optional`] 
+| 
+    
 |===
 
 
@@ -30,10 +32,12 @@ struct Optional;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:Optional-value[`value`]  ¦
+| Name | Description 
+
+| xref:Optional-value[`value`] 
+| 
 |===
 
 
@@ -41,7 +45,7 @@ struct Optional;
 
 [#Optional-value]
 
-== xref:#Optional[pass:[Optional]]::value
+== xref:#Optional[Optional]::value
 
   
 
@@ -53,7 +57,7 @@ struct Optional;
 template
 constexpr
 auto&&
-xref:#Optional-value-05[pass:[value]](this Self&& self);
+xref:#Optional-value-05[value](this Self&& self);
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
@@ -61,7 +65,7 @@ xref:#Optional-value-05[pass:[value]](this Self&& self);
 template
 constexpr
 auto&&
-xref:#Optional-value-06[pass:[value]](this 
+xref:#Optional-value-06[value](this 
     Self&& self,
     int x);
 ----
@@ -76,7 +80,7 @@ xref:#Optional-value-06[pass:[value]](this
 
 
 [#Optional-value-05]
-== xref:#Optional[pass:[Optional]]::value
+== xref:#Optional[Optional]::value
 
 
 
@@ -102,7 +106,7 @@ value(this Self&& self);
 
 
 [#Optional-value-06]
-== xref:#Optional[pass:[Optional]]::value
+== xref:#Optional[Optional]::value
 
 
 
diff --git a/test-files/golden-tests/explicit-object-parameter.html b/test-files/golden-tests/explicit-object-parameter.html
index 0c6962716..8e9f411cb 100644
--- a/test-files/golden-tests/explicit-object-parameter.html
+++ b/test-files/golden-tests/explicit-object-parameter.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                Optional 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        Optional 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -59,30 +55,27 @@ 
Synopsis

     

 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    value 
-                                
-    
        

-            

-                                                                                                    

+                    
+                        value 
+                    
+                        
+                    
+                
+            
+        
+                    
 
 
 
@@ -130,7 +123,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -160,7 +152,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/filters/blacklist_0.adoc b/test-files/golden-tests/filters/blacklist_0.adoc
index ed8a7fde4..e65d3bb1b 100644
--- a/test-files/golden-tests/filters/blacklist_0.adoc
+++ b/test-files/golden-tests/filters/blacklist_0.adoc
@@ -6,17 +6,22 @@
 == Global namespace
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N0[`N0`]  ¦
-
-¦xref:#N3[`N3`]  ¦
-
-¦xref:#N4[`N4`]  ¦
-
-¦xref:#N7[`N7`]  ¦
-
+| Name | Description 
+
+| xref:#N0[`N0`] 
+| 
+    
+| xref:#N3[`N3`] 
+| 
+    
+| xref:#N4[`N4`] 
+| 
+    
+| xref:#N7[`N7`] 
+| 
+    
 |===
 
 
@@ -25,17 +30,19 @@
 == N0
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N0-f0[`f0`]  ¦
+| Name | Description 
 
+| xref:#N0-f0[`f0`] 
+| 
+    
 |===
 
 
 
 [#N0-f0]
-== xref:#N0[pass:[N0]]::f0
+== xref:#N0[N0]::f0
 
 
 
@@ -68,32 +75,37 @@ f0();
 == N4
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N4-N5[`N5`]  ¦
-
-¦xref:#N4-N6[`N6`]  ¦
-
+| Name | Description 
+
+| xref:#N4-N5[`N5`] 
+| 
+    
+| xref:#N4-N6[`N6`] 
+| 
+    
 |===
 
 
 
 [#N4-N5]
-== xref:#N4[pass:[N4]]::N5
+== xref:#N4[N4]::N5
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N4-N5-f1[`f1`]  ¦
+| Name | Description 
 
+| xref:#N4-N5-f1[`f1`] 
+| 
+    
 |===
 
 
 
 [#N4-N5-f1]
-== xref:#N4[pass:[N4]]::xref:#N4-N5[pass:[N5]]::f1
+== xref:#N4[N4]::xref:#N4-N5[N5]::f1
 
 
 
@@ -117,20 +129,22 @@ f1();
 
 
 [#N4-N6]
-== xref:#N4[pass:[N4]]::N6
+== xref:#N4[N4]::N6
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N4-N6-f1[`f1`]  ¦
+| Name | Description 
 
+| xref:#N4-N6-f1[`f1`] 
+| 
+    
 |===
 
 
 
 [#N4-N6-f1]
-== xref:#N4[pass:[N4]]::xref:#N4-N6[pass:[N6]]::f1
+== xref:#N4[N4]::xref:#N4-N6[N6]::f1
 
 
 
@@ -157,38 +171,43 @@ f1();
 == N7
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N7-N8[`N8`]  ¦
-
-¦xref:#N7-N9[`N9`]  ¦
-
+| Name | Description 
+
+| xref:#N7-N8[`N8`] 
+| 
+    
+| xref:#N7-N9[`N9`] 
+| 
+    
 |===
 
 
 
 [#N7-N8]
-== xref:#N7[pass:[N7]]::N8
+== xref:#N7[N7]::N8
 
 
 
 
 [#N7-N9]
-== xref:#N7[pass:[N7]]::N9
+== xref:#N7[N7]::N9
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N7-N9-g0[`g0`]  ¦
+| Name | Description 
 
+| xref:#N7-N9-g0[`g0`] 
+| 
+    
 |===
 
 
 
 [#N7-N9-g0]
-== xref:#N7[pass:[N7]]::xref:#N7-N9[pass:[N9]]::g0
+== xref:#N7[N7]::xref:#N7-N9[N9]::g0
 
 
 
diff --git a/test-files/golden-tests/filters/blacklist_0.html b/test-files/golden-tests/filters/blacklist_0.html
index b3cbb1a2e..50f4f610f 100644
--- a/test-files/golden-tests/filters/blacklist_0.html
+++ b/test-files/golden-tests/filters/blacklist_0.html
@@ -9,83 +9,77 @@
         
Global namespace

     
     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                N0 
-                            
-
-                                    
                

-                                N3 
-                            
-
-                                    
                

-                                N4 
-                            
-
-                                    
                

-                                N7 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        N0 
+                    
+                        
+                            
+                    
+                
+                    
+                        N3 
+                    
+                        
+                            
+                    
+                
+                    
+                        N4 
+                    
+                        
+                            
+                    
+                
+                    
+                        N7 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

         
Namespace N0

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
-                            
-                

                 

-                                    f0 
-                                
-
-                                        
        

-            

-            

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        f0 
+                    
+                        
+                            
+                    
+                
+            
+        
+    

 
 

     

@@ -102,7 +96,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -120,76 +113,70 @@ 
Synopsis

         
Namespace N3

     

     

-                        

+            
 
 

     

         
Namespace N4

     

     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                N5 
-                            
-
-                                    
                

-                                N6 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        N5 
+                    
+                        
+                            
+                    
+                
+                    
+                        N6 
+                    
+                        
+                            
+                    
+                
+            
+        
+    

 
 

     

         
Namespace N5

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
-                            
-                

                 

-                                    f1 
-                                
-
-                                        
        

-            

-            

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        f1 
+                    
+                        
+                            
+                    
+                
+            
+        
+    

 
 

     

@@ -206,7 +193,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -224,31 +210,28 @@ 
Synopsis

         
Namespace N6

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
-                            
-                

                 

-                                    f1 
-                                
-
-                                        
        

-            

-            

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        f1 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -265,7 +248,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -283,76 +265,70 @@ 
Synopsis

         
Namespace N7

     

     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                N8 
-                            
-
-                                    
                

-                                N9 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        N8 
+                    
+                        
+                            
+                    
+                
+                    
+                        N9 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

         
Namespace N8

     

     

-                        

+            

 
 

     

         
Namespace N9

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
-                            
-                

                 

-                                    g0 
-                                
-
-                                        
        

-            

-            

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        g0 
+                    
+                        
+                            
+                    
+                
+            
+        
+    

 
 

     

@@ -369,7 +345,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
diff --git a/test-files/golden-tests/filters/blacklist_test.adoc b/test-files/golden-tests/filters/blacklist_test.adoc
index 11d27ca61..9a2a61d80 100644
--- a/test-files/golden-tests/filters/blacklist_test.adoc
+++ b/test-files/golden-tests/filters/blacklist_test.adoc
@@ -6,13 +6,16 @@
 == Global namespace
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#blacklisted[`blacklisted`]  ¦
-
-¦xref:#to_be_documented[`to_be_documented`]  ¦
-
+| Name | Description 
+
+| xref:#blacklisted[`blacklisted`] 
+| 
+    
+| xref:#to_be_documented[`to_be_documented`] 
+| 
+    
 |===
 
 
@@ -21,17 +24,19 @@
 == to_be_documented
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#to_be_documented-documented_function[`documented_function`]  ¦
+| Name | Description 
 
+| xref:#to_be_documented-documented_function[`documented_function`] 
+| 
+    
 |===
 
 
 
 [#to_be_documented-documented_function]
-== xref:#to_be_documented[pass:[to_be_documented]]::documented_function
+== xref:#to_be_documented[to_be_documented]::documented_function
 
 
 
diff --git a/test-files/golden-tests/filters/blacklist_test.html b/test-files/golden-tests/filters/blacklist_test.html
index 59db73c37..7c96b8925 100644
--- a/test-files/golden-tests/filters/blacklist_test.html
+++ b/test-files/golden-tests/filters/blacklist_test.html
@@ -9,69 +9,63 @@
         
Global namespace

     

     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                blacklisted 
-                            
+                    NameDescription
                

-                                to_be_documented 
-                            
 
-                                    
        

-        

-                

+                
+            
+
+                
+                    
+                        blacklisted 
+                    
+                        
+                            
+                    
+                
+                    
+                        to_be_documented 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

         
Namespace to_be_documented

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    documented_function 
-                                
+                    NameDescription
        

-            

-            

+
+                
+            
+
+                
+                    
+                        documented_function 
+                    
+                        
+                            
+                    
+                
+            
+        
+    

 
 

     

@@ -88,7 +82,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -106,7 +99,7 @@ 
Synopsis

         
Namespace blacklisted

     

     

-                        

+            
 
 
 
diff --git a/test-files/golden-tests/filters/filters.adoc b/test-files/golden-tests/filters/filters.adoc
index 5d93bcc13..abaee70f4 100644
--- a/test-files/golden-tests/filters/filters.adoc
+++ b/test-files/golden-tests/filters/filters.adoc
@@ -6,19 +6,25 @@
 == Global namespace
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
-
-¦xref:#B[`B`]  ¦
-
-¦xref:#C[`C`]  ¦
-
-¦xref:#D[`D`]  ¦
-
-¦xref:#F[`F`]  ¦
+| Name | Description 
 
+| xref:#A[`A`] 
+| 
+    
+| xref:#B[`B`] 
+| 
+    
+| xref:#C[`C`] 
+| 
+    
+| xref:#D[`D`] 
+| 
+    
+| xref:#F[`F`] 
+| 
+    
 |===
 
 
@@ -27,26 +33,31 @@
 == A
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-detail[`detail`]  ¦
-
-¦xref:#A-detair[`detair`]  ¦
+| Name | Description 
 
+| xref:#A-detail[`detail`] 
+| 
+    
+| xref:#A-detair[`detair`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-f0[`f0`]  ¦
+| Name | Description 
 
+| xref:#A-f0[`f0`] 
+| 
+    
 |===
 
 
 
 [#A-f0]
-== xref:#A[pass:[A]]::f0
+== xref:#A[A]::f0
 
 
 
@@ -70,20 +81,22 @@ f0();
 
 
 [#A-detail]
-== xref:#A[pass:[A]]::detail
+== xref:#A[A]::detail
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-detail-g0[`g0`]  ¦
+| Name | Description 
 
+| xref:#A-detail-g0[`g0`] 
+| 
+    
 |===
 
 
 
 [#A-detail-g0]
-== xref:#A[pass:[A]]::xref:#A-detail[pass:[detail]]::g0
+== xref:#A[A]::xref:#A-detail[detail]::g0
 
 
 
@@ -107,27 +120,31 @@ g0();
 
 
 [#A-detair]
-== xref:#A[pass:[A]]::detair
+== xref:#A[A]::detair
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-detair-Y[`Y`]  ¦
+| Name | Description 
 
+| xref:#A-detair-Y[`Y`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-detair-f4[`f4`]  ¦
+| Name | Description 
 
+| xref:#A-detair-f4[`f4`] 
+| 
+    
 |===
 
 
 
 [#A-detair-f4]
-== xref:#A[pass:[A]]::xref:#A-detair[pass:[detair]]::f4
+== xref:#A[A]::xref:#A-detair[detair]::f4
 
 
 
@@ -151,7 +168,7 @@ f4();
 
 
 [#A-detair-Y]
-== xref:#A[pass:[A]]::xref:#A-detair[pass:[detair]]::Y
+== xref:#A[A]::xref:#A-detair[detair]::Y
 
 
 
@@ -165,18 +182,22 @@ struct Y;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-detair-Y-Z[`Z`]  ¦
+| Name | Description 
 
+| xref:#A-detair-Y-Z[`Z`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-detair-Y-f6[`f6`]  ¦
+| Name | Description 
 
+| xref:#A-detair-Y-f6[`f6`] 
+| 
+    
 |===
 
 
@@ -184,7 +205,7 @@ struct Y;
 
 
 [#A-detair-Y-f6]
-== xref:#A[pass:[A]]::xref:#A-detair[pass:[detair]]::xref:#A-detair-Y[pass:[Y]]::f6
+== xref:#A[A]::xref:#A-detair[detair]::xref:#A-detair-Y[Y]::f6
 
 
 
@@ -208,7 +229,7 @@ f6();
 
 
 [#A-detair-Y-Z]
-== xref:#A[pass:[A]]::xref:#A-detair[pass:[detair]]::xref:#A-detair-Y[pass:[Y]]::Z
+== xref:#A[A]::xref:#A-detair[detair]::xref:#A-detair-Y[Y]::Z
 
 
 
@@ -222,11 +243,13 @@ struct Z;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-detair-Y-Z-f7[`f7`]  ¦
+| Name | Description 
 
+| xref:#A-detair-Y-Z-f7[`f7`] 
+| 
+    
 |===
 
 
@@ -234,7 +257,7 @@ struct Z;
 
 
 [#A-detair-Y-Z-f7]
-== xref:#A[pass:[A]]::xref:#A-detair[pass:[detair]]::xref:#A-detair-Y[pass:[Y]]::xref:#A-detair-Y-Z[pass:[Z]]::f7
+== xref:#A[A]::xref:#A-detair[detair]::xref:#A-detair-Y[Y]::xref:#A-detair-Y-Z[Z]::f7
 
 
 
@@ -261,24 +284,28 @@ f7();
 == B
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#B-detair[`detair`]  ¦
+| Name | Description 
 
+| xref:#B-detair[`detair`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#B-f0[`f0`]  ¦
+| Name | Description 
 
+| xref:#B-f0[`f0`] 
+| 
+    
 |===
 
 
 
 [#B-f0]
-== xref:#B[pass:[B]]::f0
+== xref:#B[B]::f0
 
 
 
@@ -302,27 +329,31 @@ f0();
 
 
 [#B-detair]
-== xref:#B[pass:[B]]::detair
+== xref:#B[B]::detair
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#B-detair-Y[`Y`]  ¦
+| Name | Description 
 
+| xref:#B-detair-Y[`Y`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#B-detair-f4[`f4`]  ¦
+| Name | Description 
 
+| xref:#B-detair-f4[`f4`] 
+| 
+    
 |===
 
 
 
 [#B-detair-f4]
-== xref:#B[pass:[B]]::xref:#B-detair[pass:[detair]]::f4
+== xref:#B[B]::xref:#B-detair[detair]::f4
 
 
 
@@ -346,7 +377,7 @@ f4();
 
 
 [#B-detair-Y]
-== xref:#B[pass:[B]]::xref:#B-detair[pass:[detair]]::Y
+== xref:#B[B]::xref:#B-detair[detair]::Y
 
 
 
@@ -360,18 +391,22 @@ struct Y;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#B-detair-Y-Z[`Z`]  ¦
+| Name | Description 
 
+| xref:#B-detair-Y-Z[`Z`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#B-detair-Y-f6[`f6`]  ¦
+| Name | Description 
 
+| xref:#B-detair-Y-f6[`f6`] 
+| 
+    
 |===
 
 
@@ -379,7 +414,7 @@ struct Y;
 
 
 [#B-detair-Y-f6]
-== xref:#B[pass:[B]]::xref:#B-detair[pass:[detair]]::xref:#B-detair-Y[pass:[Y]]::f6
+== xref:#B[B]::xref:#B-detair[detair]::xref:#B-detair-Y[Y]::f6
 
 
 
@@ -403,7 +438,7 @@ f6();
 
 
 [#B-detair-Y-Z]
-== xref:#B[pass:[B]]::xref:#B-detair[pass:[detair]]::xref:#B-detair-Y[pass:[Y]]::Z
+== xref:#B[B]::xref:#B-detair[detair]::xref:#B-detair-Y[Y]::Z
 
 
 
@@ -417,11 +452,13 @@ struct Z;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#B-detair-Y-Z-f7[`f7`]  ¦
+| Name | Description 
 
+| xref:#B-detair-Y-Z-f7[`f7`] 
+| 
+    
 |===
 
 
@@ -429,7 +466,7 @@ struct Z;
 
 
 [#B-detair-Y-Z-f7]
-== xref:#B[pass:[B]]::xref:#B-detair[pass:[detair]]::xref:#B-detair-Y[pass:[Y]]::xref:#B-detair-Y-Z[pass:[Z]]::f7
+== xref:#B[B]::xref:#B-detair[detair]::xref:#B-detair-Y[Y]::xref:#B-detair-Y-Z[Z]::f7
 
 
 
@@ -456,17 +493,19 @@ f7();
 == C
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C-g0[`g0`]  ¦
+| Name | Description 
 
+| xref:#C-g0[`g0`] 
+| 
+    
 |===
 
 
 
 [#C-g0]
-== xref:#C[pass:[C]]::g0
+== xref:#C[C]::g0
 
 
 
@@ -493,39 +532,46 @@ g0();
 == D
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#D-E[`E`]  ¦
+| Name | Description 
 
+| xref:#D-E[`E`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#D-f1[`f1`]  ¦
-
-¦xref:#D-g1[`g1`]  ¦
+| Name | Description 
 
+| xref:#D-f1[`f1`] 
+| 
+    
+| xref:#D-g1[`g1`] 
+| 
+    
 |===
 
 
 
 [#D-E]
-== xref:#D[pass:[D]]::E
+== xref:#D[D]::E
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#D-E-g0[`g0`]  ¦
+| Name | Description 
 
+| xref:#D-E-g0[`g0`] 
+| 
+    
 |===
 
 
 
 [#D-E-g0]
-== xref:#D[pass:[D]]::xref:#D-E[pass:[E]]::g0
+== xref:#D[D]::xref:#D-E[E]::g0
 
 
 
@@ -549,7 +595,7 @@ g0();
 
 
 [#D-f1]
-== xref:#D[pass:[D]]::f1
+== xref:#D[D]::f1
 
 
 
@@ -573,7 +619,7 @@ f1();
 
 
 [#D-g1]
-== xref:#D[pass:[D]]::g1
+== xref:#D[D]::g1
 
 
 
@@ -600,24 +646,28 @@ g1();
 == F
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#F-G[`G`]  ¦
+| Name | Description 
 
+| xref:#F-G[`G`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#F-g0[`g0`]  ¦
+| Name | Description 
 
+| xref:#F-g0[`g0`] 
+| 
+    
 |===
 
 
 
 [#F-g0]
-== xref:#F[pass:[F]]::g0
+== xref:#F[F]::g0
 
 
 
@@ -641,22 +691,25 @@ g0();
 
 
 [#F-G]
-== xref:#F[pass:[F]]::G
+== xref:#F[F]::G
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#F-G-f1[`f1`]  ¦
-
-¦xref:#F-G-g1[`g1`]  ¦
+| Name | Description 
 
+| xref:#F-G-f1[`f1`] 
+| 
+    
+| xref:#F-G-g1[`g1`] 
+| 
+    
 |===
 
 
 
 [#F-G-f1]
-== xref:#F[pass:[F]]::xref:#F-G[pass:[G]]::f1
+== xref:#F[F]::xref:#F-G[G]::f1
 
 
 
@@ -680,7 +733,7 @@ f1();
 
 
 [#F-G-g1]
-== xref:#F[pass:[F]]::xref:#F-G[pass:[G]]::g1
+== xref:#F[F]::xref:#F-G[G]::g1
 
 
 
diff --git a/test-files/golden-tests/filters/filters.html b/test-files/golden-tests/filters/filters.html
index 16b2142a8..73183bfd4 100644
--- a/test-files/golden-tests/filters/filters.html
+++ b/test-files/golden-tests/filters/filters.html
@@ -9,121 +9,112 @@
         
Global namespace

     
     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
                

-                                B 
-                            
-
-                                    
                

-                                C 
-                            
-
-                                    
                

-                                D 
-                            
-
-                                    
                

-                                F 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+                    
+                        C 
+                    
+                        
+                            
+                    
+                
+                    
+                        D 
+                    
+                        
+                            
+                    
+                
+                    
+                        F 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

         
Namespace A

     

     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                detail 
-                            
-
-                                    
                

-                                detair 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+            
+        




NameDescription
NameDescription

+                        detail 
+                    
+                        
+                            
+                    

+                        detair 
+                    
+                        
+                            
+                    

+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    f0 
-                                
-
-                                        
        

-            

-            

+                    
+                        f0 
+                    
+                        
+                            
+                    
+                
+            
+        
+    

 
 

     

@@ -140,7 +131,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -158,31 +148,28 @@ 
Synopsis

         
Namespace detail

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
-                            
-                

                 

-                                    g0 
-                                
-
-                                        
        

-            

-            

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        g0 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -199,7 +186,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -217,55 +203,49 @@ 
Synopsis

         
Namespace detair

     

     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                Y 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        




NameDescription
NameDescription

+                        Y 
+                    
+                        
+                            
+                    

+
Functions

+
+            
-                                
-                                
-                            
-                

                 

-                                    f4 
-                                
-
-                                        
        

-            

-            

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        f4 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -282,7 +262,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -310,7 +289,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -319,55 +297,49 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                Z 
-                            
-
-                                    
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        




NameDescription
NameDescription

+                        Z 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f6 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f6 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -386,7 +358,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -414,7 +385,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -423,31 +393,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f7 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f7 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -466,7 +433,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -484,55 +450,49 @@ 
Synopsis

         
Namespace B

     
     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                detair 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                




NameDescription
NameDescription

                 

-                                    f0 
-                                
-
-                                        
        

-            

-            

+                    
+                        detair 
+                    
+                        
+                            
+                    
+                
+            
+        
+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f0 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -549,7 +509,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -567,55 +526,49 @@ 
Synopsis

         
Namespace detair

     

     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                Y 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                




NameDescription
NameDescription

                 

-                                    f4 
-                                
-
-                                        
        

-            

-            

+                    
+                        Y 
+                    
+                        
+                            
+                    
+                
+            
+        
+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f4 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -632,7 +585,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -660,7 +612,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -669,55 +620,49 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                Z 
-                            
-
-                                    
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        




NameDescription
NameDescription

+                        Z 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f6 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f6 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -736,7 +681,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -764,7 +708,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -773,31 +716,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f7 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f7 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -816,7 +756,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -834,31 +773,28 @@ 
Synopsis

         
Namespace C

     
     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
-                            
-                

                 

-                                    g0 
-                                
-
-                                        
        

-            

-            

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        g0 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -875,7 +811,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -893,93 +828,84 @@ 
Synopsis

         
Namespace D

     

     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                E 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                                
-                                
-                            
-                




NameDescription
NameDescription

                 

-                                    f1 
-                                
-
-                                        
                

-                                    g1 
-                                
-
-                                        
        

-            

-            

+                    
+                        E 
+                    
+                        
+                            
+                    
+                
+            
+        
+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+            
+        
NameDescription

+                        f1 
+                    
+                        
+                            
+                    

+                        g1 
+                    
+                        
+                            
+                    

+    
 
 

     

         
Namespace E

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
-                            
-                

                 

-                                    g0 
-                                
-
-                                        
        

-            

-            

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        g0 
+                    
+                        
+                            
+                    
+                
+            
+        
+    

 
 

     

@@ -996,7 +922,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -1024,7 +949,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -1052,7 +976,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1070,55 +993,49 @@ 
Synopsis

         
Namespace F

     
     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                G 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        




NameDescription
NameDescription

+                        G 
+                    
+                        
+                            
+                    

+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    g0 
-                                
-
-                                        
        

-            

-            

+                    
+                        g0 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -1135,7 +1052,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -1153,38 +1069,35 @@ 
Synopsis

         
Namespace G

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                                
-                                
-                            
-                
NameDescription

                 

-                                    f1 
-                                
-
-                                        
                

-                                    g1 
-                                
-
-                                        
        

-            

-            

+                    
+                        f1 
+                    
+                        
+                            
+                    
+                
+                    
+                        g1 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -1201,7 +1114,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -1229,7 +1141,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
diff --git a/test-files/golden-tests/filters/whitelist_0.adoc b/test-files/golden-tests/filters/whitelist_0.adoc
index a5af40c9d..18f9cebf7 100644
--- a/test-files/golden-tests/filters/whitelist_0.adoc
+++ b/test-files/golden-tests/filters/whitelist_0.adoc
@@ -6,15 +6,19 @@
 == Global namespace
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N0[`N0`]  ¦
-
-¦xref:#N1[`N1`]  ¦
-
-¦xref:#N5[`N5`]  ¦
-
+| Name | Description 
+
+| xref:#N0[`N0`] 
+| 
+    
+| xref:#N1[`N1`] 
+| 
+    
+| xref:#N5[`N5`] 
+| 
+    
 |===
 
 
@@ -23,17 +27,19 @@
 == N0
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N0-f0_WL[`f0_WL`]  ¦
+| Name | Description 
 
+| xref:#N0-f0_WL[`f0_WL`] 
+| 
+    
 |===
 
 
 
 [#N0-f0_WL]
-== xref:#N0[pass:[N0]]::f0_WL
+== xref:#N0[N0]::f0_WL
 
 
 
@@ -60,32 +66,37 @@ f0_WL();
 == N1
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N1-N3_WL[`N3_WL`]  ¦
-
-¦xref:#N1-N4[`N4`]  ¦
-
+| Name | Description 
+
+| xref:#N1-N3_WL[`N3_WL`] 
+| 
+    
+| xref:#N1-N4[`N4`] 
+| 
+    
 |===
 
 
 
 [#N1-N3_WL]
-== xref:#N1[pass:[N1]]::N3_WL
+== xref:#N1[N1]::N3_WL
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N1-N3_WL-f1_WL[`f1_WL`]  ¦
+| Name | Description 
 
+| xref:#N1-N3_WL-f1_WL[`f1_WL`] 
+| 
+    
 |===
 
 
 
 [#N1-N3_WL-f1_WL]
-== xref:#N1[pass:[N1]]::xref:#N1-N3_WL[pass:[N3_WL]]::f1_WL
+== xref:#N1[N1]::xref:#N1-N3_WL[N3_WL]::f1_WL
 
 
 
@@ -109,20 +120,22 @@ f1_WL();
 
 
 [#N1-N4]
-== xref:#N1[pass:[N1]]::N4
+== xref:#N1[N1]::N4
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N1-N4-f1_WL[`f1_WL`]  ¦
+| Name | Description 
 
+| xref:#N1-N4-f1_WL[`f1_WL`] 
+| 
+    
 |===
 
 
 
 [#N1-N4-f1_WL]
-== xref:#N1[pass:[N1]]::xref:#N1-N4[pass:[N4]]::f1_WL
+== xref:#N1[N1]::xref:#N1-N4[N4]::f1_WL
 
 
 
@@ -149,24 +162,28 @@ f1_WL();
 == N5
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N5-N6_BL[`N6_BL`]  ¦
+| Name | Description 
 
+| xref:#N5-N6_BL[`N6_BL`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N5-f0[`f0`]  ¦
+| Name | Description 
 
+| xref:#N5-f0[`f0`] 
+| 
+    
 |===
 
 
 
 [#N5-f0]
-== xref:#N5[pass:[N5]]::f0
+== xref:#N5[N5]::f0
 
 
 
@@ -190,35 +207,40 @@ f0();
 
 
 [#N5-N6_BL]
-== xref:#N5[pass:[N5]]::N6_BL
+== xref:#N5[N5]::N6_BL
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N5-N6_BL-M7[`M7`]  ¦
-
-¦xref:#N5-N6_BL-N7[`N7`]  ¦
-
+| Name | Description 
+
+| xref:#N5-N6_BL-M7[`M7`] 
+| 
+    
+| xref:#N5-N6_BL-N7[`N7`] 
+| 
+    
 |===
 
 
 
 [#N5-N6_BL-N7]
-== xref:#N5[pass:[N5]]::xref:#N5-N6_BL[pass:[N6_BL]]::N7
+== xref:#N5[N5]::xref:#N5-N6_BL[N6_BL]::N7
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N5-N6_BL-N7-f2_WL[`f2_WL`]  ¦
+| Name | Description 
 
+| xref:#N5-N6_BL-N7-f2_WL[`f2_WL`] 
+| 
+    
 |===
 
 
 
 [#N5-N6_BL-N7-f2_WL]
-== xref:#N5[pass:[N5]]::xref:#N5-N6_BL[pass:[N6_BL]]::xref:#N5-N6_BL-N7[pass:[N7]]::f2_WL
+== xref:#N5[N5]::xref:#N5-N6_BL[N6_BL]::xref:#N5-N6_BL-N7[N7]::f2_WL
 
 
 
@@ -242,20 +264,22 @@ f2_WL();
 
 
 [#N5-N6_BL-M7]
-== xref:#N5[pass:[N5]]::xref:#N5-N6_BL[pass:[N6_BL]]::M7
+== xref:#N5[N5]::xref:#N5-N6_BL[N6_BL]::M7
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N5-N6_BL-M7-f2_WL[`f2_WL`]  ¦
+| Name | Description 
 
+| xref:#N5-N6_BL-M7-f2_WL[`f2_WL`] 
+| 
+    
 |===
 
 
 
 [#N5-N6_BL-M7-f2_WL]
-== xref:#N5[pass:[N5]]::xref:#N5-N6_BL[pass:[N6_BL]]::xref:#N5-N6_BL-M7[pass:[M7]]::f2_WL
+== xref:#N5[N5]::xref:#N5-N6_BL[N6_BL]::xref:#N5-N6_BL-M7[M7]::f2_WL
 
 
 
diff --git a/test-files/golden-tests/filters/whitelist_0.html b/test-files/golden-tests/filters/whitelist_0.html
index 23b6649bc..64d7c9d29 100644
--- a/test-files/golden-tests/filters/whitelist_0.html
+++ b/test-files/golden-tests/filters/whitelist_0.html
@@ -9,76 +9,70 @@
         
Global namespace

     
     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                N0 
-                            
-
-                                    
                

-                                N1 
-                            
-
-                                    
                

-                                N5 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        N0 
+                    
+                        
+                            
+                    
+                
+                    
+                        N1 
+                    
+                        
+                            
+                    
+                
+                    
+                        N5 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

         
Namespace N0

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
-                            
-                

                 

-                                    f0_WL 
-                                
-
-                                        
        

-            

-            

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        f0_WL 
+                    
+                        
+                            
+                    
+                
+            
+        
+    

 
 

     

@@ -95,7 +89,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -113,69 +106,63 @@ 
Synopsis

         
Namespace N1

     

     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                N3_WL 
-                            
-
-                                    
                

-                                N4 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        N3_WL 
+                    
+                        
+                            
+                    
+                
+                    
+                        N4 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

         
Namespace N3_WL

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    f1_WL 
-                                
-
-                                        
        

-            

-            

+                    
+                        f1_WL 
+                    
+                        
+                            
+                    
+                
+            
+        
+    

 
 

     

@@ -192,7 +179,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -210,31 +196,28 @@ 
Synopsis

         
Namespace N4

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    f1_WL 
-                                
-
-                                        
        

-            

-            

+                    
+                        f1_WL 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -251,7 +234,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -269,55 +251,49 @@ 
Synopsis

         
Namespace N5

     

     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                N6_BL 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        




NameDescription
NameDescription

+                        N6_BL 
+                    
+                        
+                            
+                    

+
Functions

+
+            
-                                
-                                
-                            
-                

                 

-                                    f0 
-                                
-
-                                        
        

-            

-            

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        f0 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -334,7 +310,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -352,69 +327,63 @@ 
Synopsis

         
Namespace N6_BL

     

     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                M7 
-                            
-
-                                    
                

-                                N7 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        M7 
+                    
+                        
+                            
+                    
+                
+                    
+                        N7 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

         
Namespace N7

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    f2_WL 
-                                
-
-                                        
        

-            

-            

+                    
+                        f2_WL 
+                    
+                        
+                            
+                    
+                
+            
+        
+    

 
 

     

@@ -431,7 +400,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -449,31 +417,28 @@ 
Synopsis

         
Namespace M7

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    f2_WL 
-                                
-
-                                        
        

-            

-            

+                    
+                        f2_WL 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -490,7 +455,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
diff --git a/test-files/golden-tests/filters/whitelist_test.adoc b/test-files/golden-tests/filters/whitelist_test.adoc
index 2e15656c9..79d543d94 100644
--- a/test-files/golden-tests/filters/whitelist_test.adoc
+++ b/test-files/golden-tests/filters/whitelist_test.adoc
@@ -6,13 +6,16 @@
 == Global namespace
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#blacklisted[`blacklisted`]  ¦
-
-¦xref:#to_be_documented[`to_be_documented`]  ¦
-
+| Name | Description 
+
+| xref:#blacklisted[`blacklisted`] 
+| 
+    
+| xref:#to_be_documented[`to_be_documented`] 
+| 
+    
 |===
 
 
@@ -21,17 +24,19 @@
 == to_be_documented
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#to_be_documented-documented_function[`documented_function`]  ¦
+| Name | Description 
 
+| xref:#to_be_documented-documented_function[`documented_function`] 
+| 
+    
 |===
 
 
 
 [#to_be_documented-documented_function]
-== xref:#to_be_documented[pass:[to_be_documented]]::documented_function
+== xref:#to_be_documented[to_be_documented]::documented_function
 
 
 
@@ -58,17 +63,19 @@ documented_function();
 == blacklisted
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#blacklisted-whitelisted_function[`whitelisted_function`]  ¦
+| Name | Description 
 
+| xref:#blacklisted-whitelisted_function[`whitelisted_function`] 
+| 
+    
 |===
 
 
 
 [#blacklisted-whitelisted_function]
-== xref:#blacklisted[pass:[blacklisted]]::whitelisted_function
+== xref:#blacklisted[blacklisted]::whitelisted_function
 
 
 
diff --git a/test-files/golden-tests/filters/whitelist_test.html b/test-files/golden-tests/filters/whitelist_test.html
index 51a7ab9aa..88b46103c 100644
--- a/test-files/golden-tests/filters/whitelist_test.html
+++ b/test-files/golden-tests/filters/whitelist_test.html
@@ -9,69 +9,63 @@
         
Global namespace

     

     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                blacklisted 
-                            
-
-                                    
                

-                                to_be_documented 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        blacklisted 
+                    
+                        
+                            
+                    
+                
+                    
+                        to_be_documented 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

         
Namespace to_be_documented

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    documented_function 
-                                
-
-                                        
        

-            

-            

+                    
+                        documented_function 
+                    
+                        
+                            
+                    
+                
+            
+        
+    

 
 

     

@@ -88,7 +82,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -106,31 +99,28 @@ 
Synopsis

         
Namespace blacklisted

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
-                            
-                

                 

-                                    whitelisted_function 
-                                
-
-                                        
        

-            

-            

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        whitelisted_function 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -147,7 +137,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
diff --git a/test-files/golden-tests/friend-1.adoc b/test-files/golden-tests/friend-1.adoc
index 266b63d32..c9fb2e087 100644
--- a/test-files/golden-tests/friend-1.adoc
+++ b/test-files/golden-tests/friend-1.adoc
@@ -6,20 +6,24 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T[`T`]  ¦
+| Name | Description 
 
+| xref:#T[`T`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f[`f`]  ¦
+| Name | Description 
 
+| xref:#f[`f`] 
+| 
 f
 
+    
 |===
 
 
@@ -39,13 +43,15 @@ struct T;
 ----
 
 ===  Friends
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T-08friend[`f`]  ¦
+| Name | Description 
 
+| xref:#T-08friend[`f`] 
+| 
 f
 
+    
 |===
 
 
diff --git a/test-files/golden-tests/friend-1.html b/test-files/golden-tests/friend-1.html
index 993feb86f..994000ffd 100644
--- a/test-files/golden-tests/friend-1.html
+++ b/test-files/golden-tests/friend-1.html
@@ -9,57 +9,51 @@
         
Global namespace

     

     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                T 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
-                                
-                                
+                
+            
+        




NameDescription
NameDescription

                 

-                                    f 
-                                
-
f

+                    		
+                        T 
+                    
+                        
                             
+                    

+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
-                            
-                
NameDescription

+                        f 
+                    
+                        
f

+                        
 
-                                        
        

-            

-            

+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -76,7 +70,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -85,33 +78,30 @@ 
Synopsis

     

 
     

-                            

-                
 Friends

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Friends

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
-
f

-                            
+                    		NameDescription
        

-            

-                                                                                    

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
f

+                        
+
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -132,7 +122,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -160,7 +149,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/friend-2.adoc b/test-files/golden-tests/friend-2.adoc
index 466bbe5aa..deb216928 100644
--- a/test-files/golden-tests/friend-2.adoc
+++ b/test-files/golden-tests/friend-2.adoc
@@ -6,20 +6,24 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T[`T`]  ¦
+| Name | Description 
 
+| xref:#T[`T`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f[`f`]  ¦
+| Name | Description 
 
+| xref:#f[`f`] 
+| 
 f
 
+    
 |===
 
 
@@ -39,13 +43,15 @@ struct T;
 ----
 
 ===  Friends
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T-08friend[`f`]  ¦
+| Name | Description 
 
+| xref:#T-08friend[`f`] 
+| 
 f
 
+    
 |===
 
 
diff --git a/test-files/golden-tests/friend-2.html b/test-files/golden-tests/friend-2.html
index 8504ca389..d4fb31b62 100644
--- a/test-files/golden-tests/friend-2.html
+++ b/test-files/golden-tests/friend-2.html
@@ -9,57 +9,51 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                T 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
-                                
-                                
+                
+            
+        




NameDescription
NameDescription

                 

-                                    f 
-                                
-
f

+                    		
+                        T 
+                    
+                        
                             
+                    

+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
-                            
-                
NameDescription

+                        f 
+                    
+                        
f

+                        
 
-                                        
        

-            

-            

+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -76,7 +70,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -85,33 +78,30 @@ 
Synopsis

     

 
     

-                            

-                
 Friends

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Friends

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
-
f

-                            
+                    		NameDescription
        

-            

-                                                                                    

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
f

+                        
+
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -132,7 +122,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -160,7 +149,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/friend-3.adoc b/test-files/golden-tests/friend-3.adoc
index fea7989b3..cf2114b96 100644
--- a/test-files/golden-tests/friend-3.adoc
+++ b/test-files/golden-tests/friend-3.adoc
@@ -6,22 +6,27 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T[`T`]  ¦
-
-¦xref:#U[`U`]  ¦
-
+| Name | Description 
+
+| xref:#T[`T`] 
+| 
+    
+| xref:#U[`U`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f[`f`]  ¦
+| Name | Description 
 
+| xref:#f[`f`] 
+| 
 T::f
 
+    
 |===
 
 
@@ -41,13 +46,15 @@ struct T;
 ----
 
 ===  Friends
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T-08friend[`f`]  ¦
+| Name | Description 
 
+| xref:#T-08friend[`f`] 
+| 
 T::f
 
+    
 |===
 
 
@@ -116,11 +123,13 @@ struct U;
 ----
 
 ===  Friends
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#U-08friend[`f`]  ¦
+| Name | Description 
 
+| xref:#U-08friend[`f`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/friend-3.html b/test-files/golden-tests/friend-3.html
index 75e100dbc..cbef7d456 100644
--- a/test-files/golden-tests/friend-3.html
+++ b/test-files/golden-tests/friend-3.html
@@ -9,64 +9,58 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                T 
-                            
-
-                                    
                

-                                U 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
-                                
-                                
+                
+                    
+                
+            
+        




NameDescription
NameDescription

                 

-                                    f 
-                                
-
T::f

+                    		
+                        T 
+                    
+                        
                             
+                    

+                        U 
+                    
+                        
+                            
+                    

+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
-                            
-                
NameDescription

+                        f 
+                    
+                        
T::f

+                        
 
-                                        
        

-            

-            

+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -83,7 +77,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -92,33 +85,30 @@ 
Synopsis

     

 
     

-                            

-                
 Friends

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Friends

+




NameDescription

+            
-                                
-                                
+
+
+
+                
+            
+
+                
+                    
-                            
-                

                 

-                                    f 
-                                
-
T::f

-                            
+                    		NameDescription

+                        f 
+                    
+                        
T::f

+                        
 
-                                        
        

-            

-                                                                                    

+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -139,7 +129,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -167,7 +156,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -195,7 +183,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -204,31 +191,28 @@ 
Synopsis

     
 
     

-                            

-                
 Friends

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Friends

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -247,7 +231,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/friend-4.adoc b/test-files/golden-tests/friend-4.adoc
index b01ebaf4f..795c107c6 100644
--- a/test-files/golden-tests/friend-4.adoc
+++ b/test-files/golden-tests/friend-4.adoc
@@ -6,22 +6,27 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T[`T`]  ¦
-
-¦xref:#U[`U`]  ¦
-
+| Name | Description 
+
+| xref:#T[`T`] 
+| 
+    
+| xref:#U[`U`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f[`f`]  ¦
+| Name | Description 
 
+| xref:#f[`f`] 
+| 
 U::f
 
+    
 |===
 
 
@@ -41,11 +46,13 @@ struct T;
 ----
 
 ===  Friends
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T-08friend[`f`]  ¦
+| Name | Description 
 
+| xref:#T-08friend[`f`] 
+| 
+    
 |===
 
 
@@ -112,13 +119,15 @@ struct U;
 ----
 
 ===  Friends
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#U-08friend[`f`]  ¦
+| Name | Description 
 
+| xref:#U-08friend[`f`] 
+| 
 U::f
 
+    
 |===
 
 
diff --git a/test-files/golden-tests/friend-4.html b/test-files/golden-tests/friend-4.html
index 60d867b2b..05cf35829 100644
--- a/test-files/golden-tests/friend-4.html
+++ b/test-files/golden-tests/friend-4.html
@@ -9,64 +9,58 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                T 
-                            
-
-                                    
                

-                                U 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
-                                
-                                
+                
+                    
+                
+            
+        




NameDescription
NameDescription

                 

-                                    f 
-                                
-
U::f

+                    		
+                        T 
+                    
+                        
                             
+                    

+                        U 
+                    
+                        
+                            
+                    

+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
-                            
-                
NameDescription

+                        f 
+                    
+                        
U::f

+                        
 
-                                        
        

-            

-            

+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -83,7 +77,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -92,31 +85,28 @@ 
Synopsis

     

 
     

-                            

-                
 Friends

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Friends

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -135,7 +125,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -163,7 +152,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -191,7 +179,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -200,33 +187,30 @@ 
Synopsis

     
 
     

-                            

-                
 Friends

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Friends

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
-
U::f

-                            
+                    		NameDescription
        

-            

-                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
U::f

+                        
+
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -247,7 +231,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/friend-5.adoc b/test-files/golden-tests/friend-5.adoc
index 07fd48b83..1790fc444 100644
--- a/test-files/golden-tests/friend-5.adoc
+++ b/test-files/golden-tests/friend-5.adoc
@@ -6,22 +6,27 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T[`T`]  ¦
-
-¦xref:#U[`U`]  ¦
-
+| Name | Description 
+
+| xref:#T[`T`] 
+| 
+    
+| xref:#U[`U`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f[`f`]  ¦
+| Name | Description 
 
+| xref:#f[`f`] 
+| 
 f
 
+    
 |===
 
 
@@ -41,11 +46,13 @@ struct T;
 ----
 
 ===  Friends
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T-08friend[`f`]  ¦
+| Name | Description 
 
+| xref:#T-08friend[`f`] 
+| 
+    
 |===
 
 
@@ -112,11 +119,13 @@ struct U;
 ----
 
 ===  Friends
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#U-08friend[`f`]  ¦
+| Name | Description 
 
+| xref:#U-08friend[`f`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/friend-5.html b/test-files/golden-tests/friend-5.html
index 22abf52cb..59ecf6212 100644
--- a/test-files/golden-tests/friend-5.html
+++ b/test-files/golden-tests/friend-5.html
@@ -9,64 +9,58 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                T 
-                            
+                    NameDescription
                

-                                U 
-                            
 
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                
+            
+
-                                
-                                
+                
+                    
+                
+            
+        




NameDescription

                 

-                                    f 
-                                
-
f

+                    		
+                        T 
+                    
+                        
+                            
+                    

+                        U 
+                    
+                        
                             
+                    

+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
-                            
-                
NameDescription

+                        f 
+                    
+                        
f

+                        
 
-                                        
        

-            

-            

+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -83,7 +77,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -92,31 +85,28 @@ 
Synopsis

     

 
     

-                            

-                
 Friends

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Friends

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                    

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -135,7 +125,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -163,7 +152,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -191,7 +179,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -200,31 +187,28 @@ 
Synopsis

     
 
     

-                            

-                
 Friends

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Friends

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -243,7 +227,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/friend-6.adoc b/test-files/golden-tests/friend-6.adoc
index 84a82a623..6f2b33176 100644
--- a/test-files/golden-tests/friend-6.adoc
+++ b/test-files/golden-tests/friend-6.adoc
@@ -6,21 +6,25 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T[`T`]  ¦
+| Name | Description 
 
+| xref:#T[`T`] 
+| 
 Struct T brief
 
-¦xref:#U[`U`]  ¦
-
+    
+| xref:#U[`U`] 
+| 
 Struct U brief
 
-¦xref:#V[`V`]  ¦
-
+    
+| xref:#V[`V`] 
+| 
 Struct V brief
 
+    
 |===
 
 
@@ -42,17 +46,20 @@ struct T;
 ----
 
 ===  Friends
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T-08friend-04ce[`[object Object]`]  ¦
+| Name | Description 
 
+| xref:#T-08friend-04ce[`[object Object]`] 
+| 
 Friend int brief
 
-¦xref:#T-08friend-04cb[`[object Object]`]  ¦
-
+    
+| xref:#T-08friend-04cb[`[object Object]`] 
+| 
 Friend class Z brief
 
+    
 |===
 
 
@@ -114,13 +121,15 @@ struct U;
 ----
 
 ===  Friends
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#U-08friend[`[object Object]`]  ¦
+| Name | Description 
 
+| xref:#U-08friend[`[object Object]`] 
+| 
 Friend T brief
 
+    
 |===
 
 
@@ -163,13 +172,15 @@ struct V;
 ----
 
 ===  Friends
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#V-08friend[`[object Object]`]  ¦
+| Name | Description 
 
+| xref:#V-08friend[`[object Object]`] 
+| 
 Friend struct U brief
 
+    
 |===
 
 
diff --git a/test-files/golden-tests/friend-6.html b/test-files/golden-tests/friend-6.html
index da8cc1323..b0dcdd3d6 100644
--- a/test-files/golden-tests/friend-6.html
+++ b/test-files/golden-tests/friend-6.html
@@ -9,51 +9,48 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                            
-                            
-                        
-                            
-                            
+                
+                    
-                        
-                            
-                            
+                
+                    
-                        
-            
NameDescription

                 

-                                T 
-                            
-
Struct T brief

+                    		
+                        T 
+                    
+                        
Struct T brief

                         
 
-                                    
                

-                                U 
-                            
-
Struct U brief

+                            
+                    

+                        U 
+                    
+                        
Struct U brief

                         
 
-                                    
                

-                                V 
-                            
-
Struct V brief

+                            
+                    

+                        V 
+                    
+                        
Struct V brief

                         
 
-                                    
        

-        

-                

+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -72,7 +69,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -81,42 +77,39 @@ 
Synopsis

     

 
     

-                            

-                
 Friends

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Friends

+




NameDescription

+            
-                                
-                                
+
+
+
+                
+            
+
+                
+                    
-                            
-                                
-                                
+                
+                    
-                            
-                

                 

-                                    [object Object] 
-                                
-
Friend int brief

-                            
+                    		NameDescription

+                        [object Object] 
+                    
+                        
Friend int brief

+                        
 
-                                        
                

-                                    [object Object] 
-                                
-
Friend class Z brief

                             
+                    

+                        [object Object] 
+                    
+                        
Friend class Z brief

+                        
 
-                                        
        

-            

-                                                                                    

+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -137,7 +130,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -163,7 +155,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -189,7 +180,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -198,33 +188,30 @@ 
Synopsis

     
 
     

-                            

-                
 Friends

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Friends

+




NameDescription

+            
-                                
-                                
+
+
+
+                
+            
+
+                
+                    
-                            
-                

                 

-                                    [object Object] 
-                                
-
Friend T brief

-                            
+                    		NameDescription

+                        [object Object] 
+                    
+                        
Friend T brief

+                        
 
-                                        
        

-            

-                                                                                    

+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -245,7 +232,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -271,7 +257,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -280,33 +265,30 @@ 
Synopsis

     
 
     

-                            

-                
 Friends

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Friends

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    [object Object] 
-                                
-
Friend struct U brief

-                            
+                    		NameDescription
        

-            

-                                                                                    

+
+                
+            
+
+                
+                    
+                        [object Object] 
+                    
+                        
Friend struct U brief

+                        
+
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -327,7 +309,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/function-parm-decay.adoc b/test-files/golden-tests/function-parm-decay.adoc
index 64f05adf1..3bac0de29 100644
--- a/test-files/golden-tests/function-parm-decay.adoc
+++ b/test-files/golden-tests/function-parm-decay.adoc
@@ -6,26 +6,34 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T[`T`]  ¦
-
-¦xref:#U[`U`]  ¦
-
+| Name | Description 
+
+| xref:#T[`T`] 
+| 
+    
+| xref:#U[`U`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f[`f`]  ¦
-
-¦xref:#g[`g`]  ¦
-
-¦xref:#h[`h`]  ¦
-
-¦xref:#i[`i`]  ¦
-
+| Name | Description 
+
+| xref:#f[`f`] 
+| 
+    
+| xref:#g[`g`] 
+| 
+    
+| xref:#h[`h`] 
+| 
+    
+| xref:#i[`i`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/function-parm-decay.html b/test-files/golden-tests/function-parm-decay.html
index fa4c9cdbb..902bf9104 100644
--- a/test-files/golden-tests/function-parm-decay.html
+++ b/test-files/golden-tests/function-parm-decay.html
@@ -9,83 +9,77 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                T 
-                            
+                    NameDescription
                

-                                U 
-                            
 
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                
+            
+
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
+                
+                    
+                
+            
+        




NameDescription

                 

-                                    f 
-                                
-
-                                        
                

-                                    g 
-                                
-
-                                        
                

-                                    h 
-                                
+                    
+                        T 
+                    
+                        
+                            
+                    

+                        U 
+                    
+                        
+                            
+                    

+
Functions

+
+            
+                
+                    
+
 
-                                        
-                            
-                                
-                                
-                            
-                
NameDescription
                

-                                    i 
-                                
 
-                                        
        

-            

-            

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+                    
+                        g 
+                    
+                        
+                            
+                    
+                
+                    
+                        h 
+                    
+                        
+                            
+                    
+                
+                    
+                        i 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -102,7 +96,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -130,7 +123,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -158,7 +150,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -186,7 +177,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -210,7 +200,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -234,7 +223,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/function-template.adoc b/test-files/golden-tests/function-template.adoc
index 163fa938f..502b427ed 100644
--- a/test-files/golden-tests/function-template.adoc
+++ b/test-files/golden-tests/function-template.adoc
@@ -6,33 +6,46 @@
 == Global namespace
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f0[`f0`]  ¦
-
-¦xref:#f1[`f1`]  ¦
-
-¦xref:#f2[`f2`]  ¦
-
-¦xref:#f3[`f3`]  ¦
-
-¦xref:#g0[`g0`]  ¦
-
-¦xref:#g1[`g1`]  ¦
-
-¦xref:#g2[`g2`]  ¦
-
-¦xref:#h0[`h0`]  ¦
-
-¦xref:#h1[`h1`]  ¦
-
-¦xref:#i[`i`]  ¦
-
-¦xref:#j0[`j0`]  ¦
-
-¦xref:#j1[`j1`]  ¦
-
+| Name | Description 
+
+| xref:#f0[`f0`] 
+| 
+    
+| xref:#f1[`f1`] 
+| 
+    
+| xref:#f2[`f2`] 
+| 
+    
+| xref:#f3[`f3`] 
+| 
+    
+| xref:#g0[`g0`] 
+| 
+    
+| xref:#g1[`g1`] 
+| 
+    
+| xref:#g2[`g2`] 
+| 
+    
+| xref:#h0[`h0`] 
+| 
+    
+| xref:#h1[`h1`] 
+| 
+    
+| xref:#i[`i`] 
+| 
+    
+| xref:#j0[`j0`] 
+| 
+    
+| xref:#j1[`j1`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/function-template.html b/test-files/golden-tests/function-template.html
index e726fd3cd..fede44b4c 100644
--- a/test-files/golden-tests/function-template.html
+++ b/test-files/golden-tests/function-template.html
@@ -9,108 +9,105 @@
         
Global namespace

     
     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                

                 

-                                    f0 
-                                
-
-                                        
                

-                                    f1 
-                                
-
-                                        
                

-                                    f2 
-                                
-
-                                        
                

-                                    f3 
-                                
-
-                                        
                

-                                    g0 
-                                
-
-                                        
                

-                                    g1 
-                                
-
-                                        
                

-                                    g2 
-                                
-
-                                        
                

-                                    h0 
-                                
-
-                                        
                

-                                    h1 
-                                
-
-                                        
                

-                                    i 
-                                
-
-                                        
                

-                                    j0 
-                                
-
-                                        
                

-                                    j1 
-                                
-
-                                        
        

-            

-            

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        f0 
+                    
+                        
+                            
+                    
+                
+                    
+                        f1 
+                    
+                        
+                            
+                    
+                
+                    
+                        f2 
+                    
+                        
+                            
+                    
+                
+                    
+                        f3 
+                    
+                        
+                            
+                    
+                
+                    
+                        g0 
+                    
+                        
+                            
+                    
+                
+                    
+                        g1 
+                    
+                        
+                            
+                    
+                
+                    
+                        g2 
+                    
+                        
+                            
+                    
+                
+                    
+                        h0 
+                    
+                        
+                            
+                    
+                
+                    
+                        h1 
+                    
+                        
+                            
+                    
+                
+                    
+                        i 
+                    
+                        
+                            
+                    
+                
+                    
+                        j0 
+                    
+                        
+                            
+                    
+                
+                    
+                        j1 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -127,7 +124,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -156,7 +152,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -185,7 +180,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -214,7 +208,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -245,7 +238,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -274,7 +266,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -303,7 +294,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -334,7 +324,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -363,7 +352,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -396,7 +384,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -427,7 +414,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -456,7 +442,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/function-tparm-decay.adoc b/test-files/golden-tests/function-tparm-decay.adoc
index 741f7ab16..5c4932fa0 100644
--- a/test-files/golden-tests/function-tparm-decay.adoc
+++ b/test-files/golden-tests/function-tparm-decay.adoc
@@ -6,26 +6,34 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T[`T`]  ¦
-
-¦xref:#U[`U`]  ¦
-
+| Name | Description 
+
+| xref:#T[`T`] 
+| 
+    
+| xref:#U[`U`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f[`f`]  ¦
-
-¦xref:#g[`g`]  ¦
-
-¦xref:#h[`h`]  ¦
-
-¦xref:#i[`i`]  ¦
-
+| Name | Description 
+
+| xref:#f[`f`] 
+| 
+    
+| xref:#g[`g`] 
+| 
+    
+| xref:#h[`h`] 
+| 
+    
+| xref:#i[`i`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/function-tparm-decay.html b/test-files/golden-tests/function-tparm-decay.html
index 44592eea6..ed0dd21e4 100644
--- a/test-files/golden-tests/function-tparm-decay.html
+++ b/test-files/golden-tests/function-tparm-decay.html
@@ -9,83 +9,77 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                T 
-                            
+                    NameDescription
                

-                                U 
-                            
 
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                
+            
+
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
+                
+                    
+                
+            
+        




NameDescription

                 

-                                    f 
-                                
-
-                                        
                

-                                    g 
-                                
-
-                                        
                

-                                    h 
-                                
+                    
+                        T 
+                    
+                        
+                            
+                    

+                        U 
+                    
+                        
+                            
+                    

+
Functions

+
+            
+                
+                    
+
 
-                                        
-                            
-                                
-                                
-                            
-                
NameDescription
                

-                                    i 
-                                
 
-                                        
        

-            

-            

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+                    
+                        g 
+                    
+                        
+                            
+                    
+                
+                    
+                        h 
+                    
+                        
+                            
+                    
+                
+                    
+                        i 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -102,7 +96,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -131,7 +124,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -160,7 +152,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -189,7 +180,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -213,7 +203,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -237,7 +226,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/implicit-instantiation-member-ref.adoc b/test-files/golden-tests/implicit-instantiation-member-ref.adoc
index 1efc72bc4..2408a511a 100644
--- a/test-files/golden-tests/implicit-instantiation-member-ref.adoc
+++ b/test-files/golden-tests/implicit-instantiation-member-ref.adoc
@@ -6,33 +6,46 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A0[`A0`]  ¦
-
-¦xref:#A1[`A1`]  ¦
-
-¦xref:#A10[`A10`]  ¦
-
-¦xref:#A2[`A2`]  ¦
-
-¦xref:#A3[`A3`]  ¦
-
-¦xref:#A4[`A4`]  ¦
-
-¦xref:#A5[`A5`]  ¦
-
-¦xref:#A6[`A6`]  ¦
-
-¦xref:#A7[`A7`]  ¦
-
-¦xref:#A8[`A8`]  ¦
-
-¦xref:#A9[`A9`]  ¦
-
-¦xref:#S0[`S0`]  ¦
-
+| Name | Description 
+
+| xref:#A0[`A0`] 
+| 
+    
+| xref:#A1[`A1`] 
+| 
+    
+| xref:#A10[`A10`] 
+| 
+    
+| xref:#A2[`A2`] 
+| 
+    
+| xref:#A3[`A3`] 
+| 
+    
+| xref:#A4[`A4`] 
+| 
+    
+| xref:#A5[`A5`] 
+| 
+    
+| xref:#A6[`A6`] 
+| 
+    
+| xref:#A7[`A7`] 
+| 
+    
+| xref:#A8[`A8`] 
+| 
+    
+| xref:#A9[`A9`] 
+| 
+    
+| xref:#S0[`S0`] 
+| 
+    
 |===
 
 
@@ -53,17 +66,22 @@ struct S0;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-M0[`M0`]  ¦
-
-¦xref:#S0-M1[`M1`]  ¦
-
-¦xref:#S0-S1[`S1`]  ¦
-
-¦xref:#S0-S2[`S2`]  ¦
-
+| Name | Description 
+
+| xref:#S0-M0[`M0`] 
+| 
+    
+| xref:#S0-M1[`M1`] 
+| 
+    
+| xref:#S0-S1[`S1`] 
+| 
+    
+| xref:#S0-S2[`S2`] 
+| 
+    
 |===
 
 
@@ -71,7 +89,7 @@ struct S0;
 
 
 [#S0-M0]
-== xref:#S0[pass:[S0]]::M0
+== xref:#S0[S0]::M0
 
 
 
@@ -88,7 +106,7 @@ using M0 = T;
 
 
 [#S0-S1]
-== xref:#S0[pass:[S0]]::S1
+== xref:#S0[S0]::S1
 
 
 
@@ -107,7 +125,7 @@ struct S1;
 
 
 [#S0-M1]
-== xref:#S0[pass:[S0]]::M1
+== xref:#S0[S0]::M1
 
 
 
@@ -125,7 +143,7 @@ using M1 = xref:#S0[S0];
 
 
 [#S0-S2]
-== xref:#S0[pass:[S0]]::S2
+== xref:#S0[S0]::S2
 
 
 
@@ -140,17 +158,22 @@ struct S2;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-S2-M2[`M2`]  ¦
-
-¦xref:#S0-S2-M3[`M3`]  ¦
-
-¦xref:#S0-S2-S3[`S3`]  ¦
-
-¦xref:#S0-S2-S4[`S4`]  ¦
-
+| Name | Description 
+
+| xref:#S0-S2-M2[`M2`] 
+| 
+    
+| xref:#S0-S2-M3[`M3`] 
+| 
+    
+| xref:#S0-S2-S3[`S3`] 
+| 
+    
+| xref:#S0-S2-S4[`S4`] 
+| 
+    
 |===
 
 
@@ -158,7 +181,7 @@ struct S2;
 
 
 [#S0-S2-M2]
-== xref:#S0[pass:[S0]]::xref:#S0-S2[pass:[S2]]::M2
+== xref:#S0[S0]::xref:#S0-S2[S2]::M2
 
 
 
@@ -175,7 +198,7 @@ using M2 = U;
 
 
 [#S0-S2-S3]
-== xref:#S0[pass:[S0]]::xref:#S0-S2[pass:[S2]]::S3
+== xref:#S0[S0]::xref:#S0-S2[S2]::S3
 
 
 
@@ -194,7 +217,7 @@ struct S3;
 
 
 [#S0-S2-M3]
-== xref:#S0[pass:[S0]]::xref:#S0-S2[pass:[S2]]::M3
+== xref:#S0[S0]::xref:#S0-S2[S2]::M3
 
 
 
@@ -212,7 +235,7 @@ using M3 = xref:#S0-S2[S2];
 
 
 [#S0-S2-S4]
-== xref:#S0[pass:[S0]]::xref:#S0-S2[pass:[S2]]::S4
+== xref:#S0[S0]::xref:#S0-S2[S2]::S4
 
 
 
@@ -227,11 +250,13 @@ struct S4;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-S2-S4-M4[`M4`]  ¦
+| Name | Description 
 
+| xref:#S0-S2-S4-M4[`M4`] 
+| 
+    
 |===
 
 
@@ -239,7 +264,7 @@ struct S4;
 
 
 [#S0-S2-S4-M4]
-== xref:#S0[pass:[S0]]::xref:#S0-S2[pass:[S2]]::xref:#S0-S2-S4[pass:[S4]]::M4
+== xref:#S0[S0]::xref:#S0-S2[S2]::xref:#S0-S2-S4[S4]::M4
 
 
 
diff --git a/test-files/golden-tests/implicit-instantiation-member-ref.html b/test-files/golden-tests/implicit-instantiation-member-ref.html
index 16dff744a..42e35ee8c 100644
--- a/test-files/golden-tests/implicit-instantiation-member-ref.html
+++ b/test-files/golden-tests/implicit-instantiation-member-ref.html
@@ -9,108 +9,105 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                A0 
-                            
-
-                                    
                

-                                A1 
-                            
-
-                                    
                

-                                A10 
-                            
-
-                                    
                

-                                A2 
-                            
-
-                                    
                

-                                A3 
-                            
-
-                                    
                

-                                A4 
-                            
-
-                                    
                

-                                A5 
-                            
-
-                                    
                

-                                A6 
-                            
-
-                                    
                

-                                A7 
-                            
-
-                                    
                

-                                A8 
-                            
-
-                                    
                

-                                A9 
-                            
-
-                                    
                

-                                S0 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A0 
+                    
+                        
+                            
+                    
+                
+                    
+                        A1 
+                    
+                        
+                            
+                    
+                
+                    
+                        A10 
+                    
+                        
+                            
+                    
+                
+                    
+                        A2 
+                    
+                        
+                            
+                    
+                
+                    
+                        A3 
+                    
+                        
+                            
+                    
+                
+                    
+                        A4 
+                    
+                        
+                            
+                    
+                
+                    
+                        A5 
+                    
+                        
+                            
+                    
+                
+                    
+                        A6 
+                    
+                        
+                            
+                    
+                
+                    
+                        A7 
+                    
+                        
+                            
+                    
+                
+                    
+                        A8 
+                    
+                        
+                            
+                    
+                
+                    
+                        A9 
+                    
+                        
+                            
+                    
+                
+                    
+                        S0 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -127,7 +124,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -137,52 +133,49 @@ 
Synopsis

     

 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                M0 
-                            
-
-                                    
                

-                                M1 
-                            
-
-                                    
                

-                                S1 
-                            
-
-                                    
                

-                                S2 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        M0 
+                    
+                        
+                            
+                    
+                
+                    
+                        M1 
+                    
+                        
+                            
+                    
+                
+                    
+                        S1 
+                    
+                        
+                            
+                    
+                
+                    
+                        S2 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -201,7 +194,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -225,7 +217,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -234,7 +225,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -253,7 +244,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -278,7 +268,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -288,52 +277,49 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                M2 
-                            
-
-                                    
                

-                                M3 
-                            
-
-                                    
                

-                                S3 
-                            
-
-                                    
                

-                                S4 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        M2 
+                    
+                        
+                            
+                    
+                
+                    
+                        M3 
+                    
+                        
+                            
+                    
+                
+                    
+                        S3 
+                    
+                        
+                            
+                    
+                
+                    
+                        S4 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -352,7 +338,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -376,7 +361,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -385,7 +369,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -404,7 +388,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -429,7 +412,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -439,31 +421,28 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                M4 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        M4 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -482,7 +461,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -506,7 +484,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -530,7 +507,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -554,7 +530,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -578,7 +553,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -602,7 +576,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -626,7 +599,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -650,7 +622,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -674,7 +645,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -698,7 +668,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -722,7 +691,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -746,7 +714,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/local-class.adoc b/test-files/golden-tests/local-class.adoc
index c91b4e10a..1585a5c3e 100644
--- a/test-files/golden-tests/local-class.adoc
+++ b/test-files/golden-tests/local-class.adoc
@@ -6,18 +6,22 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#B[`B`]  ¦
+| Name | Description 
 
+| xref:#B[`B`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f[`f`]  ¦
+| Name | Description 
 
+| xref:#f[`f`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/local-class.html b/test-files/golden-tests/local-class.html
index 36394fca7..9434540ab 100644
--- a/test-files/golden-tests/local-class.html
+++ b/test-files/golden-tests/local-class.html
@@ -9,55 +9,49 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                B 
-                            
+                    NameDescription
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+
+                
+            
+
-                                
-                                
+                
+            
+        




NameDescription

                 

-                                    f 
-                                
+                    
+                        B 
+                    
+                        
+                            
+                    

+
Functions

+
+            
+                
+                    
+
+
 
-                                        
-                            
-                
NameDescription
        

-            

-            

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -74,7 +68,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -102,7 +95,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -112,7 +104,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
diff --git a/test-files/golden-tests/mem-fn.adoc b/test-files/golden-tests/mem-fn.adoc
index f461cd117..7cc33107c 100644
--- a/test-files/golden-tests/mem-fn.adoc
+++ b/test-files/golden-tests/mem-fn.adoc
@@ -6,45 +6,64 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T01[`T01`]  ¦
-
-¦xref:#T02[`T02`]  ¦
-
-¦xref:#T03[`T03`]  ¦
-
-¦xref:#T04[`T04`]  ¦
-
-¦xref:#T05[`T05`]  ¦
-
-¦xref:#T06[`T06`]  ¦
-
-¦xref:#T08[`T08`]  ¦
-
-¦xref:#T09[`T09`]  ¦
-
-¦xref:#T10[`T10`]  ¦
-
-¦xref:#T11[`T11`]  ¦
-
-¦xref:#T12[`T12`]  ¦
-
-¦xref:#T13[`T13`]  ¦
-
-¦xref:#T14[`T14`]  ¦
-
-¦xref:#T15[`T15`]  ¦
-
-¦xref:#T16[`T16`]  ¦
-
-¦xref:#T17[`T17`]  ¦
-
-¦xref:#U[`U`]  ¦
-
-¦xref:#V[`V`]  ¦
-
+| Name | Description 
+
+| xref:#T01[`T01`] 
+| 
+    
+| xref:#T02[`T02`] 
+| 
+    
+| xref:#T03[`T03`] 
+| 
+    
+| xref:#T04[`T04`] 
+| 
+    
+| xref:#T05[`T05`] 
+| 
+    
+| xref:#T06[`T06`] 
+| 
+    
+| xref:#T08[`T08`] 
+| 
+    
+| xref:#T09[`T09`] 
+| 
+    
+| xref:#T10[`T10`] 
+| 
+    
+| xref:#T11[`T11`] 
+| 
+    
+| xref:#T12[`T12`] 
+| 
+    
+| xref:#T13[`T13`] 
+| 
+    
+| xref:#T14[`T14`] 
+| 
+    
+| xref:#T15[`T15`] 
+| 
+    
+| xref:#T16[`T16`] 
+| 
+    
+| xref:#T17[`T17`] 
+| 
+    
+| xref:#U[`U`] 
+| 
+    
+| xref:#V[`V`] 
+| 
+    
 |===
 
 
@@ -64,11 +83,13 @@ struct T01;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T01-f[`f`]  ¦
+| Name | Description 
 
+| xref:#T01-f[`f`] 
+| 
+    
 |===
 
 
@@ -76,7 +97,7 @@ struct T01;
 
 
 [#T01-f]
-== xref:#T01[pass:[T01]]::f
+== xref:#T01[T01]::f
 
 
 
@@ -114,11 +135,13 @@ struct T02;
 ----
 
 ===  Static Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T02-f[`f`]  ¦
+| Name | Description 
 
+| xref:#T02-f[`f`] 
+| 
+    
 |===
 
 
@@ -126,7 +149,7 @@ struct T02;
 
 
 [#T02-f]
-== xref:#T02[pass:[T02]]::f
+== xref:#T02[T02]::f
 
 
 
@@ -165,11 +188,13 @@ struct T03;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T03-f[`f`]  ¦
+| Name | Description 
 
+| xref:#T03-f[`f`] 
+| 
+    
 |===
 
 
@@ -177,7 +202,7 @@ struct T03;
 
 
 [#T03-f]
-== xref:#T03[pass:[T03]]::f
+== xref:#T03[T03]::f
 
 
 
@@ -215,11 +240,13 @@ struct T04;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T04-f[`f`]  ¦
+| Name | Description 
 
+| xref:#T04-f[`f`] 
+| 
+    
 |===
 
 
@@ -227,7 +254,7 @@ struct T04;
 
 
 [#T04-f]
-== xref:#T04[pass:[T04]]::f
+== xref:#T04[T04]::f
 
 
 
@@ -265,11 +292,13 @@ struct T05;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T05-f[`f`]  ¦
+| Name | Description 
 
+| xref:#T05-f[`f`] 
+| 
+    
 |===
 
 
@@ -277,7 +306,7 @@ struct T05;
 
 
 [#T05-f]
-== xref:#T05[pass:[T05]]::f
+== xref:#T05[T05]::f
 
 
 
@@ -315,11 +344,13 @@ struct T06;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T06-f[`f`]  ¦
+| Name | Description 
 
+| xref:#T06-f[`f`] 
+| 
+    
 |===
 
 
@@ -327,7 +358,7 @@ struct T06;
 
 
 [#T06-f]
-== xref:#T06[pass:[T06]]::f
+== xref:#T06[T06]::f
 
 
 
@@ -366,11 +397,13 @@ struct T08;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T08-f[`f`]  ¦
+| Name | Description 
 
+| xref:#T08-f[`f`] 
+| 
+    
 |===
 
 
@@ -378,7 +411,7 @@ struct T08;
 
 
 [#T08-f]
-== xref:#T08[pass:[T08]]::f
+== xref:#T08[T08]::f
 
 
 
@@ -416,11 +449,13 @@ struct T09;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T09-f[`f`]  ¦
+| Name | Description 
 
+| xref:#T09-f[`f`] 
+| 
+    
 |===
 
 
@@ -428,7 +463,7 @@ struct T09;
 
 
 [#T09-f]
-== xref:#T09[pass:[T09]]::f
+== xref:#T09[T09]::f
 
 
 
@@ -466,11 +501,13 @@ struct T10;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T10-f[`f`]  ¦
+| Name | Description 
 
+| xref:#T10-f[`f`] 
+| 
+    
 |===
 
 
@@ -478,7 +515,7 @@ struct T10;
 
 
 [#T10-f]
-== xref:#T10[pass:[T10]]::f
+== xref:#T10[T10]::f
 
 
 
@@ -516,11 +553,13 @@ struct T11;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T11-f[`f`]  ¦
+| Name | Description 
 
+| xref:#T11-f[`f`] 
+| 
+    
 |===
 
 
@@ -528,7 +567,7 @@ struct T11;
 
 
 [#T11-f]
-== xref:#T11[pass:[T11]]::f
+== xref:#T11[T11]::f
 
 
 
@@ -566,11 +605,13 @@ struct T12;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T12-f[`f`]  ¦
+| Name | Description 
 
+| xref:#T12-f[`f`] 
+| 
+    
 |===
 
 
@@ -578,7 +619,7 @@ struct T12;
 
 
 [#T12-f]
-== xref:#T12[pass:[T12]]::f
+== xref:#T12[T12]::f
 
 
 
@@ -616,11 +657,13 @@ struct T13;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T13-f[`f`]  ¦
+| Name | Description 
 
+| xref:#T13-f[`f`] 
+| 
+    
 |===
 
 
@@ -628,7 +671,7 @@ struct T13;
 
 
 [#T13-f]
-== xref:#T13[pass:[T13]]::f
+== xref:#T13[T13]::f
 
 
 
@@ -667,11 +710,13 @@ struct T14;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T14-f[`f`]  ¦
+| Name | Description 
 
+| xref:#T14-f[`f`] 
+| 
+    
 |===
 
 
@@ -679,7 +724,7 @@ struct T14;
 
 
 [#T14-f]
-== xref:#T14[pass:[T14]]::f
+== xref:#T14[T14]::f
 
 
 
@@ -718,11 +763,13 @@ struct T15;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T15-f[`f`]  ¦
+| Name | Description 
 
+| xref:#T15-f[`f`] 
+| 
+    
 |===
 
 
@@ -730,7 +777,7 @@ struct T15;
 
 
 [#T15-f]
-== xref:#T15[pass:[T15]]::f
+== xref:#T15[T15]::f
 
 
 
@@ -768,11 +815,13 @@ struct T16;
 ----
 
 ===  Static Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T16-f[`f`]  ¦
+| Name | Description 
 
+| xref:#T16-f[`f`] 
+| 
+    
 |===
 
 
@@ -780,7 +829,7 @@ struct T16;
 
 
 [#T16-f]
-== xref:#T16[pass:[T16]]::f
+== xref:#T16[T16]::f
 
 
 
@@ -820,10 +869,12 @@ struct T17
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:T14-f[`f`]  ¦
+| Name | Description 
+
+| xref:T14-f[`f`] 
+| 
 |===
 
 
@@ -831,7 +882,7 @@ struct T17
 
 
 [#T17-f]
-== xref:#T17[pass:[T17]]::f
+== xref:#T17[T17]::f
 
 
 
@@ -870,20 +921,25 @@ struct U;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#U-f1[`f1`]  ¦
-
-¦xref:#U-f3[`f3`]  ¦
-
+| Name | Description 
+
+| xref:#U-f1[`f1`] 
+| 
+    
+| xref:#U-f3[`f3`] 
+| 
+    
 |===
 ===  Static Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#U-f2[`f2`]  ¦
+| Name | Description 
 
+| xref:#U-f2[`f2`] 
+| 
+    
 |===
 
 
@@ -891,7 +947,7 @@ struct U;
 
 
 [#U-f1]
-== xref:#U[pass:[U]]::f1
+== xref:#U[U]::f1
 
 
 
@@ -916,7 +972,7 @@ f1(...) const volatile noexcept;
 
 
 [#U-f2]
-== xref:#U[pass:[U]]::f2
+== xref:#U[U]::f2
 
 
 
@@ -942,7 +998,7 @@ f2() noexcept;
 
 
 [#U-f3]
-== xref:#U[pass:[U]]::f3
+== xref:#U[U]::f3
 
 
 
@@ -982,19 +1038,24 @@ struct V
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#U-f1[`f1`]  ¦
+| Name | Description 
 
-¦xref:U-f3[`f3`]  ¦
+| xref:#U-f1[`f1`] 
+| 
+    
+| xref:U-f3[`f3`] 
+| 
 |===
 ===  Static Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#U-f2[`f2`]  ¦
+| Name | Description 
 
+| xref:#U-f2[`f2`] 
+| 
+    
 |===
 
 
@@ -1002,7 +1063,7 @@ struct V
 
 
 [#V-f3]
-== xref:#V[pass:[V]]::f3
+== xref:#V[V]::f3
 
 
 
diff --git a/test-files/golden-tests/mem-fn.html b/test-files/golden-tests/mem-fn.html
index 4f1b7c4c5..6e18be6ed 100644
--- a/test-files/golden-tests/mem-fn.html
+++ b/test-files/golden-tests/mem-fn.html
@@ -9,150 +9,147 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                T01 
-                            
-
-                                    
                

-                                T02 
-                            
-
-                                    
                

-                                T03 
-                            
-
-                                    
                

-                                T04 
-                            
-
-                                    
                

-                                T05 
-                            
-
-                                    
                

-                                T06 
-                            
-
-                                    
                

-                                T08 
-                            
-
-                                    
                

-                                T09 
-                            
-
-                                    
                

-                                T10 
-                            
-
-                                    
                

-                                T11 
-                            
-
-                                    
                

-                                T12 
-                            
-
-                                    
                

-                                T13 
-                            
-
-                                    
                

-                                T14 
-                            
-
-                                    
                

-                                T15 
-                            
-
-                                    
                

-                                T16 
-                            
-
-                                    
                

-                                T17 
-                            
-
-                                    
                

-                                U 
-                            
-
-                                    
                

-                                V 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        T01 
+                    
+                        
+                            
+                    
+                
+                    
+                        T02 
+                    
+                        
+                            
+                    
+                
+                    
+                        T03 
+                    
+                        
+                            
+                    
+                
+                    
+                        T04 
+                    
+                        
+                            
+                    
+                
+                    
+                        T05 
+                    
+                        
+                            
+                    
+                
+                    
+                        T06 
+                    
+                        
+                            
+                    
+                
+                    
+                        T08 
+                    
+                        
+                            
+                    
+                
+                    
+                        T09 
+                    
+                        
+                            
+                    
+                
+                    
+                        T10 
+                    
+                        
+                            
+                    
+                
+                    
+                        T11 
+                    
+                        
+                            
+                    
+                
+                    
+                        T12 
+                    
+                        
+                            
+                    
+                
+                    
+                        T13 
+                    
+                        
+                            
+                    
+                
+                    
+                        T14 
+                    
+                        
+                            
+                    
+                
+                    
+                        T15 
+                    
+                        
+                            
+                    
+                
+                    
+                        T16 
+                    
+                        
+                            
+                    
+                
+                    
+                        T17 
+                    
+                        
+                            
+                    
+                
+                    
+                        U 
+                    
+                        
+                            
+                    
+                
+                    
+                        V 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -169,7 +166,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -178,31 +174,28 @@ 
Synopsis

     

 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -221,7 +214,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -249,7 +241,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -258,31 +249,28 @@ 
Synopsis

     
 
     

-                

-                
 Static Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Static Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -301,7 +289,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -330,7 +317,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -339,31 +325,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -382,7 +365,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -410,7 +392,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -419,31 +400,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -462,7 +440,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -490,7 +467,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -499,31 +475,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -542,7 +515,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -570,7 +542,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -579,31 +550,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -622,7 +590,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -651,7 +618,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -660,31 +626,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -703,7 +666,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -731,7 +693,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -740,31 +701,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -783,7 +741,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -811,7 +768,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -820,31 +776,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -863,7 +816,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -891,7 +843,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -900,31 +851,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -943,7 +891,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -971,7 +918,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -980,31 +926,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -1023,7 +966,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1051,7 +993,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1060,31 +1001,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -1103,7 +1041,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1132,7 +1069,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1141,31 +1077,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -1184,7 +1117,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1213,7 +1145,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1222,31 +1153,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -1265,7 +1193,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1293,7 +1220,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1302,31 +1228,28 @@ 
Synopsis

     
 
     

-                

-                
 Static Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Static Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -1345,7 +1268,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1374,7 +1296,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1384,30 +1305,27 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    f 
-                                
-    
        

-            

-                                                                                                    

+                    
+                        f 
+                    
+                        
+                    
+                
+            
+        
+                    
 
 
 
@@ -1426,7 +1344,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1455,7 +1372,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1464,62 +1380,56 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                                
-                                
-                            
-                
NameDescription

                 

-                                    f1 
-                                
-
-                                        
                

-                                    f3 
-                                
-
-                                        
        

-            

-    

-                
 Static Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+                
+                    
+                
+            
+        




NameDescription

+                        f1 
+                    
+                        
+                            
+                    

+                        f3 
+                    
+                        
+                            
+                    

+
 Static Member Functions

+
+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f2 
-                                
+                    NameDescription
        

-            

-                                                                                                

+                
+            
+
+                
+                    
+                        f2 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -1538,7 +1448,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1567,7 +1476,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1597,7 +1505,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1626,7 +1533,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1636,61 +1542,55 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                                
-                                
-                            
-                
NameDescription

                 

-                                    f1 
-                                
-
-                                        
                

-                                    f3 
-                                
-    
        

-            

-    

-                
 Static Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+                
+                    
+                
+            
+        




NameDescription

+                        f1 
+                    
+                        
+                            
+                    

+                        f3 
+                    
+                        
+                    

+
 Static Member Functions

+
+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f2 
-                                
+                    NameDescription
        

-            

-                                                                                                

+                
+            
+
+                
+                    
+                        f2 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -1709,7 +1609,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/namespace-alias-1.adoc b/test-files/golden-tests/namespace-alias-1.adoc
index 8928c314a..fb744bbdc 100644
--- a/test-files/golden-tests/namespace-alias-1.adoc
+++ b/test-files/golden-tests/namespace-alias-1.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#LongName[`LongName`]  ¦
+| Name | Description 
 
+| xref:#LongName[`LongName`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/namespace-alias-1.html b/test-files/golden-tests/namespace-alias-1.html
index d07d3f5cf..b4450d662 100644
--- a/test-files/golden-tests/namespace-alias-1.html
+++ b/test-files/golden-tests/namespace-alias-1.html
@@ -9,38 +9,35 @@
         
Global namespace

     
     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                LongName 
-                            
+                    NameDescription
        

-        

-                

+
+                
+            
+
+                
+                    
+                        LongName 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

         
Namespace LongName

     

     

-                        

+            

 
 

     

@@ -56,7 +53,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
diff --git a/test-files/golden-tests/namespace-alias-2.adoc b/test-files/golden-tests/namespace-alias-2.adoc
index bd7a46b56..d03003fc3 100644
--- a/test-files/golden-tests/namespace-alias-2.adoc
+++ b/test-files/golden-tests/namespace-alias-2.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#LongName[`LongName`]  ¦
+| Name | Description 
 
+| xref:#LongName[`LongName`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/namespace-alias-2.html b/test-files/golden-tests/namespace-alias-2.html
index 1fb84b190..dfc8d389e 100644
--- a/test-files/golden-tests/namespace-alias-2.html
+++ b/test-files/golden-tests/namespace-alias-2.html
@@ -9,38 +9,35 @@
         
Global namespace

     

     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                LongName 
-                            
+                    NameDescription
        

-        

-                

+
+                
+            
+
+                
+                    
+                        LongName 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

         
Namespace LongName

     

     

-                        

+            

 
 

     

@@ -56,7 +53,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -79,7 +75,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
diff --git a/test-files/golden-tests/namespace-alias-3.adoc b/test-files/golden-tests/namespace-alias-3.adoc
index a790d1e54..a1f688242 100644
--- a/test-files/golden-tests/namespace-alias-3.adoc
+++ b/test-files/golden-tests/namespace-alias-3.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#LongName[`LongName`]  ¦
+| Name | Description 
 
+| xref:#LongName[`LongName`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/namespace-alias-3.html b/test-files/golden-tests/namespace-alias-3.html
index 7c0edeb81..f460f85c0 100644
--- a/test-files/golden-tests/namespace-alias-3.html
+++ b/test-files/golden-tests/namespace-alias-3.html
@@ -9,38 +9,35 @@
         
Global namespace

     
     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                LongName 
-                            
+                    NameDescription
        

-        

-                

+
+                
+            
+
+                
+                    
+                        LongName 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

         
Namespace LongName

     

     

-                        

+            

 
 

     

@@ -56,7 +53,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -79,7 +75,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
diff --git a/test-files/golden-tests/namespace.adoc b/test-files/golden-tests/namespace.adoc
index 7ea42ebd9..5522f3ea2 100644
--- a/test-files/golden-tests/namespace.adoc
+++ b/test-files/golden-tests/namespace.adoc
@@ -6,17 +6,22 @@
 == Global namespace
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#00namespace[``]  ¦
-
-¦xref:#A[`A`]  ¦
-
-¦xref:#D[`D`]  ¦
-
-¦xref:#I[`I`]  ¦
+| Name | Description 
 
+| xref:#00namespace[``] 
+| 
+    
+| xref:#A[`A`] 
+| 
+    
+| xref:#D[`D`] 
+| 
+    
+| xref:#I[`I`] 
+| 
+    
 |===
 
 
@@ -25,28 +30,34 @@
 == A
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-00namespace[``]  ¦
-
-¦xref:#A-B[`B`]  ¦
-
-¦xref:#A-C[`C`]  ¦
+| Name | Description 
 
+| xref:#A-00namespace[``] 
+| 
+    
+| xref:#A-B[`B`] 
+| 
+    
+| xref:#A-C[`C`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-f0[`f0`]  ¦
+| Name | Description 
 
+| xref:#A-f0[`f0`] 
+| 
+    
 |===
 
 
 
 [#A-f0]
-== xref:#A[pass:[A]]::f0
+== xref:#A[A]::f0
 
 
 
@@ -70,20 +81,22 @@ f0();
 
 
 [#A-B]
-== xref:#A[pass:[A]]::B
+== xref:#A[A]::B
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-B-f1[`f1`]  ¦
+| Name | Description 
 
+| xref:#A-B-f1[`f1`] 
+| 
+    
 |===
 
 
 
 [#A-B-f1]
-== xref:#A[pass:[A]]::xref:#A-B[pass:[B]]::f1
+== xref:#A[A]::xref:#A-B[B]::f1
 
 
 
@@ -107,20 +120,22 @@ f1();
 
 
 [#A-C]
-== xref:#A[pass:[A]]::C
+== xref:#A[A]::C
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-C-f2[`f2`]  ¦
+| Name | Description 
 
+| xref:#A-C-f2[`f2`] 
+| 
+    
 |===
 
 
 
 [#A-C-f2]
-== xref:#A[pass:[A]]::xref:#A-C[pass:[C]]::f2
+== xref:#A[A]::xref:#A-C[C]::f2
 
 
 
@@ -147,17 +162,19 @@ f2();
 == Unnamed namespace
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-00namespace-f3[`f3`]  ¦
+| Name | Description 
 
+| xref:#A-00namespace-f3[`f3`] 
+| 
+    
 |===
 
 
 
 [#A-00namespace-f3]
-== xref:#A[pass:[A]]::f3
+== xref:#A[A]::f3
 
 
 
@@ -184,28 +201,34 @@ f3();
 == D
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#D-00namespace[``]  ¦
-
-¦xref:#D-E[`E`]  ¦
-
-¦xref:#D-F[`F`]  ¦
+| Name | Description 
 
+| xref:#D-00namespace[``] 
+| 
+    
+| xref:#D-E[`E`] 
+| 
+    
+| xref:#D-F[`F`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#D-f5[`f5`]  ¦
+| Name | Description 
 
+| xref:#D-f5[`f5`] 
+| 
+    
 |===
 
 
 
 [#D-f5]
-== xref:#D[pass:[D]]::f5
+== xref:#D[D]::f5
 
 
 
@@ -229,20 +252,22 @@ f5();
 
 
 [#D-E]
-== xref:#D[pass:[D]]::E
+== xref:#D[D]::E
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#D-E-f6[`f6`]  ¦
+| Name | Description 
 
+| xref:#D-E-f6[`f6`] 
+| 
+    
 |===
 
 
 
 [#D-E-f6]
-== xref:#D[pass:[D]]::xref:#D-E[pass:[E]]::f6
+== xref:#D[D]::xref:#D-E[E]::f6
 
 
 
@@ -266,20 +291,22 @@ f6();
 
 
 [#D-F]
-== xref:#D[pass:[D]]::F
+== xref:#D[D]::F
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#D-F-f7[`f7`]  ¦
+| Name | Description 
 
+| xref:#D-F-f7[`f7`] 
+| 
+    
 |===
 
 
 
 [#D-F-f7]
-== xref:#D[pass:[D]]::xref:#D-F[pass:[F]]::f7
+== xref:#D[D]::xref:#D-F[F]::f7
 
 
 
@@ -306,17 +333,19 @@ f7();
 == Unnamed namespace
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#D-00namespace-f8[`f8`]  ¦
+| Name | Description 
 
+| xref:#D-00namespace-f8[`f8`] 
+| 
+    
 |===
 
 
 
 [#D-00namespace-f8]
-== xref:#D[pass:[D]]::f8
+== xref:#D[D]::f8
 
 
 
@@ -343,20 +372,25 @@ f8();
 == Unnamed namespace
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#00namespace-G[`G`]  ¦
-
-¦xref:#00namespace-H[`H`]  ¦
+| Name | Description 
 
+| xref:#00namespace-G[`G`] 
+| 
+    
+| xref:#00namespace-H[`H`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#00namespace-f10[`f10`]  ¦
+| Name | Description 
 
+| xref:#00namespace-f10[`f10`] 
+| 
+    
 |===
 
 
@@ -389,17 +423,19 @@ f10();
 == G
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#00namespace-G-f11[`f11`]  ¦
+| Name | Description 
 
+| xref:#00namespace-G-f11[`f11`] 
+| 
+    
 |===
 
 
 
 [#00namespace-G-f11]
-== xref:#00namespace-G[pass:[G]]::f11
+== xref:#00namespace-G[G]::f11
 
 
 
@@ -426,17 +462,19 @@ f11();
 == H
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#00namespace-H-f12[`f12`]  ¦
+| Name | Description 
 
+| xref:#00namespace-H-f12[`f12`] 
+| 
+    
 |===
 
 
 
 [#00namespace-H-f12]
-== xref:#00namespace-H[pass:[H]]::f12
+== xref:#00namespace-H[H]::f12
 
 
 
@@ -463,11 +501,13 @@ f12();
 == I
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#I-00namespace[``]  ¦
+| Name | Description 
 
+| xref:#I-00namespace[``] 
+| 
+    
 |===
 
 
@@ -476,17 +516,19 @@ f12();
 == Unnamed namespace
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#I-00namespace-f14[`f14`]  ¦
+| Name | Description 
 
+| xref:#I-00namespace-f14[`f14`] 
+| 
+    
 |===
 
 
 
 [#I-00namespace-f14]
-== xref:#I[pass:[I]]::f14
+== xref:#I[I]::f14
 
 
 
diff --git a/test-files/golden-tests/namespace.html b/test-files/golden-tests/namespace.html
index 00de7403a..43047101b 100644
--- a/test-files/golden-tests/namespace.html
+++ b/test-files/golden-tests/namespace.html
@@ -9,121 +9,112 @@
         
Global namespace

     
     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
-                
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            




NameDescription

-                                 
-                            
-
-                                    
                

-                                A 
-                            
-
-                                    
                

-                                D 
-                            
-
-                                    
                

-                                I 
-                            
-
-                                    
        

-        

-                

+        
Namespaces

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+            
+        
NameDescription

+                         
+                    
+                        
+                            
+                    

+                        A 
+                    
+                        
+                            
+                    

+                        D 
+                    
+                        
+                            
+                    

+                        I 
+                    
+                        
+                            
+                    

+    
 
 

     

         
Namespace A

     

     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
-                
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            




NameDescription

-                                 
-                            
-
-                                    
                

-                                B 
-                            
-
-                                    
                

-                                C 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
-                
-                                
-                                
-                            
-                




NameDescription

-                                    f0 
-                                
-
-                                        
        

-            

-            

+        
Namespaces

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+                    
+                
+            
+        
NameDescription

+                         
+                    
+                        
+                            
+                    

+                        B 
+                    
+                        
+                            
+                    

+                        C 
+                    
+                        
+                            
+                    

+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f0 
+                    
+                        
+                            
+                    

+    

 
 

     

@@ -140,7 +131,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -158,31 +148,28 @@ 
Synopsis

         
Namespace B

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
-                
-                                
-                                
-                            
-                




NameDescription

-                                    f1 
-                                
-
-                                        
        

-            

-            

+        
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f1 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -199,7 +186,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -217,31 +203,28 @@ 
Synopsis

         
Namespace C

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
-                
-                                
-                                
-                            
-                




NameDescription

-                                    f2 
-                                
-
-                                        
        

-            

-            

+        
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f2 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -258,7 +241,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -276,31 +258,28 @@ 
Synopsis

         
Unnamed namespace

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
-                
-                                
-                                
-                            
-                




NameDescription

-                                    f3 
-                                
-
-                                        
        

-            

-            

+        
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f3 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -317,7 +296,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -335,69 +313,63 @@ 
Synopsis

         
Namespace D

     

     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
-                
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            




NameDescription

-                                 
-                            
-
-                                    
                

-                                E 
-                            
-
-                                    
                

-                                F 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
-                
-                                
-                                
-                            
-                




NameDescription

-                                    f5 
-                                
-
-                                        
        

-            

-            

+        
Namespaces

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+                    
+                
+            
+        
NameDescription

+                         
+                    
+                        
+                            
+                    

+                        E 
+                    
+                        
+                            
+                    

+                        F 
+                    
+                        
+                            
+                    

+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f5 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -414,7 +386,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -432,31 +403,28 @@ 
Synopsis

         
Namespace E

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
-                
-                                
-                                
-                            
-                




NameDescription

-                                    f6 
-                                
-
-                                        
        

-            

-            

+        
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f6 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -473,7 +441,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -491,31 +458,28 @@ 
Synopsis

         
Namespace F

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
-                
-                                
-                                
-                            
-                




NameDescription

-                                    f7 
-                                
-
-                                        
        

-            

-            

+        
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f7 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -532,7 +496,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -550,31 +513,28 @@ 
Synopsis

         
Unnamed namespace

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
-                
-                                
-                                
-                            
-                




NameDescription

-                                    f8 
-                                
-
-                                        
        

-            

-            

+        
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f8 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -591,7 +551,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -609,62 +568,56 @@ 
Synopsis

         
Unnamed namespace

     

     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
-                
-                            
-                            
-                        
-                            
-                            
-                        
-            




NameDescription

-                                G 
-                            
-
-                                    
                

-                                H 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
-                
-                                
-                                
-                            
-                




NameDescription

-                                    f10 
-                                
-
-                                        
        

-            

-            

+        
Namespaces

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+            
+        
NameDescription

+                        G 
+                    
+                        
+                            
+                    

+                        H 
+                    
+                        
+                            
+                    

+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f10 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -681,7 +634,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -699,31 +651,28 @@ 
Synopsis

         
Namespace G

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
-                
-                                
-                                
-                            
-                




NameDescription

-                                    f11 
-                                
-
-                                        
        

-            

-            

+        
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f11 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -740,7 +689,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -758,31 +706,28 @@ 
Synopsis

         
Namespace H

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
-                
-                                
-                                
-                            
-                




NameDescription

-                                    f12 
-                                
-
-                                        
        

-            

-            

+        
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f12 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -799,7 +744,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -817,62 +761,56 @@ 
Synopsis

         
Namespace I

     

     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
-                
-                            
-                            
-                        
-            




NameDescription

-                                 
-                            
-
-                                    
        

-        

-                

+        
Namespaces

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                         
+                    
+                        
+                            
+                    

+    
 
 

     

         
Unnamed namespace

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
-                
-                                
-                                
-                            
-                




NameDescription

-                                    f14 
-                                
-
-                                        
        

-            

-            

+        
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f14 
+                    
+                        
+                            
+                    

+    

 
 

     

@@ -889,7 +827,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
diff --git a/test-files/golden-tests/nested-private-template.adoc b/test-files/golden-tests/nested-private-template.adoc
index 6a0e4caec..68e63b871 100644
--- a/test-files/golden-tests/nested-private-template.adoc
+++ b/test-files/golden-tests/nested-private-template.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#range[`range`]  ¦
+| Name | Description 
 
+| xref:#range[`range`] 
+| 
+    
 |===
 
 
@@ -31,13 +33,16 @@ class range;
 ----
 
 === Private Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#range-impl-0e[`impl`]  ¦
-
-¦xref:#range-impl-00[`impl`]  ¦
-
+| Name | Description 
+
+| xref:#range-impl-0e[`impl`] 
+| 
+    
+| xref:#range-impl-00[`impl`] 
+| 
+    
 |===
 
 
@@ -45,7 +50,7 @@ class range;
 
 
 [#range-impl-0e]
-== xref:#range[pass:[range]]::impl
+== xref:#range[range]::impl
 
 
 
@@ -67,7 +72,7 @@ struct impl;
 
 
 [#range-impl-00]
-== xref:#range[pass:[range]]::impl
+== xref:#range[range]::impl
 
 
 
@@ -78,7 +83,7 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template
-struct xref:#range-impl-0e[pass:[impl]];
+struct xref:#range-impl-0e[impl];
 ----
 
 
diff --git a/test-files/golden-tests/nested-private-template.html b/test-files/golden-tests/nested-private-template.html
index 9f52cdc62..42d275323 100644
--- a/test-files/golden-tests/nested-private-template.html
+++ b/test-files/golden-tests/nested-private-template.html
@@ -9,31 +9,28 @@
         
Global namespace

     

     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                range 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        range 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -60,38 +56,35 @@ 
Synopsis

     

 
     

-                                                                                

-            
Private Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+                        
Private Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                impl 
-                            
-
-                                    
                

-                                impl 
-                            
-
-                                    
        

-        

-                                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        impl 
+                    
+                        
+                            
+                    
+                
+                    
+                        impl 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 
 
@@ -110,7 +103,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -122,7 +114,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -141,7 +133,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -151,7 +142,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
diff --git a/test-files/golden-tests/no_unique_address.adoc b/test-files/golden-tests/no_unique_address.adoc
index 9046f7be8..8cc2ebc7e 100644
--- a/test-files/golden-tests/no_unique_address.adoc
+++ b/test-files/golden-tests/no_unique_address.adoc
@@ -6,13 +6,16 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#Empty[`Empty`]  ¦
-
-¦xref:#T[`T`]  ¦
-
+| Name | Description 
+
+| xref:#Empty[`Empty`] 
+| 
+    
+| xref:#T[`T`] 
+| 
+    
 |===
 
 
@@ -51,13 +54,16 @@ struct T;
 ----
 
 ===  Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T-e[`e`]  ¦
-
-¦xref:#T-i[`i`]  ¦
-
+| Name | Description 
+
+| xref:#T-e[`e`] 
+| 
+    
+| xref:#T-i[`i`] 
+| 
+    
 |===
 
 
@@ -65,7 +71,7 @@ struct T;
 
 
 [#T-i]
-== xref:#T[pass:[T]]::i
+== xref:#T[T]::i
 
 
 
@@ -82,7 +88,7 @@ int i;
 
 
 [#T-e]
-== xref:#T[pass:[T]]::e
+== xref:#T[T]::e
 
 
 
diff --git a/test-files/golden-tests/no_unique_address.html b/test-files/golden-tests/no_unique_address.html
index ff2e65a3c..4c3ec3895 100644
--- a/test-files/golden-tests/no_unique_address.html
+++ b/test-files/golden-tests/no_unique_address.html
@@ -9,38 +9,35 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                Empty 
-                            
-
-                                    
                

-                                T 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        Empty 
+                    
+                        
+                            
+                    
+                
+                    
+                        T 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -57,7 +54,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -66,7 +62,7 @@ 
Synopsis

     

 
     

-                                                                                                                

+                            
 
 
 
@@ -85,7 +81,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -94,38 +89,35 @@ 
Synopsis

     
 
     

-                    

-                
 Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Data Members

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                                
-                                
-                            
-                

                 

-                                    e 
-                                
+                    NameDescription
                

-                                    i 
-                                
 
-                                        
        

-            

-                                                                                            

+                
+            
+
+                
+                    
+                        e 
+                    
+                        
+                            
+                    
+                
+                    
+                        i 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -144,7 +136,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -168,7 +159,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/noreturn.adoc b/test-files/golden-tests/noreturn.adoc
index 005e2caca..3f1ef9194 100644
--- a/test-files/golden-tests/noreturn.adoc
+++ b/test-files/golden-tests/noreturn.adoc
@@ -6,18 +6,22 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T[`T`]  ¦
+| Name | Description 
 
+| xref:#T[`T`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f1[`f1`]  ¦
+| Name | Description 
 
+| xref:#f1[`f1`] 
+| 
+    
 |===
 
 
@@ -61,25 +65,31 @@ struct T;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T-f3[`f3`]  ¦
+| Name | Description 
 
+| xref:#T-f3[`f3`] 
+| 
+    
 |===
 ===  Static Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T-f2[`f2`]  ¦
+| Name | Description 
 
+| xref:#T-f2[`f2`] 
+| 
+    
 |===
 ===  Friends
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T-08friend[`f1`]  ¦
+| Name | Description 
 
+| xref:#T-08friend[`f1`] 
+| 
+    
 |===
 
 
@@ -87,7 +97,7 @@ struct T;
 
 
 [#T-f2]
-== xref:#T[pass:[T]]::f2
+== xref:#T[T]::f2
 
 
 
@@ -112,7 +122,7 @@ f2();
 
 
 [#T-f3]
-== xref:#T[pass:[T]]::f3
+== xref:#T[T]::f3
 
 
 
diff --git a/test-files/golden-tests/noreturn.html b/test-files/golden-tests/noreturn.html
index aebba1a55..d8f61f86a 100644
--- a/test-files/golden-tests/noreturn.html
+++ b/test-files/golden-tests/noreturn.html
@@ -9,55 +9,49 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                T 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                




NameDescription
NameDescription

                 

-                                    f1 
-                                
-
-                                        
        

-            

-            

+                    
+                        T 
+                    
+                        
+                            
+                    
+                
+            
+        
+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f1 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -74,7 +68,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -102,7 +95,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -111,79 +103,70 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
-                            
-                

                 

-                                    f3 
-                                
-
-                                        
        

-            

-    

-                
 Static Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                




NameDescription
NameDescription

                 

-                                    f2 
-                                
-
-                                        
        

-            

-            

-                
 Friends

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+                
+            
+        




NameDescription

+                        f3 
+                    
+                        
+                            
+                    

+
 Static Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f1 
-                                
+                    NameDescription
        

-            

-                                                                                    

+
+                
+            
+
+                
+                    
+                        f2 
+                    
+                        
+                            
+                    
+                
+            
+        
+
 Friends

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f1 
+                    
+                        
+                            
+                    

+                    
 
 
 
@@ -202,7 +185,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -231,7 +213,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -259,7 +240,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/ns-variables.adoc b/test-files/golden-tests/ns-variables.adoc
index 9f93d1bc9..116fbcd64 100644
--- a/test-files/golden-tests/ns-variables.adoc
+++ b/test-files/golden-tests/ns-variables.adoc
@@ -6,34 +6,46 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T[`T`]  ¦
+| Name | Description 
 
+| xref:#T[`T`] 
+| 
+    
 |===
 === Variables
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#i[`i`]  ¦
-
-¦xref:#j[`j`]  ¦
-
-¦xref:#k[`k`]  ¦
-
-¦xref:#l[`l`]  ¦
-
-¦xref:#pi[`pi`]  ¦
-
-¦xref:#t[`t`]  ¦
-
-¦xref:#x0[`x0`]  ¦
-
-¦xref:#x1[`x1`]  ¦
-
-¦xref:#x2[`x2`]  ¦
-
+| Name | Description 
+
+| xref:#i[`i`] 
+| 
+    
+| xref:#j[`j`] 
+| 
+    
+| xref:#k[`k`] 
+| 
+    
+| xref:#l[`l`] 
+| 
+    
+| xref:#pi[`pi`] 
+| 
+    
+| xref:#t[`t`] 
+| 
+    
+| xref:#x0[`x0`] 
+| 
+    
+| xref:#x1[`x1`] 
+| 
+    
+| xref:#x2[`x2`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/ns-variables.html b/test-files/golden-tests/ns-variables.html
index 98a44e839..340ac0897 100644
--- a/test-files/golden-tests/ns-variables.html
+++ b/test-files/golden-tests/ns-variables.html
@@ -9,111 +9,105 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
-                
-                            
-                            
-                        
-            




NameDescription

-                                T 
-                            
-
-                                    
        

-        

-        

-                
Variables

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Types

+




NameDescription

+            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
+
 
-                                        
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
+            
+
+                
+                    
+                
+            
+        

                 

-                                    i 
-                                
-
-                                        
                

-                                    j 
-                                
-
-                                        
                

-                                    k 
-                                
-
-                                        
                

-                                    l 
-                                
+                    NameDescription
                

-                                    pi 
-                                
 
-                                        
                

-                                    t 
-                                
-
-                                        
                

-                                    x0 
-                                
-
-                                        
                

-                                    x1 
-                                
+                

+                        T 
+                    
+                        
+                            
+                    

+
Variables

+
+            
+                
+                    
+
 
-                                        
-                            
-                                
-                                
-                            
-                
NameDescription
                

-                                    x2 
-                                
 
-                                        
        

-            

-        

+                
+            
+
+                
+                    
+                        i 
+                    
+                        
+                            
+                    
+                
+                    
+                        j 
+                    
+                        
+                            
+                    
+                
+                    
+                        k 
+                    
+                        
+                            
+                    
+                
+                    
+                        l 
+                    
+                        
+                            
+                    
+                
+                    
+                        pi 
+                    
+                        
+                            
+                    
+                
+                    
+                        t 
+                    
+                        
+                            
+                    
+                
+                    
+                        x0 
+                    
+                        
+                            
+                    
+                
+                    
+                        x1 
+                    
+                        
+                            
+                    
+                
+                    
+                        x2 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -130,7 +124,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -155,7 +148,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -179,7 +171,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -205,7 +196,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -230,7 +220,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -254,7 +243,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -263,7 +251,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -282,7 +270,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -307,7 +294,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -332,7 +318,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -358,7 +343,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
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 a12235ade..4e3fef587 100644
--- a/test-files/golden-tests/out-of-line-record-def.adoc
+++ b/test-files/golden-tests/out-of-line-record-def.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N[`N`]  ¦
+| Name | Description 
 
+| xref:#N[`N`] 
+| 
+    
 |===
 
 
@@ -19,17 +21,19 @@
 == N
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#N-S[`S`]  ¦
+| Name | Description 
 
+| xref:#N-S[`S`] 
+| 
+    
 |===
 
 
 
 [#N-S]
-== xref:#N[pass:[N]]::S
+== xref:#N[N]::S
 
 
 
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 c69f96b04..9b96dc763 100644
--- a/test-files/golden-tests/out-of-line-record-def.html
+++ b/test-files/golden-tests/out-of-line-record-def.html
@@ -9,62 +9,56 @@
         
Global namespace

     
     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                N 
-                            
+                    NameDescription
        

-        

-                

+
+                
+            
+
+                
+                    
+                        N 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

         
Namespace N

     

     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                S 
-                            
+                    NameDescription
        

-        

-                

+
+                
+            
+
+                
+                    
+                        S 
+                    
+                        
+                            
+                    
+                
+            
+        
+    

 
 

     

@@ -81,7 +75,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -90,7 +83,7 @@ 
Synopsis

     

 
     

-                                                                                                                

+                            
 
 
 
diff --git a/test-files/golden-tests/overloaded-op-1.adoc b/test-files/golden-tests/overloaded-op-1.adoc
index a1340866e..72c1e03f8 100644
--- a/test-files/golden-tests/overloaded-op-1.adoc
+++ b/test-files/golden-tests/overloaded-op-1.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T[`T`]  ¦
+| Name | Description 
 
+| xref:#T[`T`] 
+| 
+    
 |===
 
 
@@ -30,11 +32,13 @@ struct T;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T-operator_plus[`operator+`]  ¦
+| Name | Description 
 
+| xref:#T-operator_plus[`operator+`] 
+| 
+    
 |===
 
 
@@ -42,7 +46,7 @@ struct T;
 
 
 [#T-operator_plus]
-== xref:#T[pass:[T]]::operator+
+== xref:#T[T]::operator+
 
 
 
diff --git a/test-files/golden-tests/overloaded-op-1.html b/test-files/golden-tests/overloaded-op-1.html
index ddf2f92f3..b17dc2d82 100644
--- a/test-files/golden-tests/overloaded-op-1.html
+++ b/test-files/golden-tests/overloaded-op-1.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                T 
-                            
+                    NameDescription
        

-        

-                

+
+                
+            
+
+                
+                    
+                        T 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -59,31 +55,28 @@ 
Synopsis

     

 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    operator+ 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        operator+ 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -102,7 +95,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/overloaded-op-2.adoc b/test-files/golden-tests/overloaded-op-2.adoc
index a753be792..a8ab3a1fb 100644
--- a/test-files/golden-tests/overloaded-op-2.adoc
+++ b/test-files/golden-tests/overloaded-op-2.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T[`T`]  ¦
+| Name | Description 
 
+| xref:#T[`T`] 
+| 
+    
 |===
 
 
@@ -30,11 +32,13 @@ struct T;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T-operator_plus[`operator+`]  ¦
+| Name | Description 
 
+| xref:#T-operator_plus[`operator+`] 
+| 
+    
 |===
 
 
@@ -42,7 +46,7 @@ struct T;
 
 
 [#T-operator_plus]
-== xref:#T[pass:[T]]::operator+
+== xref:#T[T]::operator+
 
 
 
diff --git a/test-files/golden-tests/overloaded-op-2.html b/test-files/golden-tests/overloaded-op-2.html
index d652c6722..03b820039 100644
--- a/test-files/golden-tests/overloaded-op-2.html
+++ b/test-files/golden-tests/overloaded-op-2.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                T 
-                            
+                    NameDescription
        

-        

-                

+
+                
+            
+
+                
+                    
+                        T 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -59,31 +55,28 @@ 
Synopsis

     

 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    operator+ 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        operator+ 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -102,7 +95,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/para-1.adoc b/test-files/golden-tests/para-1.adoc
index 8e9c00d19..c74206b8c 100644
--- a/test-files/golden-tests/para-1.adoc
+++ b/test-files/golden-tests/para-1.adoc
@@ -6,19 +6,24 @@
 == Global namespace
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f1[`f1`]  ¦
-
-¦xref:#f2[`f2`]  ¦
-
-¦xref:#f3[`f3`]  ¦
-
-¦xref:#f4[`f4`]  ¦
-
+| Name | Description 
+
+| xref:#f1[`f1`] 
+| 
+    
+| xref:#f2[`f2`] 
+| 
+    
+| xref:#f3[`f3`] 
+| 
+    
+| xref:#f4[`f4`] 
+| 
 brief
 
+    
 |===
 
 
diff --git a/test-files/golden-tests/para-1.html b/test-files/golden-tests/para-1.html
index 4ed09fdb7..b613a0b60 100644
--- a/test-files/golden-tests/para-1.html
+++ b/test-files/golden-tests/para-1.html
@@ -9,54 +9,51 @@
         
Global namespace

     
     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+                    
+                
+                    
-                            
-                

                 

-                                    f1 
-                                
-
-                                        
                

-                                    f2 
-                                
-
-                                        
                

-                                    f3 
-                                
-
-                                        
                

-                                    f4 
-                                
-
brief

+                    		NameDescription

+                        f1 
+                    
+                        
+                            
+                    

+                        f2 
+                    
+                        
                             
+                    

+                        f3 
+                    
+                        
+                            
+                    

+                        f4 
+                    
+                        
brief

+                        
 
-                                        
        

-            

-            

+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -73,7 +70,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -101,7 +97,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -129,7 +124,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -159,7 +153,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/para-2.adoc b/test-files/golden-tests/para-2.adoc
index 3d3143f43..13ff1640a 100644
--- a/test-files/golden-tests/para-2.adoc
+++ b/test-files/golden-tests/para-2.adoc
@@ -6,13 +6,15 @@
 == Global namespace
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f1[`f1`]  ¦
+| Name | Description 
 
+| xref:#f1[`f1`] 
+| 
 brief
 
+    
 |===
 
 
diff --git a/test-files/golden-tests/para-2.html b/test-files/golden-tests/para-2.html
index 0775c38b3..861cadc4b 100644
--- a/test-files/golden-tests/para-2.html
+++ b/test-files/golden-tests/para-2.html
@@ -9,33 +9,30 @@
         
Global namespace

     
     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
+
+
+
+                
+            
+
+                
+                    
-                            
-                

                 

-                                    f1 
-                                
-
brief

-                            
+                    		NameDescription

+                        f1 
+                    
+                        
brief

+                        
 
-                                        
        

-            

-            

+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -54,7 +51,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
diff --git a/test-files/golden-tests/param-direction.adoc b/test-files/golden-tests/param-direction.adoc
index 525626f4c..f0f6ddce0 100644
--- a/test-files/golden-tests/param-direction.adoc
+++ b/test-files/golden-tests/param-direction.adoc
@@ -6,29 +6,40 @@
 == Global namespace
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f[`f`]  ¦
-
-¦xref:#g[`g`]  ¦
-
-¦xref:#h[`h`]  ¦
-
-¦xref:#i[`i`]  ¦
-
-¦xref:#j[`j`]  ¦
-
-¦xref:#k[`k`]  ¦
-
-¦xref:#l[`l`]  ¦
-
-¦xref:#m[`m`]  ¦
-
-¦xref:#n[`n`]  ¦
-
-¦xref:#o[`o`]  ¦
+| Name | Description 
 
+| xref:#f[`f`] 
+| 
+    
+| xref:#g[`g`] 
+| 
+    
+| xref:#h[`h`] 
+| 
+    
+| xref:#i[`i`] 
+| 
+    
+| xref:#j[`j`] 
+| 
+    
+| xref:#k[`k`] 
+| 
+    
+| xref:#l[`l`] 
+| 
+    
+| xref:#m[`m`] 
+| 
+    
+| xref:#n[`n`] 
+| 
+    
+| xref:#o[`o`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/param-direction.html b/test-files/golden-tests/param-direction.html
index 589b9e043..5c40bb4bd 100644
--- a/test-files/golden-tests/param-direction.html
+++ b/test-files/golden-tests/param-direction.html
@@ -9,94 +9,91 @@
         
Global namespace

     

     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
-                
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                




NameDescription

-                                    f 
-                                
-
-                                        
                

-                                    g 
-                                
-
-                                        
                

-                                    h 
-                                
-
-                                        
                

-                                    i 
-                                
-
-                                        
                

-                                    j 
-                                
-
-                                        
                

-                                    k 
-                                
-
-                                        
                

-                                    l 
-                                
-
-                                        
                

-                                    m 
-                                
-
-                                        
                

-                                    n 
-                                
-
-                                        
                

-                                    o 
-                                
-
-                                        
        

-            

-            

+        
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+            
+        
NameDescription

+                        f 
+                    
+                        
+                            
+                    

+                        g 
+                    
+                        
+                            
+                    

+                        h 
+                    
+                        
+                            
+                    

+                        i 
+                    
+                        
+                            
+                    

+                        j 
+                    
+                        
+                            
+                    

+                        k 
+                    
+                        
+                            
+                    

+                        l 
+                    
+                        
+                            
+                    

+                        m 
+                    
+                        
+                            
+                    

+                        n 
+                    
+                        
+                            
+                    

+                        o 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -113,7 +110,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -158,7 +154,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -209,7 +204,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -260,7 +254,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -311,7 +304,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -362,7 +354,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -418,7 +409,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -475,7 +465,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -526,7 +515,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -571,7 +559,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/param.adoc b/test-files/golden-tests/param.adoc
index 54620a17c..9c06d4ea1 100644
--- a/test-files/golden-tests/param.adoc
+++ b/test-files/golden-tests/param.adoc
@@ -6,17 +6,22 @@
 == Global namespace
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f[`f`]  ¦
-
-¦xref:#g[`g`]  ¦
-
-¦xref:#h[`h`]  ¦
-
-¦xref:#i[`i`]  ¦
+| Name | Description 
 
+| xref:#f[`f`] 
+| 
+    
+| xref:#g[`g`] 
+| 
+    
+| xref:#h[`h`] 
+| 
+    
+| xref:#i[`i`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/param.html b/test-files/golden-tests/param.html
index b0ff841d6..e18cf1d37 100644
--- a/test-files/golden-tests/param.html
+++ b/test-files/golden-tests/param.html
@@ -9,52 +9,49 @@
         
Global namespace

     
     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
+
 
-                                        
-                            
-                                
-                                
-                            
-                

                 

-                                    f 
-                                
-
-                                        
                

-                                    g 
-                                
-
-                                        
                

-                                    h 
-                                
+                    NameDescription
                

-                                    i 
-                                
 
-                                        
        

-            

-            

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+                    
+                        g 
+                    
+                        
+                            
+                    
+                
+                    
+                        h 
+                    
+                        
+                            
+                    
+                
+                    
+                        i 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -71,7 +68,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -116,7 +112,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -167,7 +162,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -223,7 +217,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/pre-post.adoc b/test-files/golden-tests/pre-post.adoc
index b99629925..3312923f9 100644
--- a/test-files/golden-tests/pre-post.adoc
+++ b/test-files/golden-tests/pre-post.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f[`f`]  ¦
+| Name | Description 
 
+| xref:#f[`f`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/pre-post.html b/test-files/golden-tests/pre-post.html
index a3a78e14a..28e29d0d8 100644
--- a/test-files/golden-tests/pre-post.html
+++ b/test-files/golden-tests/pre-post.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-            

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
diff --git a/test-files/golden-tests/record-1.adoc b/test-files/golden-tests/record-1.adoc
index 8dfecc924..44ac490ed 100644
--- a/test-files/golden-tests/record-1.adoc
+++ b/test-files/golden-tests/record-1.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T[`T`]  ¦
+| Name | Description 
 
+| xref:#T[`T`] 
+| 
+    
 |===
 
 
@@ -30,41 +32,52 @@ struct T;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T-U1[`U1`]  ¦
-
-¦xref:#T-U2[`U2`]  ¦
+| Name | Description 
 
+| xref:#T-U1[`U1`] 
+| 
+    
+| xref:#T-U2[`U2`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T-f1[`f1`]  ¦
-
-¦xref:#T-f2[`f2`]  ¦
-
-¦xref:#T-f3[`f3`]  ¦
+| Name | Description 
 
+| xref:#T-f1[`f1`] 
+| 
+    
+| xref:#T-f2[`f2`] 
+| 
+    
+| xref:#T-f3[`f3`] 
+| 
+    
 |===
 === Protected Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T-g1[`g1`]  ¦
+| Name | Description 
 
+| xref:#T-g1[`g1`] 
+| 
 brief-g1
 
-¦xref:#T-g2[`g2`]  ¦
-
+    
+| xref:#T-g2[`g2`] 
+| 
 brief-g2
 
-¦xref:#T-g3[`g3`]  ¦
-
+    
+| xref:#T-g3[`g3`] 
+| 
 brief-g3
 
+    
 |===
 
 
@@ -72,7 +85,7 @@ brief-g3
 
 
 [#T-U1]
-== xref:#T[pass:[T]]::U1
+== xref:#T[T]::U1
 
 
 
@@ -89,7 +102,7 @@ using U1 = int;
 
 
 [#T-U2]
-== xref:#T[pass:[T]]::U2
+== xref:#T[T]::U2
 
 
 
@@ -106,7 +119,7 @@ typedef char U2;
 
 
 [#T-f1]
-== xref:#T[pass:[T]]::f1
+== xref:#T[T]::f1
 
 
 
@@ -130,7 +143,7 @@ f1();
 
 
 [#T-f2]
-== xref:#T[pass:[T]]::f2
+== xref:#T[T]::f2
 
 
 
@@ -154,7 +167,7 @@ f2();
 
 
 [#T-f3]
-== xref:#T[pass:[T]]::f3
+== xref:#T[T]::f3
 
 
 
@@ -178,7 +191,7 @@ f3();
 
 
 [#T-g1]
-== xref:#T[pass:[T]]::g1
+== xref:#T[T]::g1
 
 
 brief-g1
@@ -210,7 +223,7 @@ desc
 
 
 [#T-g2]
-== xref:#T[pass:[T]]::g2
+== xref:#T[T]::g2
 
 
 brief-g2
@@ -242,7 +255,7 @@ the number 2
 
 
 [#T-g3]
-== xref:#T[pass:[T]]::g3
+== xref:#T[T]::g3
 
 
 brief-g3
diff --git a/test-files/golden-tests/record-1.html b/test-files/golden-tests/record-1.html
index 542a19458..edc3f444d 100644
--- a/test-files/golden-tests/record-1.html
+++ b/test-files/golden-tests/record-1.html
@@ -9,31 +9,28 @@
         
Global namespace

     

     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                T 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        T 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -59,120 +55,111 @@ 
Synopsis

     

 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                U1 
-                            
-
-                                    
                

-                                U2 
-                            
-
-                                    
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                




NameDescription
NameDescription

                 

-                                    f1 
-                                
-
-                                        
                

-                                    f2 
-                                
-
-                                        
                

-                                    f3 
-                                
-
-                                        
        

-            

-                                    

-                
Protected Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+                
+                    
+                
+            
+        




NameDescription

+                        U1 
+                    
+                        
+                            
+                    

+                        U2 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
-                                
-                                
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+                    
+                
+            
+        

                 

-                                    g1 
-                                
-
brief-g1

+                    		NameDescription

+                        f1 
+                    
+                        
+                            
+                    

+                        f2 
+                    
+                        
                             
+                    

+                        f3 
+                    
+                        
+                            
+                    

+        
Protected Member Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
-                            
-                                
-                                
+                
+                    
-                            
-                                
-                                
+                
+                    
-                            
-                
NameDescription

+                        g1 
+                    
+                        
brief-g1

+                        
 
-                                        
                

-                                    g2 
-                                
-
brief-g2

                             
+                    

+                        g2 
+                    
+                        
brief-g2

+                        
 
-                                        
                

-                                    g3 
-                                
-
brief-g3

                             
+                    

+                        g3 
+                    
+                        
brief-g3

+                        
 
-                                        
        

+                            
+                    
+                
+            
+        
             

-                                                                

 
 
 
@@ -191,7 +178,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -215,7 +201,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -239,7 +224,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -267,7 +251,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -295,7 +278,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -325,7 +307,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -361,7 +342,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -391,7 +371,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/record-access.adoc b/test-files/golden-tests/record-access.adoc
index eb4a7c108..19902783b 100644
--- a/test-files/golden-tests/record-access.adoc
+++ b/test-files/golden-tests/record-access.adoc
@@ -6,15 +6,19 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C0[`C0`]  ¦
-
-¦xref:#S0[`S0`]  ¦
-
-¦xref:#U0[`U0`]  ¦
-
+| Name | Description 
+
+| xref:#C0[`C0`] 
+| 
+    
+| xref:#S0[`S0`] 
+| 
+    
+| xref:#U0[`U0`] 
+| 
+    
 |===
 
 
@@ -34,25 +38,31 @@ struct S0;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-f0[`f0`]  ¦
+| Name | Description 
 
+| xref:#S0-f0[`f0`] 
+| 
+    
 |===
 === Protected Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-f1[`f1`]  ¦
+| Name | Description 
 
+| xref:#S0-f1[`f1`] 
+| 
+    
 |===
 === Private Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S0-f2[`f2`]  ¦
+| Name | Description 
 
+| xref:#S0-f2[`f2`] 
+| 
+    
 |===
 
 
@@ -60,7 +70,7 @@ struct S0;
 
 
 [#S0-f0]
-== xref:#S0[pass:[S0]]::f0
+== xref:#S0[S0]::f0
 
 
 
@@ -84,7 +94,7 @@ f0();
 
 
 [#S0-f1]
-== xref:#S0[pass:[S0]]::f1
+== xref:#S0[S0]::f1
 
 
 
@@ -108,7 +118,7 @@ f1();
 
 
 [#S0-f2]
-== xref:#S0[pass:[S0]]::f2
+== xref:#S0[S0]::f2
 
 
 
@@ -146,25 +156,31 @@ class C0;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C0-f2[`f2`]  ¦
+| Name | Description 
 
+| xref:#C0-f2[`f2`] 
+| 
+    
 |===
 === Protected Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C0-f1[`f1`]  ¦
+| Name | Description 
 
+| xref:#C0-f1[`f1`] 
+| 
+    
 |===
 === Private Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C0-f0[`f0`]  ¦
+| Name | Description 
 
+| xref:#C0-f0[`f0`] 
+| 
+    
 |===
 
 
@@ -172,7 +188,7 @@ class C0;
 
 
 [#C0-f0]
-== xref:#C0[pass:[C0]]::f0
+== xref:#C0[C0]::f0
 
 
 
@@ -196,7 +212,7 @@ f0();
 
 
 [#C0-f1]
-== xref:#C0[pass:[C0]]::f1
+== xref:#C0[C0]::f1
 
 
 
@@ -220,7 +236,7 @@ f1();
 
 
 [#C0-f2]
-== xref:#C0[pass:[C0]]::f2
+== xref:#C0[C0]::f2
 
 
 
@@ -258,25 +274,31 @@ union U0;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#U0-f0[`f0`]  ¦
+| Name | Description 
 
+| xref:#U0-f0[`f0`] 
+| 
+    
 |===
 === Protected Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#U0-f1[`f1`]  ¦
+| Name | Description 
 
+| xref:#U0-f1[`f1`] 
+| 
+    
 |===
 === Private Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#U0-f2[`f2`]  ¦
+| Name | Description 
 
+| xref:#U0-f2[`f2`] 
+| 
+    
 |===
 
 
@@ -284,7 +306,7 @@ union U0;
 
 
 [#U0-f0]
-== xref:#U0[pass:[U0]]::f0
+== xref:#U0[U0]::f0
 
 
 
@@ -308,7 +330,7 @@ f0();
 
 
 [#U0-f1]
-== xref:#U0[pass:[U0]]::f1
+== xref:#U0[U0]::f1
 
 
 
@@ -332,7 +354,7 @@ f1();
 
 
 [#U0-f2]
-== xref:#U0[pass:[U0]]::f2
+== xref:#U0[U0]::f2
 
 
 
diff --git a/test-files/golden-tests/record-access.html b/test-files/golden-tests/record-access.html
index 24ddbd1c8..08262f615 100644
--- a/test-files/golden-tests/record-access.html
+++ b/test-files/golden-tests/record-access.html
@@ -9,45 +9,42 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                C0 
-                            
-
-                                    
                

-                                S0 
-                            
-
-                                    
                

-                                U0 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        C0 
+                    
+                        
+                            
+                    
+                
+                    
+                        S0 
+                    
+                        
+                            
+                    
+                
+                    
+                        U0 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -64,7 +61,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -73,79 +69,70 @@ 
Synopsis

     

 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
-                            
-                

                 

-                                    f0 
-                                
-
-                                        
        

-            

-                                    

-                
Protected Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                




NameDescription
NameDescription

                 

-                                    f1 
-                                
-
-                                        
        

-            

-                                    

-                
Private Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+                
+            
+        




NameDescription

+                        f0 
+                    
+                        
+                            
+                    

+        
Protected Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f2 
-                                
+                    NameDescription
        

-            

-                            

+
+                
+            
+
+                
+                    
+                        f1 
+                    
+                        
+                            
+                    
+                
+            
+        
+        
Private Member Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f2 
+                    
+                        
+                            
+                    

+    
 
 
 
@@ -164,7 +151,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -192,7 +178,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -220,7 +205,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -248,7 +232,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -257,79 +240,70 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
-                            
-                

                 

-                                    f2 
-                                
-
-                                        
        

-            

-                                    

-                
Protected Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                




NameDescription
NameDescription

                 

-                                    f1 
-                                
-
-                                        
        

-            

-                                    

-                
Private Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+                
+            
+        




NameDescription

+                        f2 
+                    
+                        
+                            
+                    

+        
Protected Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f0 
-                                
+                    NameDescription
        

-            

-                            

+
+                
+            
+
+                
+                    
+                        f1 
+                    
+                        
+                            
+                    
+                
+            
+        
+        
Private Member Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        f0 
+                    
+                        
+                            
+                    

+    
 
 
 
@@ -348,7 +322,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -376,7 +349,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -404,7 +376,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -432,7 +403,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -441,79 +411,70 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    f0 
-                                
-
-                                        
        

-            

-                                    

-                
Protected Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+                
+            
+        




NameDescription

+                        f0 
+                    
+                        
+                            
+                    

+        
Protected Member Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    f1 
-                                
-
-                                        
        

-            

-                                    

-                
Private Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+                
+            
+        




NameDescription

+                        f1 
+                    
+                        
+                            
+                    

+        
Private Member Functions

+
+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f2 
-                                
+                    NameDescription
        

-            

-                            

+                
+            
+
+                
+                    
+                        f2 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 
 
@@ -532,7 +493,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -560,7 +520,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -588,7 +547,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/record-data.adoc b/test-files/golden-tests/record-data.adoc
index 50f8672af..7ed06d06d 100644
--- a/test-files/golden-tests/record-data.adoc
+++ b/test-files/golden-tests/record-data.adoc
@@ -6,19 +6,25 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T[`T`]  ¦
-
-¦xref:#U[`U`]  ¦
-
-¦xref:#V[`V`]  ¦
-
-¦xref:#W[`W`]  ¦
-
-¦xref:#X[`X`]  ¦
-
+| Name | Description 
+
+| xref:#T[`T`] 
+| 
+    
+| xref:#U[`U`] 
+| 
+    
+| xref:#V[`V`] 
+| 
+    
+| xref:#W[`W`] 
+| 
+    
+| xref:#X[`X`] 
+| 
+    
 |===
 
 
@@ -38,19 +44,25 @@ struct T;
 ----
 
 ===  Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T-i[`i`]  ¦
-
-¦xref:#T-j[`j`]  ¦
-
-¦xref:#T-k[`k`]  ¦
-
-¦xref:#T-l[`l`]  ¦
-
-¦xref:#T-m[`m`]  ¦
-
+| Name | Description 
+
+| xref:#T-i[`i`] 
+| 
+    
+| xref:#T-j[`j`] 
+| 
+    
+| xref:#T-k[`k`] 
+| 
+    
+| xref:#T-l[`l`] 
+| 
+    
+| xref:#T-m[`m`] 
+| 
+    
 |===
 
 
@@ -58,7 +70,7 @@ struct T;
 
 
 [#T-i]
-== xref:#T[pass:[T]]::i
+== xref:#T[T]::i
 
 
 
@@ -75,7 +87,7 @@ int i;
 
 
 [#T-j]
-== xref:#T[pass:[T]]::j
+== xref:#T[T]::j
 
 
 
@@ -92,7 +104,7 @@ double j;
 
 
 [#T-k]
-== xref:#T[pass:[T]]::k
+== xref:#T[T]::k
 
 
 
@@ -110,7 +122,7 @@ int k;
 
 
 [#T-l]
-== xref:#T[pass:[T]]::l
+== xref:#T[T]::l
 
 
 
@@ -127,7 +139,7 @@ int l : 8;
 
 
 [#T-m]
-== xref:#T[pass:[T]]::m
+== xref:#T[T]::m
 
 
 
@@ -158,11 +170,13 @@ struct U;
 ----
 
 ===  Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#U-t[`t`]  ¦
+| Name | Description 
 
+| xref:#U-t[`t`] 
+| 
+    
 |===
 
 
@@ -170,7 +184,7 @@ struct U;
 
 
 [#U-t]
-== xref:#U[pass:[U]]::t
+== xref:#U[U]::t
 
 
 
@@ -201,20 +215,25 @@ class V;
 ----
 
 === Protected Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#V-j[`j`]  ¦
+| Name | Description 
 
+| xref:#V-j[`j`] 
+| 
+    
 |===
 === Private Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#V-i[`i`]  ¦
-
-¦xref:#V-k[`k`]  ¦
-
+| Name | Description 
+
+| xref:#V-i[`i`] 
+| 
+    
+| xref:#V-k[`k`] 
+| 
+    
 |===
 
 
@@ -222,7 +241,7 @@ class V;
 
 
 [#V-i]
-== xref:#V[pass:[V]]::i
+== xref:#V[V]::i
 
 
 
@@ -239,7 +258,7 @@ int i;
 
 
 [#V-j]
-== xref:#V[pass:[V]]::j
+== xref:#V[V]::j
 
 
 
@@ -256,7 +275,7 @@ unsigned long j;
 
 
 [#V-k]
-== xref:#V[pass:[V]]::k
+== xref:#V[V]::k
 
 
 
@@ -287,11 +306,13 @@ struct W;
 ----
 
 ===  Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#W-buf[`buf`]  ¦
+| Name | Description 
 
+| xref:#W-buf[`buf`] 
+| 
+    
 |===
 
 
@@ -299,7 +320,7 @@ struct W;
 
 
 [#W-buf]
-== xref:#W[pass:[W]]::buf
+== xref:#W[W]::buf
 
 
 
@@ -333,26 +354,34 @@ struct X;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#X-Q[`Q`]  ¦
+| Name | Description 
 
+| xref:#X-Q[`Q`] 
+| 
+    
 |===
 ===  Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#X-x0[`x0`]  ¦
-
-¦xref:#X-x1[`x1`]  ¦
-
-¦xref:#X-x2[`x2`]  ¦
-
-¦xref:#X-x3[`x3`]  ¦
-
-¦xref:#X-x4[`x4`]  ¦
-
+| Name | Description 
+
+| xref:#X-x0[`x0`] 
+| 
+    
+| xref:#X-x1[`x1`] 
+| 
+    
+| xref:#X-x2[`x2`] 
+| 
+    
+| xref:#X-x3[`x3`] 
+| 
+    
+| xref:#X-x4[`x4`] 
+| 
+    
 |===
 
 
@@ -360,7 +389,7 @@ struct X;
 
 
 [#X-Q]
-== xref:#X[pass:[X]]::Q
+== xref:#X[X]::Q
 
 
 
@@ -377,7 +406,7 @@ using Q = P;
 
 
 [#X-x0]
-== xref:#X[pass:[X]]::x0
+== xref:#X[X]::x0
 
 
 
@@ -394,7 +423,7 @@ int x0 = 0;
 
 
 [#X-x1]
-== xref:#X[pass:[X]]::x1
+== xref:#X[X]::x1
 
 
 
@@ -411,7 +440,7 @@ P x1;
 
 
 [#X-x2]
-== xref:#X[pass:[X]]::x2
+== xref:#X[X]::x2
 
 
 
@@ -428,7 +457,7 @@ P const x2[32];
 
 
 [#X-x3]
-== xref:#X[pass:[X]]::x3
+== xref:#X[X]::x3
 
 
 
@@ -445,7 +474,7 @@ xref:#X-Q[Q] x3;
 
 
 [#X-x4]
-== xref:#X[pass:[X]]::x4
+== xref:#X[X]::x4
 
 
 
diff --git a/test-files/golden-tests/record-data.html b/test-files/golden-tests/record-data.html
index 5a09e5bd1..ea4d1c7cf 100644
--- a/test-files/golden-tests/record-data.html
+++ b/test-files/golden-tests/record-data.html
@@ -9,59 +9,56 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                T 
-                            
-
-                                    
                

-                                U 
-                            
-
-                                    
                

-                                V 
-                            
-
-                                    
                

-                                W 
-                            
-
-                                    
                

-                                X 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        T 
+                    
+                        
+                            
+                    
+                
+                    
+                        U 
+                    
+                        
+                            
+                    
+                
+                    
+                        V 
+                    
+                        
+                            
+                    
+                
+                    
+                        W 
+                    
+                        
+                            
+                    
+                
+                    
+                        X 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -78,7 +75,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -87,59 +83,56 @@ 
Synopsis

     

 
     

-                    

-                
 Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Data Members

+




NameDescription

+            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                

                 

-                                    i 
-                                
-
-                                        
                

-                                    j 
-                                
-
-                                        
                

-                                    k 
-                                
-
-                                        
                

-                                    l 
-                                
-
-                                        
                

-                                    m 
-                                
-
-                                        
        

-            

-                                                                                            

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        i 
+                    
+                        
+                            
+                    
+                
+                    
+                        j 
+                    
+                        
+                            
+                    
+                
+                    
+                        k 
+                    
+                        
+                            
+                    
+                
+                    
+                        l 
+                    
+                        
+                            
+                    
+                
+                    
+                        m 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -158,7 +151,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -182,7 +174,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -206,7 +197,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -231,7 +221,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -255,7 +244,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -279,7 +267,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -288,31 +275,28 @@ 
Synopsis

     
 
     

-                    

-                
 Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Data Members

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    t 
-                                
+                    NameDescription
        

-            

-                                                                                            

+                
+            
+
+                
+                    
+                        t 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -331,7 +315,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -355,7 +338,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -364,62 +346,56 @@ 
Synopsis

     
 
     

-                                                        

-                
Protected Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                
Protected Data Members

+




NameDescription

+            
-                                
-                                
-                            
-                

                 

-                                    j 
-                                
-
-                                        
        

-            

-                                    

-                
Private Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                                
-                                
-                            
-                




NameDescription
NameDescription

                 

-                                    i 
-                                
-
-                                        
                

-                                    k 
-                                
-
-                                        
        

-            

-                    

+                    
+                        j 
+                    
+                        
+                            
+                    
+                
+            
+        
+        
Private Data Members

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+            
+        
NameDescription

+                        i 
+                    
+                        
+                            
+                    

+                        k 
+                    
+                        
+                            
+                    

+    
 
 
 
@@ -438,7 +414,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -462,7 +437,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -486,7 +460,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -510,7 +483,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -519,31 +491,28 @@ 
Synopsis

     
 
     

-                    

-                
 Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Data Members

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    buf 
-                                
+                    NameDescription
        

-            

-                                                                                            

+
+                
+            
+
+                
+                    
+                        buf 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -562,7 +531,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -586,7 +554,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -598,83 +565,77 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                Q 
-                            
-
-                                    
        

-        

-            

-                
 Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        




NameDescription
NameDescription

+                        Q 
+                    
+                        
+                            
+                    

+
 Data Members

+
+            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                

                 

-                                    x0 
-                                
-
-                                        
                

-                                    x1 
-                                
-
-                                        
                

-                                    x2 
-                                
-
-                                        
                

-                                    x3 
-                                
-
-                                        
                

-                                    x4 
-                                
-
-                                        
        

-            

-                                                                                            

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        x0 
+                    
+                        
+                            
+                    
+                
+                    
+                        x1 
+                    
+                        
+                            
+                    
+                
+                    
+                        x2 
+                    
+                        
+                            
+                    
+                
+                    
+                        x3 
+                    
+                        
+                            
+                    
+                
+                    
+                        x4 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -693,7 +654,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -717,7 +677,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -741,7 +700,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -765,7 +723,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -789,7 +746,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -813,7 +769,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/record-inheritance.adoc b/test-files/golden-tests/record-inheritance.adoc
index 78639c2c2..3c59ed008 100644
--- a/test-files/golden-tests/record-inheritance.adoc
+++ b/test-files/golden-tests/record-inheritance.adoc
@@ -6,41 +6,58 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C0[`C0`]  ¦
-
-¦xref:#C1[`C1`]  ¦
-
-¦xref:#C2[`C2`]  ¦
-
-¦xref:#C3[`C3`]  ¦
-
-¦xref:#C4[`C4`]  ¦
-
-¦xref:#C5[`C5`]  ¦
-
-¦xref:#C6[`C6`]  ¦
-
-¦xref:#C7[`C7`]  ¦
-
-¦xref:#S0[`S0`]  ¦
-
-¦xref:#S1[`S1`]  ¦
-
-¦xref:#S2[`S2`]  ¦
-
-¦xref:#S3[`S3`]  ¦
-
-¦xref:#S4[`S4`]  ¦
-
-¦xref:#S5[`S5`]  ¦
-
-¦xref:#S6[`S6`]  ¦
-
-¦xref:#U0[`U0`]  ¦
-
+| Name | Description 
+
+| xref:#C0[`C0`] 
+| 
+    
+| xref:#C1[`C1`] 
+| 
+    
+| xref:#C2[`C2`] 
+| 
+    
+| xref:#C3[`C3`] 
+| 
+    
+| xref:#C4[`C4`] 
+| 
+    
+| xref:#C5[`C5`] 
+| 
+    
+| xref:#C6[`C6`] 
+| 
+    
+| xref:#C7[`C7`] 
+| 
+    
+| xref:#S0[`S0`] 
+| 
+    
+| xref:#S1[`S1`] 
+| 
+    
+| xref:#S2[`S2`] 
+| 
+    
+| xref:#S3[`S3`] 
+| 
+    
+| xref:#S4[`S4`] 
+| 
+    
+| xref:#S5[`S5`] 
+| 
+    
+| xref:#S6[`S6`] 
+| 
+    
+| xref:#U0[`U0`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/record-inheritance.html b/test-files/golden-tests/record-inheritance.html
index 7e8f81489..00f010241 100644
--- a/test-files/golden-tests/record-inheritance.html
+++ b/test-files/golden-tests/record-inheritance.html
@@ -9,136 +9,133 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                C0 
-                            
-
-                                    
                

-                                C1 
-                            
-
-                                    
                

-                                C2 
-                            
-
-                                    
                

-                                C3 
-                            
-
-                                    
                

-                                C4 
-                            
-
-                                    
                

-                                C5 
-                            
-
-                                    
                

-                                C6 
-                            
-
-                                    
                

-                                C7 
-                            
-
-                                    
                

-                                S0 
-                            
-
-                                    
                

-                                S1 
-                            
-
-                                    
                

-                                S2 
-                            
-
-                                    
                

-                                S3 
-                            
-
-                                    
                

-                                S4 
-                            
-
-                                    
                

-                                S5 
-                            
-
-                                    
                

-                                S6 
-                            
-
-                                    
                

-                                U0 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        C0 
+                    
+                        
+                            
+                    
+                
+                    
+                        C1 
+                    
+                        
+                            
+                    
+                
+                    
+                        C2 
+                    
+                        
+                            
+                    
+                
+                    
+                        C3 
+                    
+                        
+                            
+                    
+                
+                    
+                        C4 
+                    
+                        
+                            
+                    
+                
+                    
+                        C5 
+                    
+                        
+                            
+                    
+                
+                    
+                        C6 
+                    
+                        
+                            
+                    
+                
+                    
+                        C7 
+                    
+                        
+                            
+                    
+                
+                    
+                        S0 
+                    
+                        
+                            
+                    
+                
+                    
+                        S1 
+                    
+                        
+                            
+                    
+                
+                    
+                        S2 
+                    
+                        
+                            
+                    
+                
+                    
+                        S3 
+                    
+                        
+                            
+                    
+                
+                    
+                        S4 
+                    
+                        
+                            
+                    
+                
+                    
+                        S5 
+                    
+                        
+                            
+                    
+                
+                    
+                        S6 
+                    
+                        
+                            
+                    
+                
+                    
+                        U0 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -155,7 +152,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -164,7 +160,7 @@ 
Synopsis

     

 
     

-                                                                                                                

+                            
 
 
 
@@ -183,7 +179,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -192,7 +187,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -211,7 +206,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -220,7 +214,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -239,7 +233,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -248,7 +241,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -267,7 +260,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -277,7 +269,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -296,7 +288,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -306,7 +297,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -325,7 +316,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -336,7 +326,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -355,7 +345,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -365,7 +354,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -384,7 +373,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -394,7 +382,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -413,7 +401,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -423,7 +410,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -442,7 +429,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -452,7 +438,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -471,7 +457,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -481,7 +466,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -500,7 +485,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -510,7 +494,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -529,7 +513,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -540,7 +523,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -559,7 +542,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -570,7 +552,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -589,7 +571,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -600,7 +581,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
diff --git a/test-files/golden-tests/ref.adoc b/test-files/golden-tests/ref.adoc
index 1010570ab..1b329d731 100644
--- a/test-files/golden-tests/ref.adoc
+++ b/test-files/golden-tests/ref.adoc
@@ -6,35 +6,43 @@
 == Global namespace
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
+| Name | Description 
 
+| xref:#A[`A`] 
+| 
+    
 |===
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#F[`F`]  ¦
+| Name | Description 
 
+| xref:#F[`F`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f0[`f0`]  ¦
-
-¦xref:#f5[`f5`]  ¦
+| Name | Description 
 
+| xref:#f0[`f0`] 
+| 
+    
+| xref:#f5[`f5`] 
+| 
 See
 xref:#A-f1[A::f1]
 
-¦xref:#f6[`f6`]  ¦
-
+    
+| xref:#f6[`f6`] 
+| 
 See
 xref:#F-operator_bitnot[F::operator~]
 
+    
 |===
 
 
@@ -67,34 +75,40 @@ f0();
 == A
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-B[`B`]  ¦
+| Name | Description 
 
+| xref:#A-B[`B`] 
+| 
 See
 xref:#A-f1[f1]
 
-¦xref:#A-C[`C`]  ¦
-
-¦xref:#A-D[`D`]  ¦
-
+    
+| xref:#A-C[`C`] 
+| 
+    
+| xref:#A-D[`D`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-f1[`f1`]  ¦
+| Name | Description 
 
+| xref:#A-f1[`f1`] 
+| 
 See
 xref:#f0[f0]
 
+    
 |===
 
 
 
 [#A-f1]
-== xref:#A[pass:[A]]::f1
+== xref:#A[A]::f1
 
 
 See
@@ -128,7 +142,7 @@ xref:#f0[::f0]
 
 
 [#A-B]
-== xref:#A[pass:[A]]::B
+== xref:#A[A]::B
 
 
 See
@@ -146,11 +160,13 @@ struct B;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-B-f2[`f2`]  ¦
+| Name | Description 
 
+| xref:#A-B-f2[`f2`] 
+| 
+    
 |===
 
 === Description
@@ -168,7 +184,7 @@ xref:#A-f1[::A::f1]
 
 
 [#A-B-f2]
-== xref:#A[pass:[A]]::xref:#A-B[pass:[B]]::f2
+== xref:#A[A]::xref:#A-B[B]::f2
 
 
 
@@ -192,7 +208,7 @@ f2();
 
 
 [#A-C]
-== xref:#A[pass:[A]]::C
+== xref:#A[A]::C
 
 
 
@@ -206,13 +222,16 @@ struct C;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-C-f3[`f3`]  ¦
-
-¦xref:#A-C-f4[`f4`]  ¦
-
+| Name | Description 
+
+| xref:#A-C-f3[`f3`] 
+| 
+    
+| xref:#A-C-f4[`f4`] 
+| 
+    
 |===
 
 
@@ -220,7 +239,7 @@ struct C;
 
 
 [#A-C-f3]
-== xref:#A[pass:[A]]::xref:#A-C[pass:[C]]::f3
+== xref:#A[A]::xref:#A-C[C]::f3
 
 
 
@@ -244,7 +263,7 @@ f3();
 
 
 [#A-C-f4]
-== xref:#A[pass:[A]]::xref:#A-C[pass:[C]]::f4
+== xref:#A[A]::xref:#A-C[C]::f4
 
 
 
@@ -268,7 +287,7 @@ f4();
 
 
 [#A-D]
-== xref:#A[pass:[A]]::D
+== xref:#A[A]::D
 
 
 
@@ -283,22 +302,27 @@ struct D
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-D-E[`E`]  ¦
+| Name | Description 
 
+| xref:#A-D-E[`E`] 
+| 
 See
 xref:#A-C-f3[f3]
 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-C-f3[`f3`]  ¦
+| Name | Description 
 
-¦xref:A-C-f4[`f4`]  ¦
+| xref:#A-C-f3[`f3`] 
+| 
+    
+| xref:A-C-f4[`f4`] 
+| 
 |===
 
 
@@ -306,7 +330,7 @@ xref:#A-C-f3[f3]
 
 
 [#A-D-f4]
-== xref:#A[pass:[A]]::xref:#A-D[pass:[D]]::f4
+== xref:#A[A]::xref:#A-D[D]::f4
 
 
 
@@ -330,7 +354,7 @@ f4();
 
 
 [#A-D-E]
-== xref:#A[pass:[A]]::xref:#A-D[pass:[D]]::E
+== xref:#A[A]::xref:#A-D[D]::E
 
 
 See
@@ -410,87 +434,127 @@ struct F;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#F-operator_not[`operator!`]  ¦
-
-¦xref:#F-operator_not_eq[`operator!=`]  ¦
-
-¦xref:#F-operator_mod[`operator%`]  ¦
-
-¦xref:#F-operator_mod_eq[`operator%=`]  ¦
-
-¦xref:#F-operator_bitand[`operator&`]  ¦
-
-¦xref:#F-operator_and[`operator&&`]  ¦
-
-¦xref:#F-operator_and_eq[`operator&=`]  ¦
-
-¦xref:#F-operator_call[`operator()`]  ¦
-
-¦xref:#F-operator_star[`operator*`]  ¦
-
-¦xref:#F-operator_star_eq[`operator*=`]  ¦
-
-¦xref:#F-operator_plus[`operator+`]  ¦
-
-¦xref:#F-operator_inc[`operator++`]  ¦
-
-¦xref:#F-operator_plus_eq[`operator+=`]  ¦
-
-¦xref:#F-operator_comma[`operator,`]  ¦
-
-¦xref:#F-operator_minus[`operator-`]  ¦
-
-¦xref:#F-operator_dec[`operator--`]  ¦
-
-¦xref:#F-operator_minus_eq[`operator-=`]  ¦
-
-¦xref:#F-operator_ptr[`operator->`]  ¦
-
-¦xref:#F-operator_ptrmem[`operator->*`]  ¦
-
-¦xref:#F-operator_slash[`operator/`]  ¦
-
-¦xref:#F-operator_slash_eq[`operator/=`]  ¦
-
-¦xref:#F-operator_lt[`operator<`]  ¦
-
-¦xref:#F-operator_lshift[`operator<<`]  ¦
-
-¦xref:#F-operator_lshift_eq[`operator<<=`]  ¦
-
-¦xref:#F-operator_le[`operator<=`]  ¦
-
-¦xref:#F-operator_3way[`operator<=>`]  ¦
-
-¦xref:#F-operator_assign[`operator=`]  ¦
-
-¦xref:#F-operator_eq[`operator==`]  ¦
-
-¦xref:#F-operator_gt[`operator>`]  ¦
-
-¦xref:#F-operator_ge[`operator>=`]  ¦
-
-¦xref:#F-operator_rshift[`operator>>`]  ¦
-
-¦xref:#F-operator_rshift_eq[`operator>>=`]  ¦
-
-¦xref:#F-operator_subs[`operator[]`]  ¦
-
-¦xref:#F-operator_xor[`operator^`]  ¦
-
-¦xref:#F-operator_xor_eq[`operator^=`]  ¦
-
-¦xref:#F-operator_bitor[`operator|`]  ¦
-
-¦xref:#F-operator_or_eq[`operator|=`]  ¦
-
-¦xref:#F-operator_or[`operator||`]  ¦
-
-¦xref:#F-operator_bitnot[`operator~`]  ¦
-
+| Name | Description 
+
+| xref:#F-operator_not[`operator!`] 
+| 
+    
+| xref:#F-operator_not_eq[`operator!=`] 
+| 
+    
+| xref:#F-operator_mod[`operator%`] 
+| 
+    
+| xref:#F-operator_mod_eq[`operator%=`] 
+| 
+    
+| xref:#F-operator_bitand[`operator&`] 
+| 
+    
+| xref:#F-operator_and[`operator&&`] 
+| 
+    
+| xref:#F-operator_and_eq[`operator&=`] 
+| 
+    
+| xref:#F-operator_call[`operator()`] 
+| 
+    
+| xref:#F-operator_star[`operator*`] 
+| 
+    
+| xref:#F-operator_star_eq[`operator*=`] 
+| 
+    
+| xref:#F-operator_plus[`operator+`] 
+| 
+    
+| xref:#F-operator_inc[`operator++`] 
+| 
+    
+| xref:#F-operator_plus_eq[`operator+=`] 
+| 
+    
+| xref:#F-operator_comma[`operator,`] 
+| 
+    
+| xref:#F-operator_minus[`operator-`] 
+| 
+    
+| xref:#F-operator_dec[`operator--`] 
+| 
+    
+| xref:#F-operator_minus_eq[`operator-=`] 
+| 
+    
+| xref:#F-operator_ptr[`operator->`] 
+| 
+    
+| xref:#F-operator_ptrmem[`operator->*`] 
+| 
+    
+| xref:#F-operator_slash[`operator/`] 
+| 
+    
+| xref:#F-operator_slash_eq[`operator/=`] 
+| 
+    
+| xref:#F-operator_lt[`operator<`] 
+| 
+    
+| xref:#F-operator_lshift[`operator<<`] 
+| 
+    
+| xref:#F-operator_lshift_eq[`operator<<=`] 
+| 
+    
+| xref:#F-operator_le[`operator<=`] 
+| 
+    
+| xref:#F-operator_3way[`operator<=>`] 
+| 
+    
+| xref:#F-operator_assign[`operator=`] 
+| 
+    
+| xref:#F-operator_eq[`operator==`] 
+| 
+    
+| xref:#F-operator_gt[`operator>`] 
+| 
+    
+| xref:#F-operator_ge[`operator>=`] 
+| 
+    
+| xref:#F-operator_rshift[`operator>>`] 
+| 
+    
+| xref:#F-operator_rshift_eq[`operator>>=`] 
+| 
+    
+| xref:#F-operator_subs[`operator[]`] 
+| 
+    
+| xref:#F-operator_xor[`operator^`] 
+| 
+    
+| xref:#F-operator_xor_eq[`operator^=`] 
+| 
+    
+| xref:#F-operator_bitor[`operator|`] 
+| 
+    
+| xref:#F-operator_or_eq[`operator|=`] 
+| 
+    
+| xref:#F-operator_or[`operator||`] 
+| 
+    
+| xref:#F-operator_bitnot[`operator~`] 
+| 
+    
 |===
 
 
@@ -498,7 +562,7 @@ struct F;
 
 
 [#F-operator_bitnot]
-== xref:#F[pass:[F]]::operator~
+== xref:#F[F]::operator~
 
 
 
@@ -522,7 +586,7 @@ operator~();
 
 
 [#F-operator_comma]
-== xref:#F[pass:[F]]::operator,
+== xref:#F[F]::operator,
 
 
 
@@ -546,7 +610,7 @@ operator,(xref:#F[F]&);
 
 
 [#F-operator_call]
-== xref:#F[pass:[F]]::operator()
+== xref:#F[F]::operator()
 
 
 
@@ -570,7 +634,7 @@ operator()(xref:#F[F]&);
 
 
 [#F-operator_subs]
-== xref:#F[pass:[F]]::operator[]
+== xref:#F[F]::operator[]
 
 
 
@@ -594,7 +658,7 @@ operator[](xref:#F[F]&);
 
 
 [#F-operator_plus]
-== xref:#F[pass:[F]]::operator+
+== xref:#F[F]::operator+
 
 
 
@@ -618,7 +682,7 @@ operator+(xref:#F[F]&);
 
 
 [#F-operator_inc]
-== xref:#F[pass:[F]]::operator++
+== xref:#F[F]::operator++
 
 
 
@@ -642,7 +706,7 @@ operator++();
 
 
 [#F-operator_plus_eq]
-== xref:#F[pass:[F]]::operator+=
+== xref:#F[F]::operator+=
 
 
 
@@ -666,7 +730,7 @@ operator+=(xref:#F[F]&);
 
 
 [#F-operator_bitand]
-== xref:#F[pass:[F]]::operator&
+== xref:#F[F]::operator&
 
 
 
@@ -690,7 +754,7 @@ operator&(xref:#F[F]&);
 
 
 [#F-operator_and]
-== xref:#F[pass:[F]]::operator&&
+== xref:#F[F]::operator&&
 
 
 
@@ -714,7 +778,7 @@ operator&&(xref:#F[F]&);
 
 
 [#F-operator_and_eq]
-== xref:#F[pass:[F]]::operator&=
+== xref:#F[F]::operator&=
 
 
 
@@ -738,7 +802,7 @@ operator&=(xref:#F[F]&);
 
 
 [#F-operator_bitor]
-== xref:#F[pass:[F]]::operator|
+== xref:#F[F]::operator|
 
 
 
@@ -762,7 +826,7 @@ operator|(xref:#F[F]&);
 
 
 [#F-operator_or]
-== xref:#F[pass:[F]]::operator||
+== xref:#F[F]::operator||
 
 
 
@@ -786,7 +850,7 @@ operator||(xref:#F[F]&);
 
 
 [#F-operator_or_eq]
-== xref:#F[pass:[F]]::operator|=
+== xref:#F[F]::operator|=
 
 
 
@@ -810,7 +874,7 @@ operator|=(xref:#F[F]&);
 
 
 [#F-operator_minus]
-== xref:#F[pass:[F]]::operator-
+== xref:#F[F]::operator-
 
 
 
@@ -834,7 +898,7 @@ operator-(xref:#F[F]&);
 
 
 [#F-operator_dec]
-== xref:#F[pass:[F]]::operator--
+== xref:#F[F]::operator--
 
 
 
@@ -858,7 +922,7 @@ operator--();
 
 
 [#F-operator_minus_eq]
-== xref:#F[pass:[F]]::operator-=
+== xref:#F[F]::operator-=
 
 
 
@@ -882,7 +946,7 @@ operator-=(xref:#F[F]&);
 
 
 [#F-operator_ptr]
-== xref:#F[pass:[F]]::operator->
+== xref:#F[F]::operator->
 
 
 
@@ -906,7 +970,7 @@ operator->();
 
 
 [#F-operator_ptrmem]
-== xref:#F[pass:[F]]::operator->*
+== xref:#F[F]::operator->*
 
 
 
@@ -930,7 +994,7 @@ operator->*(xref:#F[F]&);
 
 
 [#F-operator_lt]
-== xref:#F[pass:[F]]::operator<
+== xref:#F[F]::operator<
 
 
 
@@ -954,7 +1018,7 @@ operator<(xref:#F[F]&);
 
 
 [#F-operator_lshift]
-== xref:#F[pass:[F]]::operator<<
+== xref:#F[F]::operator<<
 
 
 
@@ -978,7 +1042,7 @@ operator<<(xref:#F[F]&);
 
 
 [#F-operator_lshift_eq]
-== xref:#F[pass:[F]]::operator<<=
+== xref:#F[F]::operator<<=
 
 
 
@@ -1002,7 +1066,7 @@ operator<<=(xref:#F[F]&);
 
 
 [#F-operator_le]
-== xref:#F[pass:[F]]::operator<=
+== xref:#F[F]::operator<=
 
 
 
@@ -1026,7 +1090,7 @@ operator<=(xref:#F[F]&);
 
 
 [#F-operator_3way]
-== xref:#F[pass:[F]]::operator<=>
+== xref:#F[F]::operator<=>
 
 
 
@@ -1050,7 +1114,7 @@ operator<=>(xref:#F[F]&);
 
 
 [#F-operator_gt]
-== xref:#F[pass:[F]]::operator>
+== xref:#F[F]::operator>
 
 
 
@@ -1074,7 +1138,7 @@ operator>(xref:#F[F]&);
 
 
 [#F-operator_rshift]
-== xref:#F[pass:[F]]::operator>>
+== xref:#F[F]::operator>>
 
 
 
@@ -1098,7 +1162,7 @@ operator>>(xref:#F[F]&);
 
 
 [#F-operator_rshift_eq]
-== xref:#F[pass:[F]]::operator>>=
+== xref:#F[F]::operator>>=
 
 
 
@@ -1122,7 +1186,7 @@ operator>>=(xref:#F[F]&);
 
 
 [#F-operator_ge]
-== xref:#F[pass:[F]]::operator>=
+== xref:#F[F]::operator>=
 
 
 
@@ -1146,7 +1210,7 @@ operator>=(xref:#F[F]&);
 
 
 [#F-operator_star]
-== xref:#F[pass:[F]]::operator*
+== xref:#F[F]::operator*
 
 
 
@@ -1170,7 +1234,7 @@ operator*(xref:#F[F]&);
 
 
 [#F-operator_star_eq]
-== xref:#F[pass:[F]]::operator*=
+== xref:#F[F]::operator*=
 
 
 
@@ -1194,7 +1258,7 @@ operator*=(xref:#F[F]&);
 
 
 [#F-operator_mod]
-== xref:#F[pass:[F]]::operator%
+== xref:#F[F]::operator%
 
 
 
@@ -1218,7 +1282,7 @@ operator%(xref:#F[F]&);
 
 
 [#F-operator_mod_eq]
-== xref:#F[pass:[F]]::operator%=
+== xref:#F[F]::operator%=
 
 
 
@@ -1242,7 +1306,7 @@ operator%=(xref:#F[F]&);
 
 
 [#F-operator_slash]
-== xref:#F[pass:[F]]::operator/
+== xref:#F[F]::operator/
 
 
 
@@ -1266,7 +1330,7 @@ operator/(xref:#F[F]&);
 
 
 [#F-operator_slash_eq]
-== xref:#F[pass:[F]]::operator/=
+== xref:#F[F]::operator/=
 
 
 
@@ -1290,7 +1354,7 @@ operator/=(xref:#F[F]&);
 
 
 [#F-operator_xor]
-== xref:#F[pass:[F]]::operator^
+== xref:#F[F]::operator^
 
 
 
@@ -1314,7 +1378,7 @@ operator^(xref:#F[F]&);
 
 
 [#F-operator_xor_eq]
-== xref:#F[pass:[F]]::operator^=
+== xref:#F[F]::operator^=
 
 
 
@@ -1338,7 +1402,7 @@ operator^=(xref:#F[F]&);
 
 
 [#F-operator_assign]
-== xref:#F[pass:[F]]::operator=
+== xref:#F[F]::operator=
 
 
 
@@ -1362,7 +1426,7 @@ operator=(xref:#F[F]&);
 
 
 [#F-operator_eq]
-== xref:#F[pass:[F]]::operator==
+== xref:#F[F]::operator==
 
 
 
@@ -1386,7 +1450,7 @@ operator==(xref:#F[F]&);
 
 
 [#F-operator_not]
-== xref:#F[pass:[F]]::operator!
+== xref:#F[F]::operator!
 
 
 
@@ -1410,7 +1474,7 @@ operator!();
 
 
 [#F-operator_not_eq]
-== xref:#F[pass:[F]]::operator!=
+== xref:#F[F]::operator!=
 
 
 
diff --git a/test-files/golden-tests/ref.html b/test-files/golden-tests/ref.html
index f071a8032..3171d36ec 100644
--- a/test-files/golden-tests/ref.html
+++ b/test-files/golden-tests/ref.html
@@ -9,97 +9,88 @@
         
Global namespace

     
     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
        

-        

-

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+                    
+
+
+
+                
+            
+
-                            
-                            
-                        
-            




NameDescription
NameDescription

                 

-                                F 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+                
+            
+        




NameDescription

+                        A 
+                    
+                        
+                            
+                    

+
 Types

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+            
+        
NameDescription

+                        F 
+                    
+                        
+                            
+                    

+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                                
-                                
+                
+                    
-                            
-                                
-                                
+                
+                    
-                            
-                
NameDescription

                 

-                                    f0 
-                                
-
-                                        
                

-                                    f5 
-                                
-
See A::f1

+                    		
+                        f0 
+                    
+                        
                             
+                    

+                        f5 
+                    
+                        
See A::f1

+                        
 
-                                        
                

-                                    f6 
-                                
-
See F::operator~

                             
+                    

+                        f6 
+                    
+                        
See F::operator~

+                        
 
-                                        
        

-            

-            

+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -116,7 +107,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -134,73 +124,67 @@ 
Synopsis

         
Namespace A

     

     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                B 
-                            
-
See f1

-                        
+                    		NameDescription
                

-                                C 
-                            
-
-                                    
                

-                                D 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+
+                
+            
+
-                                
-                                
+                
+                    
+                
+                    
+                
+            
+        




NameDescription

                 

-                                    f1 
-                                
-
See f0

+                    		
+                        B 
+                    
+                        
See f1

+                        
+
+                            
+                    

+                        C 
+                    
+                        
                             
+                    

+                        D 
+                    
+                        
+                            
+                    

+
Functions

+
+            
+                
+                    
+
+
 
-                                        
-                            
-                
NameDescription
        

-            

-            

+                
+            
+
+                
+                    
+                        f1 
+                    
+                        
See f0

+                        
+
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -219,7 +203,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -255,7 +238,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -265,31 +247,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f2 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f2 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
     

         
Description

@@ -316,7 +295,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -344,7 +322,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -353,38 +330,35 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                                
-                                
-                            
-                

                 

-                                    f3 
-                                
+                    NameDescription
                

-                                    f4 
-                                
 
-                                        
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f3 
+                    
+                        
+                            
+                    
+                
+                    
+                        f4 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -403,7 +377,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -431,7 +404,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -459,7 +431,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -469,63 +440,57 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                            
-                            
-                        
-            
NameDescription

                 

-                                E 
-                            
-
See f3

+                    		
+                        E 
+                    
+                        
See f3

                         
 
-                                    
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                            
+                    
+                
+            
+        




NameDescription

+
 Member Functions

+
+            
-                                
-                                
-                            
-                                
-                                
-                            
-                

                 

-                                    f3 
-                                
-
-                                        
                

-                                    f4 
-                                
-    
        

-            

-                                                                                                    

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        f3 
+                    
+                        
+                            
+                    
+                
+                    
+                        f4 
+                    
+                        
+                    
+                
+            
+        
+                    
 
 
 
@@ -544,7 +509,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -574,7 +538,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -583,7 +546,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
     

         
Description

@@ -612,7 +575,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -646,7 +608,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -655,297 +616,294 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                

                 

-                                    operator! 
-                                
-
-                                        
                

-                                    operator!= 
-                                
-
-                                        
                

-                                    operator% 
-                                
-
-                                        
                

-                                    operator%= 
-                                
-
-                                        
                

-                                    operator& 
-                                
-
-                                        
                

-                                    operator&& 
-                                
-
-                                        
                

-                                    operator&= 
-                                
-
-                                        
                

-                                    operator() 
-                                
-
-                                        
                

-                                    operator* 
-                                
-
-                                        
                

-                                    operator*= 
-                                
-
-                                        
                

-                                    operator+ 
-                                
-
-                                        
                

-                                    operator++ 
-                                
-
-                                        
                

-                                    operator+= 
-                                
-
-                                        
                

-                                    operator, 
-                                
-
-                                        
                

-                                    operator- 
-                                
-
-                                        
                

-                                    operator-- 
-                                
-
-                                        
                

-                                    operator-= 
-                                
-
-                                        
                

-                                    operator-> 
-                                
-
-                                        
                

-                                    operator->* 
-                                
-
-                                        
                

-                                    operator/ 
-                                
-
-                                        
                

-                                    operator/= 
-                                
-
-                                        
                

-                                    operator< 
-                                
-
-                                        
                

-                                    operator<< 
-                                
-
-                                        
                

-                                    operator<<= 
-                                
-
-                                        
                

-                                    operator<= 
-                                
-
-                                        
                

-                                    operator<=> 
-                                
-
-                                        
                

-                                    operator= 
-                                
-
-                                        
                

-                                    operator== 
-                                
-
-                                        
                

-                                    operator> 
-                                
-
-                                        
                

-                                    operator>= 
-                                
-
-                                        
                

-                                    operator>> 
-                                
-
-                                        
                

-                                    operator>>= 
-                                
-
-                                        
                

-                                    operator[] 
-                                
-
-                                        
                

-                                    operator^ 
-                                
-
-                                        
                

-                                    operator^= 
-                                
-
-                                        
                

-                                    operator| 
-                                
-
-                                        
                

-                                    operator|= 
-                                
-
-                                        
                

-                                    operator|| 
-                                
-
-                                        
                

-                                    operator~ 
-                                
-
-                                        
        

-            

-                                                                                                    

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        operator! 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator!= 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator% 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator%= 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator& 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator&& 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator&= 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator() 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator* 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator*= 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator+ 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator++ 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator+= 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator, 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator- 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator-- 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator-= 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator-> 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator->* 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator/ 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator/= 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator< 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator<< 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator<<= 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator<= 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator<=> 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator= 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator== 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator> 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator>= 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator>> 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator>>= 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator[] 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator^ 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator^= 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator| 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator|= 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator|| 
+                    
+                        
+                            
+                    
+                
+                    
+                        operator~ 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -964,7 +922,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -992,7 +949,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1020,7 +976,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1048,7 +1003,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1076,7 +1030,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1104,7 +1057,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1132,7 +1084,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1160,7 +1111,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1188,7 +1138,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1216,7 +1165,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1244,7 +1192,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1272,7 +1219,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1300,7 +1246,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1328,7 +1273,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1356,7 +1300,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1384,7 +1327,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1412,7 +1354,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1440,7 +1381,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1468,7 +1408,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1496,7 +1435,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1524,7 +1462,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1552,7 +1489,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1580,7 +1516,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1608,7 +1543,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1636,7 +1570,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1664,7 +1597,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1692,7 +1624,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1720,7 +1651,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1748,7 +1678,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1776,7 +1705,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1804,7 +1732,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1832,7 +1759,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1860,7 +1786,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1888,7 +1813,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1916,7 +1840,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1944,7 +1867,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1972,7 +1894,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2000,7 +1921,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2028,7 +1948,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -2058,7 +1977,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/requires-clause.adoc b/test-files/golden-tests/requires-clause.adoc
index ba5f6254d..13632451a 100644
--- a/test-files/golden-tests/requires-clause.adoc
+++ b/test-files/golden-tests/requires-clause.adoc
@@ -6,18 +6,23 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
+| Name | Description 
 
+| xref:#A[`A`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:f[`f`]  ¦
-¦xref:g[`g`]  ¦
+| Name | Description 
+
+| xref:f[`f`] 
+| 
+| xref:g[`g`] 
+| 
 |===
 
 
@@ -34,14 +39,14 @@
 ----
 template
 void
-xref:#f-05[pass:[f]]() requires (sizeof(T) == 4);
+xref:#f-05[f]() requires (sizeof(T) == 4);
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template
 void
-xref:#f-08[pass:[f]]() requires (sizeof(T) == 2);
+xref:#f-08[f]() requires (sizeof(T) == 2);
 ----
   
 
@@ -115,14 +120,14 @@ f() requires (sizeof(T) == 2);
 ----
 template requires (sizeof(T) == 4)
 void
-xref:#g-0a[pass:[g]]();
+xref:#g-0a[g]();
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template requires (sizeof(U) == 2)
 void
-xref:#g-0c[pass:[g]]();
+xref:#g-0c[g]();
 ----
   
 
diff --git a/test-files/golden-tests/requires-clause.html b/test-files/golden-tests/requires-clause.html
index 8798971f8..dc7fbd8e7 100644
--- a/test-files/golden-tests/requires-clause.html
+++ b/test-files/golden-tests/requires-clause.html
@@ -9,60 +9,54 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                                
-                                
-                            
-                




NameDescription
NameDescription

                 

-                                    f 
-                                
-    
                

-                                    g 
-                                
-    
        

-            

-            

+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+            
+        
NameDescription

+                        f 
+                    
+                        
+                    

+                        g 
+                    
+                        
+                    

+    
 
 
 

@@ -104,7 +98,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -133,7 +126,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -187,7 +179,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -216,7 +207,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -245,7 +235,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -255,7 +244,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
diff --git a/test-files/golden-tests/spec-mem-implicit-instantiation.adoc b/test-files/golden-tests/spec-mem-implicit-instantiation.adoc
index ebeb30535..91928590d 100644
--- a/test-files/golden-tests/spec-mem-implicit-instantiation.adoc
+++ b/test-files/golden-tests/spec-mem-implicit-instantiation.adoc
@@ -6,13 +6,16 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e[`A`]  ¦
-
-¦xref:#D[`D`]  ¦
-
+| Name | Description 
+
+| xref:#A-0e[`A`] 
+| 
+    
+| xref:#D[`D`] 
+| 
+    
 |===
 
 
@@ -33,20 +36,25 @@ struct A;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e-B[`B`]  ¦
-
-¦xref:#A-0e-C[`C`]  ¦
-
+| Name | Description 
+
+| xref:#A-0e-B[`B`] 
+| 
+    
+| xref:#A-0e-C[`C`] 
+| 
+    
 |===
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e-f[`f`]  ¦
+| Name | Description 
 
+| xref:#A-0e-f[`f`] 
+| 
+    
 |===
 
 
@@ -54,7 +62,7 @@ struct A;
 
 
 [#A-0e-f]
-== xref:#A-0e[pass:[A]]::f
+== xref:#A-0e[A]::f
 
 
 
@@ -78,7 +86,7 @@ f();
 
 
 [#A-0e-B]
-== xref:#A-0e[pass:[A]]::B
+== xref:#A-0e[A]::B
 
 
 
@@ -93,11 +101,13 @@ struct B;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e-B-g[`g`]  ¦
+| Name | Description 
 
+| xref:#A-0e-B-g[`g`] 
+| 
+    
 |===
 
 
@@ -105,7 +115,7 @@ struct B;
 
 
 [#A-0e-B-g]
-== xref:#A-0e[pass:[A]]::xref:#A-0e-B[pass:[B]]::g
+== xref:#A-0e[A]::xref:#A-0e-B[B]::g
 
 
 
@@ -129,7 +139,7 @@ g();
 
 
 [#A-0e-C]
-== xref:#A-0e[pass:[A]]::C
+== xref:#A-0e[A]::C
 
 
 
@@ -144,11 +154,13 @@ struct C;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e-C-h[`h`]  ¦
+| Name | Description 
 
+| xref:#A-0e-C-h[`h`] 
+| 
+    
 |===
 
 
@@ -156,7 +168,7 @@ struct C;
 
 
 [#A-0e-C-h]
-== xref:#A-0e[pass:[A]]::xref:#A-0e-C[pass:[C]]::h
+== xref:#A-0e[A]::xref:#A-0e-C[C]::h
 
 
 
@@ -203,11 +215,13 @@ struct D;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#D-E-0e[`E`]  ¦
+| Name | Description 
 
+| xref:#D-E-0e[`E`] 
+| 
+    
 |===
 
 
@@ -215,7 +229,7 @@ struct D;
 
 
 [#D-E-0e]
-== xref:#D[pass:[D]]::E
+== xref:#D[D]::E
 
 
 
@@ -230,11 +244,13 @@ struct E;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#D-E-0e-k[`k`]  ¦
+| Name | Description 
 
+| xref:#D-E-0e-k[`k`] 
+| 
+    
 |===
 
 
@@ -242,7 +258,7 @@ struct E;
 
 
 [#D-E-0e-k]
-== xref:#D[pass:[D]]::xref:#D-E-0e[pass:[E]]::k
+== xref:#D[D]::xref:#D-E-0e[E]::k
 
 
 
diff --git a/test-files/golden-tests/spec-mem-implicit-instantiation.html b/test-files/golden-tests/spec-mem-implicit-instantiation.html
index ee829c455..4be4211e1 100644
--- a/test-files/golden-tests/spec-mem-implicit-instantiation.html
+++ b/test-files/golden-tests/spec-mem-implicit-instantiation.html
@@ -9,38 +9,35 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
                

-                                D 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+                    
+                        D 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -57,7 +54,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -67,62 +63,56 @@ 
Synopsis

     

 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                B 
-                            
-
-                                    
                

-                                C 
-                            
-
-                                    
        

-        

-    

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+            
+        




NameDescription
NameDescription

+                        B 
+                    
+                        
+                            
+                    

+                        C 
+                    
+                        
+                            
+                    

+
 Member Functions

+
+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -141,7 +131,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -169,7 +158,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -179,31 +167,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    g 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        g 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -222,7 +207,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -250,7 +234,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -260,31 +243,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    h 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        h 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -303,7 +283,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -331,7 +310,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -340,31 +318,28 @@ 
Synopsis

     
 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                E 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        E 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -383,7 +358,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -393,31 +367,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    k 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        k 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -436,7 +407,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/static-data-def-constexpr.adoc b/test-files/golden-tests/static-data-def-constexpr.adoc
index d7c647b17..c581be17b 100644
--- a/test-files/golden-tests/static-data-def-constexpr.adoc
+++ b/test-files/golden-tests/static-data-def-constexpr.adoc
@@ -6,13 +6,16 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S[`S`]  ¦
-
-¦xref:#T[`T`]  ¦
-
+| Name | Description 
+
+| xref:#S[`S`] 
+| 
+    
+| xref:#T[`T`] 
+| 
+    
 |===
 
 
@@ -32,11 +35,13 @@ struct S;
 ----
 
 ===  Static Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#S-s[`s`]  ¦
+| Name | Description 
 
+| xref:#S-s[`s`] 
+| 
+    
 |===
 
 
@@ -44,7 +49,7 @@ struct S;
 
 
 [#S-s]
-== xref:#S[pass:[S]]::s
+== xref:#S[S]::s
 
 
 
@@ -77,11 +82,13 @@ struct T;
 ----
 
 ===  Static Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#T-t[`t`]  ¦
+| Name | Description 
 
+| xref:#T-t[`t`] 
+| 
+    
 |===
 
 
@@ -89,7 +96,7 @@ struct T;
 
 
 [#T-t]
-== xref:#T[pass:[T]]::t
+== xref:#T[T]::t
 
 
 
diff --git a/test-files/golden-tests/static-data-def-constexpr.html b/test-files/golden-tests/static-data-def-constexpr.html
index 70f9f7182..9cf8a0fe3 100644
--- a/test-files/golden-tests/static-data-def-constexpr.html
+++ b/test-files/golden-tests/static-data-def-constexpr.html
@@ -9,38 +9,35 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                S 
-                            
-
-                                    
                

-                                T 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        S 
+                    
+                        
+                            
+                    
+                
+                    
+                        T 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -57,7 +54,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -66,31 +62,28 @@ 
Synopsis

     

 
     

-                        

-                
 Static Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Static Data Members

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    s 
-                                
+                    NameDescription
        

-            

-                                                                                        

+                
+            
+
+                
+                    
+                        s 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -109,7 +102,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -135,7 +127,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -144,31 +135,28 @@ 
Synopsis

     
 
     

-                        

-                
 Static Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Static Data Members

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    t 
-                                
+                    NameDescription
        

-            

-                                                                                        

+
+                
+            
+
+                
+                    
+                        t 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -187,7 +175,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/static-data-def.adoc b/test-files/golden-tests/static-data-def.adoc
index 4ca11f93c..18c3b041a 100644
--- a/test-files/golden-tests/static-data-def.adoc
+++ b/test-files/golden-tests/static-data-def.adoc
@@ -6,20 +6,25 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
-
-¦xref:#B[`B`]  ¦
-
+| Name | Description 
+
+| xref:#A[`A`] 
+| 
+    
+| xref:#B[`B`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f[`f`]  ¦
+| Name | Description 
 
+| xref:#f[`f`] 
+| 
+    
 |===
 
 
@@ -40,25 +45,34 @@ struct A;
 ----
 
 ===  Static Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-v0[`v0`]  ¦
-
-¦xref:#A-v1[`v1`]  ¦
-
-¦xref:#A-v2[`v2`]  ¦
-
-¦xref:#A-v3[`v3`]  ¦
-
-¦xref:#A-v4[`v4`]  ¦
-
-¦xref:#A-v5[`v5`]  ¦
-
-¦xref:#A-v6[`v6`]  ¦
-
-¦xref:#A-v7[`v7`]  ¦
-
+| Name | Description 
+
+| xref:#A-v0[`v0`] 
+| 
+    
+| xref:#A-v1[`v1`] 
+| 
+    
+| xref:#A-v2[`v2`] 
+| 
+    
+| xref:#A-v3[`v3`] 
+| 
+    
+| xref:#A-v4[`v4`] 
+| 
+    
+| xref:#A-v5[`v5`] 
+| 
+    
+| xref:#A-v6[`v6`] 
+| 
+    
+| xref:#A-v7[`v7`] 
+| 
+    
 |===
 
 
@@ -66,7 +80,7 @@ struct A;
 
 
 [#A-v0]
-== xref:#A[pass:[A]]::v0
+== xref:#A[A]::v0
 
 
 
@@ -84,7 +98,7 @@ int v0 = 0;
 
 
 [#A-v1]
-== xref:#A[pass:[A]]::v1
+== xref:#A[A]::v1
 
 
 
@@ -102,7 +116,7 @@ int v1 = 1;
 
 
 [#A-v2]
-== xref:#A[pass:[A]]::v2
+== xref:#A[A]::v2
 
 
 
@@ -121,7 +135,7 @@ int const v2 = 2;
 
 
 [#A-v3]
-== xref:#A[pass:[A]]::v3
+== xref:#A[A]::v3
 
 
 
@@ -139,7 +153,7 @@ int const v3 = 3;
 
 
 [#A-v4]
-== xref:#A[pass:[A]]::v4
+== xref:#A[A]::v4
 
 
 
@@ -157,7 +171,7 @@ int const v4 = 4;
 
 
 [#A-v5]
-== xref:#A[pass:[A]]::v5
+== xref:#A[A]::v5
 
 
 
@@ -175,7 +189,7 @@ int v5 = 5;
 
 
 [#A-v6]
-== xref:#A[pass:[A]]::v6
+== xref:#A[A]::v6
 
 
 
@@ -193,7 +207,7 @@ int const v6 = 6;
 
 
 [#A-v7]
-== xref:#A[pass:[A]]::v7
+== xref:#A[A]::v7
 
 
 
@@ -226,13 +240,16 @@ struct B;
 ----
 
 ===  Static Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#B-x0[`x0`]  ¦
-
-¦xref:#B-x1[`x1`]  ¦
-
+| Name | Description 
+
+| xref:#B-x0[`x0`] 
+| 
+    
+| xref:#B-x1[`x1`] 
+| 
+    
 |===
 
 
@@ -240,7 +257,7 @@ struct B;
 
 
 [#B-x0]
-== xref:#B[pass:[B]]::x0
+== xref:#B[B]::x0
 
 
 
@@ -259,7 +276,7 @@ int const x0 = 0;
 
 
 [#B-x1]
-== xref:#B[pass:[B]]::x1
+== xref:#B[B]::x1
 
 
 
diff --git a/test-files/golden-tests/static-data-def.html b/test-files/golden-tests/static-data-def.html
index dd06f37eb..7502b15ba 100644
--- a/test-files/golden-tests/static-data-def.html
+++ b/test-files/golden-tests/static-data-def.html
@@ -9,62 +9,56 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
                

-                                B 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+            
+        




NameDescription
NameDescription

+                        A 
+                    
+                        
+                            
+                    

+                        B 
+                    
+                        
+                            
+                    

+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    f 
-                                
-
-                                        
        

-            

-            

+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -81,7 +75,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -91,80 +84,77 @@ 
Synopsis

     

 
     

-                        

-                
 Static Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Static Data Members

+




NameDescription

+            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                

                 

-                                    v0 
-                                
-
-                                        
                

-                                    v1 
-                                
-
-                                        
                

-                                    v2 
-                                
-
-                                        
                

-                                    v3 
-                                
-
-                                        
                

-                                    v4 
-                                
-
-                                        
                

-                                    v5 
-                                
-
-                                        
                

-                                    v6 
-                                
-
-                                        
                

-                                    v7 
-                                
-
-                                        
        

-            

-                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        v0 
+                    
+                        
+                            
+                    
+                
+                    
+                        v1 
+                    
+                        
+                            
+                    
+                
+                    
+                        v2 
+                    
+                        
+                            
+                    
+                
+                    
+                        v3 
+                    
+                        
+                            
+                    
+                
+                    
+                        v4 
+                    
+                        
+                            
+                    
+                
+                    
+                        v5 
+                    
+                        
+                            
+                    
+                
+                    
+                        v6 
+                    
+                        
+                            
+                    
+                
+                    
+                        v7 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -183,7 +173,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -208,7 +197,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -233,7 +221,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -259,7 +246,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -284,7 +270,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -309,7 +294,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -334,7 +318,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -359,7 +342,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -385,7 +367,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -394,38 +375,35 @@ 
Synopsis

     
 
     

-                        

-                
 Static Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Static Data Members

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                                
-                                
-                            
-                

                 

-                                    x0 
-                                
+                    NameDescription
                

-                                    x1 
-                                
 
-                                        
        

-            

-                                                                                        

+                
+            
+
+                
+                    
+                        x0 
+                    
+                        
+                            
+                    
+                
+                    
+                        x1 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -444,7 +422,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -470,7 +447,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -497,7 +473,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/static-data-template.adoc b/test-files/golden-tests/static-data-template.adoc
index 71576fbfa..169bfe01a 100644
--- a/test-files/golden-tests/static-data-template.adoc
+++ b/test-files/golden-tests/static-data-template.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
+| Name | Description 
 
+| xref:#A[`A`] 
+| 
+    
 |===
 
 
@@ -31,15 +33,19 @@ struct A;
 ----
 
 ===  Static Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-x-0e[`x`]  ¦
-
-¦xref:#A-x-0a[`x`]  ¦
-
-¦xref:#A-x-07[`x`]  ¦
-
+| Name | Description 
+
+| xref:#A-x-0e[`x`] 
+| 
+    
+| xref:#A-x-0a[`x`] 
+| 
+    
+| xref:#A-x-07[`x`] 
+| 
+    
 |===
 
 
@@ -47,7 +53,7 @@ struct A;
 
 
 [#A-x-0e]
-== xref:#A[pass:[A]]::x
+== xref:#A[A]::x
 
 
 
@@ -69,7 +75,7 @@ T const x = 0;
 
 
 [#A-x-0a]
-== xref:#A[pass:[A]]::x
+== xref:#A[A]::x
 
 
 
@@ -82,14 +88,14 @@ Declared in ``
 template
 constexpr
 static
-T const xref:#A-x-0e[pass:[x]] = 1;
+T const xref:#A-x-0e[x] = 1;
 ----
 
 
 
 
 [#A-x-07]
-== xref:#A[pass:[A]]::x
+== xref:#A[A]::x
 
 
 
@@ -102,7 +108,7 @@ Declared in ``
 template<>
 constexpr
 static
-bool const xref:#A-x-0e[pass:[x]] = 2;
+bool const xref:#A-x-0e[x] = 2;
 ----
 
 
diff --git a/test-files/golden-tests/static-data-template.html b/test-files/golden-tests/static-data-template.html
index 7e321f541..f7b03beaf 100644
--- a/test-files/golden-tests/static-data-template.html
+++ b/test-files/golden-tests/static-data-template.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                A 
-                            
+                    NameDescription
        

-        

-                

+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -60,45 +56,42 @@ 
Synopsis

     

 
     

-                        

-                
 Static Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Static Data Members

+




NameDescription

+            
-                                
-                                
-                            
-                                
-                                
+
 
-                                        
-                            
-                                
-                                
-                            
-                

                 

-                                    x 
-                                
-
-                                        
                

-                                    x 
-                                
+                    NameDescription
                

-                                    x 
-                                
 
-                                        
        

-            

-                                                                                        

+                
+            
+
+                
+                    
+                        x 
+                    
+                        
+                            
+                    
+                
+                    
+                        x 
+                    
+                        
+                            
+                    
+                
+                    
+                        x 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -117,7 +110,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -146,7 +138,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -173,7 +164,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
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 6a350bf51..5e1225304 100644
--- a/test-files/golden-tests/temp/c_mct_expl_inline.adoc
+++ b/test-files/golden-tests/temp/c_mct_expl_inline.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
+| Name | Description 
 
+| xref:#A[`A`] 
+| 
+    
 |===
 
 
@@ -30,13 +32,16 @@ struct A;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-B-04[`B`]  ¦
-
-¦xref:#A-B-01[`B`]  ¦
-
+| Name | Description 
+
+| xref:#A-B-04[`B`] 
+| 
+    
+| xref:#A-B-01[`B`] 
+| 
+    
 |===
 
 
@@ -44,7 +49,7 @@ struct A;
 
 
 [#A-B-04]
-== xref:#A[pass:[A]]::B
+== xref:#A[A]::B
 
 
 
@@ -59,11 +64,13 @@ struct B;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-B-04-f[`f`]  ¦
+| Name | Description 
 
+| xref:#A-B-04-f[`f`] 
+| 
+    
 |===
 
 
@@ -71,7 +78,7 @@ struct B;
 
 
 [#A-B-04-f]
-== xref:#A[pass:[A]]::xref:#A-B-04[pass:[B]]::f
+== xref:#A[A]::xref:#A-B-04[B]::f
 
 
 
@@ -95,7 +102,7 @@ f();
 
 
 [#A-B-01]
-== xref:#A[pass:[A]]::B
+== xref:#A[A]::B
 
 
 
@@ -106,15 +113,17 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
-struct xref:#A-B-04[pass:[B]];
+struct xref:#A-B-04[B];
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-B-01-g[`g`]  ¦
+| Name | Description 
 
+| xref:#A-B-01-g[`g`] 
+| 
+    
 |===
 
 
@@ -122,7 +131,7 @@ struct xref:#A-B-04[pass:[B]];
 
 
 [#A-B-01-g]
-== xref:#A[pass:[A]]::xref:#A-B-01[pass:[B]]::g
+== xref:#A[A]::xref:#A-B-01[B]::g
 
 
 
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 de4e5567e..ca8c9740b 100644
--- a/test-files/golden-tests/temp/c_mct_expl_inline.html
+++ b/test-files/golden-tests/temp/c_mct_expl_inline.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                A 
-                            
+                    NameDescription
        

-        

-                

+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -59,38 +55,35 @@ 
Synopsis

     

 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                B 
-                            
+                    NameDescription
                

-                                B 
-                            
 
-                                    
        

-        

-                                                                                                        

+                
+            
+
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -109,7 +102,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -119,31 +111,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -162,7 +151,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -190,7 +178,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -200,31 +187,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    g 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        g 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -243,7 +227,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
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 0a8bf146b..ac015e1f4 100644
--- a/test-files/golden-tests/temp/c_mct_expl_outside.adoc
+++ b/test-files/golden-tests/temp/c_mct_expl_outside.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
+| Name | Description 
 
+| xref:#A[`A`] 
+| 
+    
 |===
 
 
@@ -30,13 +32,16 @@ struct A;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-B-04[`B`]  ¦
-
-¦xref:#A-B-01[`B`]  ¦
-
+| Name | Description 
+
+| xref:#A-B-04[`B`] 
+| 
+    
+| xref:#A-B-01[`B`] 
+| 
+    
 |===
 
 
@@ -44,7 +49,7 @@ struct A;
 
 
 [#A-B-04]
-== xref:#A[pass:[A]]::B
+== xref:#A[A]::B
 
 
 
@@ -59,11 +64,13 @@ struct B;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-B-04-f[`f`]  ¦
+| Name | Description 
 
+| xref:#A-B-04-f[`f`] 
+| 
+    
 |===
 
 
@@ -71,7 +78,7 @@ struct B;
 
 
 [#A-B-04-f]
-== xref:#A[pass:[A]]::xref:#A-B-04[pass:[B]]::f
+== xref:#A[A]::xref:#A-B-04[B]::f
 
 
 
@@ -95,7 +102,7 @@ f();
 
 
 [#A-B-01]
-== xref:#A[pass:[A]]::B
+== xref:#A[A]::B
 
 
 
@@ -106,15 +113,17 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
-struct xref:#A-B-04[pass:[B]];
+struct xref:#A-B-04[B];
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-B-01-g[`g`]  ¦
+| Name | Description 
 
+| xref:#A-B-01-g[`g`] 
+| 
+    
 |===
 
 
@@ -122,7 +131,7 @@ struct xref:#A-B-04[pass:[B]];
 
 
 [#A-B-01-g]
-== xref:#A[pass:[A]]::xref:#A-B-01[pass:[B]]::g
+== xref:#A[A]::xref:#A-B-01[B]::g
 
 
 
diff --git a/test-files/golden-tests/temp/c_mct_expl_outside.html b/test-files/golden-tests/temp/c_mct_expl_outside.html
index 022f236fc..9510507d1 100644
--- a/test-files/golden-tests/temp/c_mct_expl_outside.html
+++ b/test-files/golden-tests/temp/c_mct_expl_outside.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                A 
-                            
+                    NameDescription
        

-        

-                

+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -59,38 +55,35 @@ 
Synopsis

     

 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                B 
-                            
+                    NameDescription
                

-                                B 
-                            
 
-                                    
        

-        

-                                                                                                        

+                
+            
+
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -109,7 +102,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -119,31 +111,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -162,7 +151,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -190,7 +178,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -200,31 +187,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    g 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        g 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -243,7 +227,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
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 18ed04438..68d26ce95 100644
--- a/test-files/golden-tests/temp/c_mft_expl_inline.adoc
+++ b/test-files/golden-tests/temp/c_mft_expl_inline.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
+| Name | Description 
 
+| xref:#A[`A`] 
+| 
+    
 |===
 
 
@@ -30,10 +32,12 @@ struct A;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:A-f[`f`]  ¦
+| Name | Description 
+
+| xref:A-f[`f`] 
+| 
 |===
 
 
@@ -41,7 +45,7 @@ struct A;
 
 [#A-f]
 
-== xref:#A[pass:[A]]::f
+== xref:#A[A]::f
 
   
 
@@ -52,14 +56,14 @@ struct A;
 ----
 template
 void
-xref:#A-f-0e[pass:[f]]();
+xref:#A-f-0e[f]();
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
 void
-xref:#A-f-0b[pass:[f]]();
+xref:#A-f-0b[f]();
 ----
   
 
@@ -72,7 +76,7 @@ xref:#A-f-0b[pass:[f]]();
 
 
 [#A-f-0e]
-== xref:#A[pass:[A]]::f
+== xref:#A[A]::f
 
 
 
@@ -97,7 +101,7 @@ f();
 
 
 [#A-f-0b]
-== xref:#A[pass:[A]]::f
+== xref:#A[A]::f
 
 
 
@@ -109,7 +113,7 @@ Declared in ``
 ----
 template<>
 void
-xref:#A-f-0e[pass:[f]]();
+xref:#A-f-0e[f]();
 ----
 
 
diff --git a/test-files/golden-tests/temp/c_mft_expl_inline.html b/test-files/golden-tests/temp/c_mft_expl_inline.html
index 2a2619efa..06baf6df2 100644
--- a/test-files/golden-tests/temp/c_mft_expl_inline.html
+++ b/test-files/golden-tests/temp/c_mft_expl_inline.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -59,30 +55,27 @@ 
Synopsis

     

 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    f 
-                                
-    
        

-            

-                                                                                                    

+                    
+                        f 
+                    
+                        
+                    
+                
+            
+        
+                    
 
 
 
@@ -126,7 +119,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -155,7 +147,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
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 9c30896fc..a90669f39 100644
--- a/test-files/golden-tests/temp/c_mft_expl_outside.adoc
+++ b/test-files/golden-tests/temp/c_mft_expl_outside.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
+| Name | Description 
 
+| xref:#A[`A`] 
+| 
+    
 |===
 
 
@@ -30,10 +32,12 @@ struct A;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:A-f[`f`]  ¦
+| Name | Description 
+
+| xref:A-f[`f`] 
+| 
 |===
 
 
@@ -41,7 +45,7 @@ struct A;
 
 [#A-f]
 
-== xref:#A[pass:[A]]::f
+== xref:#A[A]::f
 
   
 
@@ -52,14 +56,14 @@ struct A;
 ----
 template
 void
-xref:#A-f-0e[pass:[f]]();
+xref:#A-f-0e[f]();
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
 void
-xref:#A-f-0b[pass:[f]]();
+xref:#A-f-0b[f]();
 ----
   
 
@@ -72,7 +76,7 @@ xref:#A-f-0b[pass:[f]]();
 
 
 [#A-f-0e]
-== xref:#A[pass:[A]]::f
+== xref:#A[A]::f
 
 
 
@@ -97,7 +101,7 @@ f();
 
 
 [#A-f-0b]
-== xref:#A[pass:[A]]::f
+== xref:#A[A]::f
 
 
 
@@ -109,7 +113,7 @@ Declared in ``
 ----
 template<>
 void
-xref:#A-f-0e[pass:[f]]();
+xref:#A-f-0e[f]();
 ----
 
 
diff --git a/test-files/golden-tests/temp/c_mft_expl_outside.html b/test-files/golden-tests/temp/c_mft_expl_outside.html
index c0a669ef9..cae183374 100644
--- a/test-files/golden-tests/temp/c_mft_expl_outside.html
+++ b/test-files/golden-tests/temp/c_mft_expl_outside.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -59,30 +55,27 @@ 
Synopsis

     

 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    f 
-                                
-    
        

-            

-                                                                                                    

+                    
+                        f 
+                    
+                        
+                    
+                
+            
+        
+                    
 
 
 
@@ -126,7 +119,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -155,7 +147,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/temp/ct_expl.adoc b/test-files/golden-tests/temp/ct_expl.adoc
index 95f7e59ba..5c4637381 100644
--- a/test-files/golden-tests/temp/ct_expl.adoc
+++ b/test-files/golden-tests/temp/ct_expl.adoc
@@ -6,13 +6,16 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e[`A`]  ¦
-
-¦xref:#A-00[`A`]  ¦
-
+| Name | Description 
+
+| xref:#A-0e[`A`] 
+| 
+    
+| xref:#A-00[`A`] 
+| 
+    
 |===
 
 
@@ -33,11 +36,13 @@ struct A;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e-f[`f`]  ¦
+| Name | Description 
 
+| xref:#A-0e-f[`f`] 
+| 
+    
 |===
 
 
@@ -45,7 +50,7 @@ struct A;
 
 
 [#A-0e-f]
-== xref:#A-0e[pass:[A]]::f
+== xref:#A-0e[A]::f
 
 
 
@@ -80,15 +85,17 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
-struct xref:#A-0e[pass:[A]];
+struct xref:#A-0e[A];
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-00-g[`g`]  ¦
+| Name | Description 
 
+| xref:#A-00-g[`g`] 
+| 
+    
 |===
 
 
@@ -96,7 +103,7 @@ struct xref:#A-0e[pass:[A]];
 
 
 [#A-00-g]
-== xref:#A-00[pass:[A]]::g
+== xref:#A-00[A]::g
 
 
 
diff --git a/test-files/golden-tests/temp/ct_expl.html b/test-files/golden-tests/temp/ct_expl.html
index c23934995..5c6b5f2e8 100644
--- a/test-files/golden-tests/temp/ct_expl.html
+++ b/test-files/golden-tests/temp/ct_expl.html
@@ -9,38 +9,35 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
                

-                                A 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -57,7 +54,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -67,31 +63,28 @@ 
Synopsis

     

 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -110,7 +103,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -138,7 +130,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -148,31 +139,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    g 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        g 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -191,7 +179,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/temp/ct_mc.adoc b/test-files/golden-tests/temp/ct_mc.adoc
index 2190189db..04809f6a8 100644
--- a/test-files/golden-tests/temp/ct_mc.adoc
+++ b/test-files/golden-tests/temp/ct_mc.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
+| Name | Description 
 
+| xref:#A[`A`] 
+| 
+    
 |===
 
 
@@ -31,11 +33,13 @@ struct A;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-B[`B`]  ¦
+| Name | Description 
 
+| xref:#A-B[`B`] 
+| 
+    
 |===
 
 
@@ -43,7 +47,7 @@ struct A;
 
 
 [#A-B]
-== xref:#A[pass:[A]]::B
+== xref:#A[A]::B
 
 
 
@@ -57,11 +61,13 @@ struct B;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-B-f[`f`]  ¦
+| Name | Description 
 
+| xref:#A-B-f[`f`] 
+| 
+    
 |===
 
 
@@ -69,7 +75,7 @@ struct B;
 
 
 [#A-B-f]
-== xref:#A[pass:[A]]::xref:#A-B[pass:[B]]::f
+== xref:#A[A]::xref:#A-B[B]::f
 
 
 
diff --git a/test-files/golden-tests/temp/ct_mc.html b/test-files/golden-tests/temp/ct_mc.html
index 41b276ec2..28f2958c1 100644
--- a/test-files/golden-tests/temp/ct_mc.html
+++ b/test-files/golden-tests/temp/ct_mc.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -60,31 +56,28 @@ 
Synopsis

     

 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                B 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -103,7 +96,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -112,31 +104,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -155,7 +144,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
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 6d02e7442..0c5922487 100644
--- a/test-files/golden-tests/temp/ct_mc_expl_outside.adoc
+++ b/test-files/golden-tests/temp/ct_mc_expl_outside.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e[`A`]  ¦
+| Name | Description 
 
+| xref:#A-0e[`A`] 
+| 
+    
 |===
 
 
@@ -31,11 +33,13 @@ struct A;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e-B[`B`]  ¦
+| Name | Description 
 
+| xref:#A-0e-B[`B`] 
+| 
+    
 |===
 
 
@@ -43,7 +47,7 @@ struct A;
 
 
 [#A-0e-B]
-== xref:#A-0e[pass:[A]]::B
+== xref:#A-0e[A]::B
 
 
 
@@ -57,11 +61,13 @@ struct B;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e-B-f[`f`]  ¦
+| Name | Description 
 
+| xref:#A-0e-B-f[`f`] 
+| 
+    
 |===
 
 
@@ -69,7 +75,7 @@ struct B;
 
 
 [#A-0e-B-f]
-== xref:#A-0e[pass:[A]]::xref:#A-0e-B[pass:[B]]::f
+== xref:#A-0e[A]::xref:#A-0e-B[B]::f
 
 
 
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 d532b9f2c..9fc84b750 100644
--- a/test-files/golden-tests/temp/ct_mc_expl_outside.html
+++ b/test-files/golden-tests/temp/ct_mc_expl_outside.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -60,31 +56,28 @@ 
Synopsis

     

 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                B 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -103,7 +96,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -112,31 +104,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -155,7 +144,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/temp/ct_mct.adoc b/test-files/golden-tests/temp/ct_mct.adoc
index 794fbae9f..fe7609cd3 100644
--- a/test-files/golden-tests/temp/ct_mct.adoc
+++ b/test-files/golden-tests/temp/ct_mct.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
+| Name | Description 
 
+| xref:#A[`A`] 
+| 
+    
 |===
 
 
@@ -31,11 +33,13 @@ struct A;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-B[`B`]  ¦
+| Name | Description 
 
+| xref:#A-B[`B`] 
+| 
+    
 |===
 
 
@@ -43,7 +47,7 @@ struct A;
 
 
 [#A-B]
-== xref:#A[pass:[A]]::B
+== xref:#A[A]::B
 
 
 
@@ -58,11 +62,13 @@ struct B;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-B-f[`f`]  ¦
+| Name | Description 
 
+| xref:#A-B-f[`f`] 
+| 
+    
 |===
 
 
@@ -70,7 +76,7 @@ struct B;
 
 
 [#A-B-f]
-== xref:#A[pass:[A]]::xref:#A-B[pass:[B]]::f
+== xref:#A[A]::xref:#A-B[B]::f
 
 
 
diff --git a/test-files/golden-tests/temp/ct_mct.html b/test-files/golden-tests/temp/ct_mct.html
index 4928a5ac7..757262a01 100644
--- a/test-files/golden-tests/temp/ct_mct.html
+++ b/test-files/golden-tests/temp/ct_mct.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -60,31 +56,28 @@ 
Synopsis

     

 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                B 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -103,7 +96,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -113,31 +105,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -156,7 +145,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
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 10fcfeb8e..84e947621 100644
--- a/test-files/golden-tests/temp/ct_mct_expl_inline.adoc
+++ b/test-files/golden-tests/temp/ct_mct_expl_inline.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
+| Name | Description 
 
+| xref:#A[`A`] 
+| 
+    
 |===
 
 
@@ -31,13 +33,16 @@ struct A;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-B-07[`B`]  ¦
-
-¦xref:#A-B-06[`B`]  ¦
-
+| Name | Description 
+
+| xref:#A-B-07[`B`] 
+| 
+    
+| xref:#A-B-06[`B`] 
+| 
+    
 |===
 
 
@@ -45,7 +50,7 @@ struct A;
 
 
 [#A-B-07]
-== xref:#A[pass:[A]]::B
+== xref:#A[A]::B
 
 
 
@@ -60,11 +65,13 @@ struct B;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-B-07-f[`f`]  ¦
+| Name | Description 
 
+| xref:#A-B-07-f[`f`] 
+| 
+    
 |===
 
 
@@ -72,7 +79,7 @@ struct B;
 
 
 [#A-B-07-f]
-== xref:#A[pass:[A]]::xref:#A-B-07[pass:[B]]::f
+== xref:#A[A]::xref:#A-B-07[B]::f
 
 
 
@@ -96,7 +103,7 @@ f();
 
 
 [#A-B-06]
-== xref:#A[pass:[A]]::B
+== xref:#A[A]::B
 
 
 
@@ -107,15 +114,17 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
-struct xref:#A-B-07[pass:[B]];
+struct xref:#A-B-07[B];
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-B-06-g[`g`]  ¦
+| Name | Description 
 
+| xref:#A-B-06-g[`g`] 
+| 
+    
 |===
 
 
@@ -123,7 +132,7 @@ struct xref:#A-B-07[pass:[B]];
 
 
 [#A-B-06-g]
-== xref:#A[pass:[A]]::xref:#A-B-06[pass:[B]]::g
+== xref:#A[A]::xref:#A-B-06[B]::g
 
 
 
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 f0e4575f8..4b9919ddc 100644
--- a/test-files/golden-tests/temp/ct_mct_expl_inline.html
+++ b/test-files/golden-tests/temp/ct_mct_expl_inline.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                A 
-                            
+                    NameDescription
        

-        

-                

+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -60,38 +56,35 @@ 
Synopsis

     

 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                B 
-                            
+                    NameDescription
                

-                                B 
-                            
 
-                                    
        

-        

-                                                                                                        

+                
+            
+
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -110,7 +103,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -120,31 +112,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -163,7 +152,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -191,7 +179,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -201,31 +188,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    g 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        g 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -244,7 +228,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
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 8cd925282..821871c11 100644
--- a/test-files/golden-tests/temp/ct_mct_expl_outside.adoc
+++ b/test-files/golden-tests/temp/ct_mct_expl_outside.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e[`A`]  ¦
+| Name | Description 
 
+| xref:#A-0e[`A`] 
+| 
+    
 |===
 
 
@@ -31,11 +33,13 @@ struct A;
 ----
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e-B[`B`]  ¦
+| Name | Description 
 
+| xref:#A-0e-B[`B`] 
+| 
+    
 |===
 
 
@@ -43,7 +47,7 @@ struct A;
 
 
 [#A-0e-B]
-== xref:#A-0e[pass:[A]]::B
+== xref:#A-0e[A]::B
 
 
 
@@ -58,11 +62,13 @@ struct B;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e-B-f[`f`]  ¦
+| Name | Description 
 
+| xref:#A-0e-B-f[`f`] 
+| 
+    
 |===
 
 
@@ -70,7 +76,7 @@ struct B;
 
 
 [#A-0e-B-f]
-== xref:#A-0e[pass:[A]]::xref:#A-0e-B[pass:[B]]::f
+== xref:#A-0e[A]::xref:#A-0e-B[B]::f
 
 
 
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 07df9eeac..d15bc17b2 100644
--- a/test-files/golden-tests/temp/ct_mct_expl_outside.html
+++ b/test-files/golden-tests/temp/ct_mct_expl_outside.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -60,31 +56,28 @@ 
Synopsis

     

 
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                B 
-                            
-
-                                    
        

-        

-                                                                                                        

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -103,7 +96,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -113,31 +105,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -156,7 +145,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/temp/ct_mf.adoc b/test-files/golden-tests/temp/ct_mf.adoc
index ccdc86f02..2fc4b59b1 100644
--- a/test-files/golden-tests/temp/ct_mf.adoc
+++ b/test-files/golden-tests/temp/ct_mf.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
+| Name | Description 
 
+| xref:#A[`A`] 
+| 
+    
 |===
 
 
@@ -31,11 +33,13 @@ struct A;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-f[`f`]  ¦
+| Name | Description 
 
+| xref:#A-f[`f`] 
+| 
+    
 |===
 
 
@@ -43,7 +47,7 @@ struct A;
 
 
 [#A-f]
-== xref:#A[pass:[A]]::f
+== xref:#A[A]::f
 
 
 
diff --git a/test-files/golden-tests/temp/ct_mf.html b/test-files/golden-tests/temp/ct_mf.html
index ffb0b03e3..ceb827aaf 100644
--- a/test-files/golden-tests/temp/ct_mf.html
+++ b/test-files/golden-tests/temp/ct_mf.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                A 
-                            
+                    NameDescription
        

-        

-                

+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -60,31 +56,28 @@ 
Synopsis

     

 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -103,7 +96,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
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 b95c29e51..6659b1866 100644
--- a/test-files/golden-tests/temp/ct_mf_expl_outside.adoc
+++ b/test-files/golden-tests/temp/ct_mf_expl_outside.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e[`A`]  ¦
+| Name | Description 
 
+| xref:#A-0e[`A`] 
+| 
+    
 |===
 
 
@@ -31,11 +33,13 @@ struct A;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e-f[`f`]  ¦
+| Name | Description 
 
+| xref:#A-0e-f[`f`] 
+| 
+    
 |===
 
 
@@ -43,7 +47,7 @@ struct A;
 
 
 [#A-0e-f]
-== xref:#A-0e[pass:[A]]::f
+== xref:#A-0e[A]::f
 
 
 
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 76509cd1a..99a58f49f 100644
--- a/test-files/golden-tests/temp/ct_mf_expl_outside.html
+++ b/test-files/golden-tests/temp/ct_mf_expl_outside.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                A 
-                            
+                    NameDescription
        

-        

-                

+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -60,31 +56,28 @@ 
Synopsis

     

 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -103,7 +96,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/temp/ct_mft.adoc b/test-files/golden-tests/temp/ct_mft.adoc
index a1450c27a..03489b9fe 100644
--- a/test-files/golden-tests/temp/ct_mft.adoc
+++ b/test-files/golden-tests/temp/ct_mft.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
+| Name | Description 
 
+| xref:#A[`A`] 
+| 
+    
 |===
 
 
@@ -31,11 +33,13 @@ struct A;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-f[`f`]  ¦
+| Name | Description 
 
+| xref:#A-f[`f`] 
+| 
+    
 |===
 
 
@@ -43,7 +47,7 @@ struct A;
 
 
 [#A-f]
-== xref:#A[pass:[A]]::f
+== xref:#A[A]::f
 
 
 
diff --git a/test-files/golden-tests/temp/ct_mft.html b/test-files/golden-tests/temp/ct_mft.html
index 00aaf2380..c384c8955 100644
--- a/test-files/golden-tests/temp/ct_mft.html
+++ b/test-files/golden-tests/temp/ct_mft.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                A 
-                            
+                    NameDescription
        

-        

-                

+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -60,31 +56,28 @@ 
Synopsis

     

 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -103,7 +96,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
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 2ff7e42ce..bc2da31dc 100644
--- a/test-files/golden-tests/temp/ct_mft_expl_inline.adoc
+++ b/test-files/golden-tests/temp/ct_mft_expl_inline.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
+| Name | Description 
 
+| xref:#A[`A`] 
+| 
+    
 |===
 
 
@@ -31,10 +33,12 @@ struct A;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:A-f[`f`]  ¦
+| Name | Description 
+
+| xref:A-f[`f`] 
+| 
 |===
 
 
@@ -42,7 +46,7 @@ struct A;
 
 [#A-f]
 
-== xref:#A[pass:[A]]::f
+== xref:#A[A]::f
 
   
 
@@ -53,14 +57,14 @@ struct A;
 ----
 template
 void
-xref:#A-f-07[pass:[f]]();
+xref:#A-f-07[f]();
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
 void
-xref:#A-f-04[pass:[f]]();
+xref:#A-f-04[f]();
 ----
   
 
@@ -73,7 +77,7 @@ xref:#A-f-04[pass:[f]]();
 
 
 [#A-f-07]
-== xref:#A[pass:[A]]::f
+== xref:#A[A]::f
 
 
 
@@ -98,7 +102,7 @@ f();
 
 
 [#A-f-04]
-== xref:#A[pass:[A]]::f
+== xref:#A[A]::f
 
 
 
@@ -110,7 +114,7 @@ Declared in ``
 ----
 template<>
 void
-xref:#A-f-07[pass:[f]]();
+xref:#A-f-07[f]();
 ----
 
 
diff --git a/test-files/golden-tests/temp/ct_mft_expl_inline.html b/test-files/golden-tests/temp/ct_mft_expl_inline.html
index aa6f3e1d7..bffceef84 100644
--- a/test-files/golden-tests/temp/ct_mft_expl_inline.html
+++ b/test-files/golden-tests/temp/ct_mft_expl_inline.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -60,30 +56,27 @@ 
Synopsis

     

 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    f 
-                                
-    
        

-            

-                                                                                                    

+                    
+                        f 
+                    
+                        
+                    
+                
+            
+        
+                    
 
 
 
@@ -127,7 +120,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -156,7 +148,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
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 e51f8d50f..8407fc485 100644
--- a/test-files/golden-tests/temp/ct_mft_expl_outside.adoc
+++ b/test-files/golden-tests/temp/ct_mft_expl_outside.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e[`A`]  ¦
+| Name | Description 
 
+| xref:#A-0e[`A`] 
+| 
+    
 |===
 
 
@@ -31,11 +33,13 @@ struct A;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-0e-f[`f`]  ¦
+| Name | Description 
 
+| xref:#A-0e-f[`f`] 
+| 
+    
 |===
 
 
@@ -43,7 +47,7 @@ struct A;
 
 
 [#A-0e-f]
-== xref:#A-0e[pass:[A]]::f
+== xref:#A-0e[A]::f
 
 
 
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 6794a346a..105687d7e 100644
--- a/test-files/golden-tests/temp/ct_mft_expl_outside.html
+++ b/test-files/golden-tests/temp/ct_mft_expl_outside.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                A 
-                            
+                    NameDescription
        

-        

-                

+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -60,31 +56,28 @@ 
Synopsis

     

 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -103,7 +96,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/temp/ft_expl.adoc b/test-files/golden-tests/temp/ft_expl.adoc
index cc151b245..e540a55da 100644
--- a/test-files/golden-tests/temp/ft_expl.adoc
+++ b/test-files/golden-tests/temp/ft_expl.adoc
@@ -6,10 +6,12 @@
 == Global namespace
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:f[`f`]  ¦
+| Name | Description 
+
+| xref:f[`f`] 
+| 
 |===
 
 
@@ -26,14 +28,14 @@
 ----
 template
 void
-xref:#f-03[pass:[f]]();
+xref:#f-03[f]();
 ----
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
 void
-xref:#f-0c[pass:[f]]();
+xref:#f-0c[f]();
 ----
   
 
@@ -83,7 +85,7 @@ Declared in ``
 ----
 template<>
 void
-xref:#f-03[pass:[f]]();
+xref:#f-03[f]();
 ----
 
 
diff --git a/test-files/golden-tests/temp/ft_expl.html b/test-files/golden-tests/temp/ft_expl.html
index d2eed5828..6969f4b1b 100644
--- a/test-files/golden-tests/temp/ft_expl.html
+++ b/test-files/golden-tests/temp/ft_expl.html
@@ -9,30 +9,27 @@
         
Global namespace

     
     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
-                            
-                

                 

-                                    f 
-                                
-    
        

-            

-            

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                    
+                
+            
+        
+    
 
 
 

@@ -74,7 +71,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -103,7 +99,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/type-resolution.adoc b/test-files/golden-tests/type-resolution.adoc
index 7a0b6128f..9d09c6f6b 100644
--- a/test-files/golden-tests/type-resolution.adoc
+++ b/test-files/golden-tests/type-resolution.adoc
@@ -6,114 +6,166 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
-
-¦xref:#B[`B`]  ¦
-
-¦xref:#C[`C`]  ¦
-
-¦xref:#D[`D`]  ¦
-
-¦xref:#E[`E`]  ¦
-
+| Name | Description 
+
+| xref:#A[`A`] 
+| 
+    
+| xref:#B[`B`] 
+| 
+    
+| xref:#C[`C`] 
+| 
+    
+| xref:#D[`D`] 
+| 
+    
+| xref:#E[`E`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f0[`f0`]  ¦
-
-¦xref:#f1[`f1`]  ¦
-
-¦xref:#f2[`f2`]  ¦
-
-¦xref:#f3[`f3`]  ¦
-
-¦xref:#f4[`f4`]  ¦
-
-¦xref:#f5[`f5`]  ¦
-
-¦xref:#f6[`f6`]  ¦
-
-¦xref:#f7[`f7`]  ¦
-
-¦xref:#f8[`f8`]  ¦
-
-¦xref:#g0[`g0`]  ¦
-
-¦xref:#g1[`g1`]  ¦
-
-¦xref:#g2[`g2`]  ¦
-
-¦xref:#g3[`g3`]  ¦
-
-¦xref:#g4[`g4`]  ¦
-
-¦xref:#g5[`g5`]  ¦
-
-¦xref:#g6[`g6`]  ¦
-
-¦xref:#g7[`g7`]  ¦
-
-¦xref:#g8[`g8`]  ¦
-
-¦xref:#h0[`h0`]  ¦
-
-¦xref:#h1[`h1`]  ¦
-
-¦xref:#h2[`h2`]  ¦
-
-¦xref:#h3[`h3`]  ¦
-
-¦xref:#h4[`h4`]  ¦
-
-¦xref:#h5[`h5`]  ¦
-
-¦xref:#h6[`h6`]  ¦
-
-¦xref:#h7[`h7`]  ¦
-
-¦xref:#h8[`h8`]  ¦
-
-¦xref:#i0[`i0`]  ¦
-
-¦xref:#i1[`i1`]  ¦
-
-¦xref:#i2[`i2`]  ¦
-
-¦xref:#i3[`i3`]  ¦
-
-¦xref:#i4[`i4`]  ¦
-
-¦xref:#i5[`i5`]  ¦
-
-¦xref:#i6[`i6`]  ¦
-
-¦xref:#i7[`i7`]  ¦
-
-¦xref:#i8[`i8`]  ¦
-
-¦xref:#j0[`j0`]  ¦
-
-¦xref:#j1[`j1`]  ¦
-
-¦xref:#j2[`j2`]  ¦
-
-¦xref:#j3[`j3`]  ¦
-
-¦xref:#j4[`j4`]  ¦
-
-¦xref:#j5[`j5`]  ¦
-
-¦xref:#j6[`j6`]  ¦
-
-¦xref:#j7[`j7`]  ¦
-
-¦xref:#j8[`j8`]  ¦
-
+| Name | Description 
+
+| xref:#f0[`f0`] 
+| 
+    
+| xref:#f1[`f1`] 
+| 
+    
+| xref:#f2[`f2`] 
+| 
+    
+| xref:#f3[`f3`] 
+| 
+    
+| xref:#f4[`f4`] 
+| 
+    
+| xref:#f5[`f5`] 
+| 
+    
+| xref:#f6[`f6`] 
+| 
+    
+| xref:#f7[`f7`] 
+| 
+    
+| xref:#f8[`f8`] 
+| 
+    
+| xref:#g0[`g0`] 
+| 
+    
+| xref:#g1[`g1`] 
+| 
+    
+| xref:#g2[`g2`] 
+| 
+    
+| xref:#g3[`g3`] 
+| 
+    
+| xref:#g4[`g4`] 
+| 
+    
+| xref:#g5[`g5`] 
+| 
+    
+| xref:#g6[`g6`] 
+| 
+    
+| xref:#g7[`g7`] 
+| 
+    
+| xref:#g8[`g8`] 
+| 
+    
+| xref:#h0[`h0`] 
+| 
+    
+| xref:#h1[`h1`] 
+| 
+    
+| xref:#h2[`h2`] 
+| 
+    
+| xref:#h3[`h3`] 
+| 
+    
+| xref:#h4[`h4`] 
+| 
+    
+| xref:#h5[`h5`] 
+| 
+    
+| xref:#h6[`h6`] 
+| 
+    
+| xref:#h7[`h7`] 
+| 
+    
+| xref:#h8[`h8`] 
+| 
+    
+| xref:#i0[`i0`] 
+| 
+    
+| xref:#i1[`i1`] 
+| 
+    
+| xref:#i2[`i2`] 
+| 
+    
+| xref:#i3[`i3`] 
+| 
+    
+| xref:#i4[`i4`] 
+| 
+    
+| xref:#i5[`i5`] 
+| 
+    
+| xref:#i6[`i6`] 
+| 
+    
+| xref:#i7[`i7`] 
+| 
+    
+| xref:#i8[`i8`] 
+| 
+    
+| xref:#j0[`j0`] 
+| 
+    
+| xref:#j1[`j1`] 
+| 
+    
+| xref:#j2[`j2`] 
+| 
+    
+| xref:#j3[`j3`] 
+| 
+    
+| xref:#j4[`j4`] 
+| 
+    
+| xref:#j5[`j5`] 
+| 
+    
+| xref:#j6[`j6`] 
+| 
+    
+| xref:#j7[`j7`] 
+| 
+    
+| xref:#j8[`j8`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/type-resolution.html b/test-files/golden-tests/type-resolution.html
index 18c637847..0b5f89061 100644
--- a/test-files/golden-tests/type-resolution.html
+++ b/test-files/golden-tests/type-resolution.html
@@ -9,391 +9,385 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
                

-                                B 
-                            
-
-                                    
                

-                                C 
-                            
-
-                                    
                

-                                D 
-                            
-
-                                    
                

-                                E 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                




NameDescription
NameDescription

                 

-                                    f0 
-                                
-
-                                        
                

-                                    f1 
-                                
-
-                                        
                

-                                    f2 
-                                
-
-                                        
                

-                                    f3 
-                                
-
-                                        
                

-                                    f4 
-                                
-
-                                        
                

-                                    f5 
-                                
-
-                                        
                

-                                    f6 
-                                
-
-                                        
                

-                                    f7 
-                                
-
-                                        
                

-                                    f8 
-                                
-
-                                        
                

-                                    g0 
-                                
-
-                                        
                

-                                    g1 
-                                
-
-                                        
                

-                                    g2 
-                                
-
-                                        
                

-                                    g3 
-                                
-
-                                        
                

-                                    g4 
-                                
-
-                                        
                

-                                    g5 
-                                
-
-                                        
                

-                                    g6 
-                                
-
-                                        
                

-                                    g7 
-                                
-
-                                        
                

-                                    g8 
-                                
-
-                                        
                

-                                    h0 
-                                
-
-                                        
                

-                                    h1 
-                                
-
-                                        
                

-                                    h2 
-                                
-
-                                        
                

-                                    h3 
-                                
-
-                                        
                

-                                    h4 
-                                
-
-                                        
                

-                                    h5 
-                                
-
-                                        
                

-                                    h6 
-                                
-
-                                        
                

-                                    h7 
-                                
-
-                                        
                

-                                    h8 
-                                
-
-                                        
                

-                                    i0 
-                                
-
-                                        
                

-                                    i1 
-                                
-
-                                        
                

-                                    i2 
-                                
-
-                                        
                

-                                    i3 
-                                
-
-                                        
                

-                                    i4 
-                                
-
-                                        
                

-                                    i5 
-                                
-
-                                        
                

-                                    i6 
-                                
-
-                                        
                

-                                    i7 
-                                
-
-                                        
                

-                                    i8 
-                                
-
-                                        
                

-                                    j0 
-                                
-
-                                        
                

-                                    j1 
-                                
-
-                                        
                

-                                    j2 
-                                
-
-                                        
                

-                                    j3 
-                                
-
-                                        
                

-                                    j4 
-                                
-
-                                        
                

-                                    j5 
-                                
-
-                                        
                

-                                    j6 
-                                
-
-                                        
                

-                                    j7 
-                                
-
-                                        
                

-                                    j8 
-                                
-
-                                        
        

-            

-            

+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+                    
+                        C 
+                    
+                        
+                            
+                    
+                
+                    
+                        D 
+                    
+                        
+                            
+                    
+                
+                    
+                        E 
+                    
+                        
+                            
+                    
+                
+            
+        
+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+                    
+                
+            
+        
NameDescription

+                        f0 
+                    
+                        
+                            
+                    

+                        f1 
+                    
+                        
+                            
+                    

+                        f2 
+                    
+                        
+                            
+                    

+                        f3 
+                    
+                        
+                            
+                    

+                        f4 
+                    
+                        
+                            
+                    

+                        f5 
+                    
+                        
+                            
+                    

+                        f6 
+                    
+                        
+                            
+                    

+                        f7 
+                    
+                        
+                            
+                    

+                        f8 
+                    
+                        
+                            
+                    

+                        g0 
+                    
+                        
+                            
+                    

+                        g1 
+                    
+                        
+                            
+                    

+                        g2 
+                    
+                        
+                            
+                    

+                        g3 
+                    
+                        
+                            
+                    

+                        g4 
+                    
+                        
+                            
+                    

+                        g5 
+                    
+                        
+                            
+                    

+                        g6 
+                    
+                        
+                            
+                    

+                        g7 
+                    
+                        
+                            
+                    

+                        g8 
+                    
+                        
+                            
+                    

+                        h0 
+                    
+                        
+                            
+                    

+                        h1 
+                    
+                        
+                            
+                    

+                        h2 
+                    
+                        
+                            
+                    

+                        h3 
+                    
+                        
+                            
+                    

+                        h4 
+                    
+                        
+                            
+                    

+                        h5 
+                    
+                        
+                            
+                    

+                        h6 
+                    
+                        
+                            
+                    

+                        h7 
+                    
+                        
+                            
+                    

+                        h8 
+                    
+                        
+                            
+                    

+                        i0 
+                    
+                        
+                            
+                    

+                        i1 
+                    
+                        
+                            
+                    

+                        i2 
+                    
+                        
+                            
+                    

+                        i3 
+                    
+                        
+                            
+                    

+                        i4 
+                    
+                        
+                            
+                    

+                        i5 
+                    
+                        
+                            
+                    

+                        i6 
+                    
+                        
+                            
+                    

+                        i7 
+                    
+                        
+                            
+                    

+                        i8 
+                    
+                        
+                            
+                    

+                        j0 
+                    
+                        
+                            
+                    

+                        j1 
+                    
+                        
+                            
+                    

+                        j2 
+                    
+                        
+                            
+                    

+                        j3 
+                    
+                        
+                            
+                    

+                        j4 
+                    
+                        
+                            
+                    

+                        j5 
+                    
+                        
+                            
+                    

+                        j6 
+                    
+                        
+                            
+                    

+                        j7 
+                    
+                        
+                            
+                    

+                        j8 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -410,7 +404,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -419,7 +412,7 @@ 
Synopsis

     

 
     

-                                                                                                                

+                            
 
 
 
@@ -438,7 +431,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -450,7 +442,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -469,7 +461,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -493,7 +484,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -517,7 +507,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -542,7 +531,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -570,7 +558,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -598,7 +585,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -626,7 +612,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -654,7 +639,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -682,7 +666,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -710,7 +693,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -738,7 +720,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -766,7 +747,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -794,7 +774,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -822,7 +801,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -850,7 +828,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -878,7 +855,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -906,7 +882,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -934,7 +909,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -962,7 +936,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -990,7 +963,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1018,7 +990,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1046,7 +1017,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1074,7 +1044,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1102,7 +1071,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1130,7 +1098,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1158,7 +1125,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1186,7 +1152,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1214,7 +1179,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1242,7 +1206,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1270,7 +1233,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1298,7 +1260,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1326,7 +1287,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1354,7 +1314,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1382,7 +1341,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1410,7 +1368,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1438,7 +1395,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1466,7 +1422,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1494,7 +1449,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1522,7 +1476,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1550,7 +1503,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1578,7 +1530,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1606,7 +1557,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1634,7 +1584,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1662,7 +1611,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1690,7 +1638,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1718,7 +1665,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1746,7 +1692,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -1774,7 +1719,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/union.adoc b/test-files/golden-tests/union.adoc
index 7a5428912..eb5e756b0 100644
--- a/test-files/golden-tests/union.adoc
+++ b/test-files/golden-tests/union.adoc
@@ -6,13 +6,16 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
-
-¦xref:#B[`B`]  ¦
-
+| Name | Description 
+
+| xref:#A[`A`] 
+| 
+    
+| xref:#B[`B`] 
+| 
+    
 |===
 
 
@@ -32,13 +35,16 @@ union A;
 ----
 
 ===  Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-x[`x`] [.small]#[variant member]# ¦
-
-¦xref:#A-y[`y`] [.small]#[variant member]# ¦
-
+| Name | Description 
+
+| xref:#A-x[`x`] [.small]#[variant member]#
+| 
+    
+| xref:#A-y[`y`] [.small]#[variant member]#
+| 
+    
 |===
 
 
@@ -46,7 +52,7 @@ union A;
 
 
 [#A-x]
-== xref:#A[pass:[A]]::x
+== xref:#A[A]::x
 
 
 
@@ -63,7 +69,7 @@ int x;
 
 
 [#A-y]
-== xref:#A[pass:[A]]::y
+== xref:#A[A]::y
 
 
 
@@ -94,15 +100,19 @@ struct B;
 ----
 
 ===  Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#B-x[`x`] [.small]#[variant member]# ¦
-
-¦xref:#B-y[`y`] [.small]#[variant member]# ¦
-
-¦xref:#B-z[`z`]  ¦
-
+| Name | Description 
+
+| xref:#B-x[`x`] [.small]#[variant member]#
+| 
+    
+| xref:#B-y[`y`] [.small]#[variant member]#
+| 
+    
+| xref:#B-z[`z`] 
+| 
+    
 |===
 
 
@@ -110,7 +120,7 @@ struct B;
 
 
 [#B-x]
-== xref:#B[pass:[B]]::x
+== xref:#B[B]::x
 
 
 
@@ -127,7 +137,7 @@ int x;
 
 
 [#B-y]
-== xref:#B[pass:[B]]::y
+== xref:#B[B]::y
 
 
 
@@ -144,7 +154,7 @@ bool y;
 
 
 [#B-z]
-== xref:#B[pass:[B]]::z
+== xref:#B[B]::z
 
 
 
diff --git a/test-files/golden-tests/union.html b/test-files/golden-tests/union.html
index 50785e155..4ac248b0e 100644
--- a/test-files/golden-tests/union.html
+++ b/test-files/golden-tests/union.html
@@ -9,38 +9,35 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-                            
-                            
-                        
-            

                 

-                                A 
-                            
+                    NameDescription
                

-                                B 
-                            
 
-                                    
        

-        

-                

+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -57,7 +54,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -66,38 +62,39 @@ 
Synopsis

     

 
     

-                    

-                
 Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Data Members

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                                
-                                
-                            
-                

                 

-                                    x [variant member]
-                                
+                    NameDescription
                

-                                    y [variant member]
-                                
 
-                                        
        

-            

-                                                                                            

+                
+            
+
+                
+                    
+                        x 
+                            [variant member]
+                        
+                    
+                        
+                            
+                    
+                
+                    
+                        y 
+                            [variant member]
+                        
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -116,7 +113,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -140,7 +136,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -164,7 +159,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -173,45 +167,46 @@ 
Synopsis

     
 
     

-                    

-                
 Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Data Members

+




NameDescription

+            
-                                
-                                
-                            
-                                
-                                
+
 
-                                        
-                            
-                                
-                                
-                            
-                

                 

-                                    x [variant member]
-                                
-
-                                        
                

-                                    y [variant member]
-                                
+                    NameDescription
                

-                                    z 
-                                
 
-                                        
        

-            

-                                                                                            

+                
+            
+
+                
+                    
+                        x 
+                            [variant member]
+                        
+                    
+                        
+                            
+                    
+                
+                    
+                        y 
+                            [variant member]
+                        
+                    
+                        
+                            
+                    
+                
+                    
+                        z 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -230,7 +225,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -254,7 +248,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -278,7 +271,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/using-1.adoc b/test-files/golden-tests/using-1.adoc
index 903e4d00c..57ec3f462 100644
--- a/test-files/golden-tests/using-1.adoc
+++ b/test-files/golden-tests/using-1.adoc
@@ -6,19 +6,23 @@
 == Global namespace
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#LongName[`LongName`]  ¦
+| Name | Description 
 
+| xref:#LongName[`LongName`] 
+| 
+    
 |===
 
 === Using Directives
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#LongName[`LongName`]  ¦
+| Name | Description 
 
+| xref:#LongName[`LongName`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/using-1.html b/test-files/golden-tests/using-1.html
index 8b0d63996..09199a460 100644
--- a/test-files/golden-tests/using-1.html
+++ b/test-files/golden-tests/using-1.html
@@ -9,38 +9,35 @@
         
Global namespace

     
     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                LongName 
-                            
+                    NameDescription
        

-        

-                

+
+                
+            
+
+                
+                    
+                        LongName 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

         
Namespace LongName

     

     

-                        

+            

 
 
 
diff --git a/test-files/golden-tests/using-2.adoc b/test-files/golden-tests/using-2.adoc
index ffa3223d9..9b4dc03ba 100644
--- a/test-files/golden-tests/using-2.adoc
+++ b/test-files/golden-tests/using-2.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 === Namespaces
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#LongName[`LongName`]  ¦
+| Name | Description 
 
+| xref:#LongName[`LongName`] 
+| 
+    
 |===
 
 
@@ -19,19 +21,22 @@
 == LongName
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#LongName-S1[`S1`]  ¦
-
-¦xref:#LongName-S2[`S2`]  ¦
-
+| Name | Description 
+
+| xref:#LongName-S1[`S1`] 
+| 
+    
+| xref:#LongName-S2[`S2`] 
+| 
+    
 |===
 
 
 
 [#LongName-S1]
-== xref:#LongName[pass:[LongName]]::S1
+== xref:#LongName[LongName]::S1
 
 
 
@@ -50,7 +55,7 @@ struct S1;
 
 
 [#LongName-S2]
-== xref:#LongName[pass:[LongName]]::S2
+== xref:#LongName[LongName]::S2
 
 
 
diff --git a/test-files/golden-tests/using-2.html b/test-files/golden-tests/using-2.html
index 562885dd3..4ee8276ce 100644
--- a/test-files/golden-tests/using-2.html
+++ b/test-files/golden-tests/using-2.html
@@ -9,69 +9,63 @@
         
Global namespace

     
     

-        

-            
Namespaces

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
Namespaces

+




NameDescription

+            
-                            
-                            
-                        
-            

                 

-                                LongName 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        LongName 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

         
Namespace LongName

     

     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                S1 
-                            
-
-                                    
                

-                                S2 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        S1 
+                    
+                        
+                            
+                    
+                
+                    
+                        S2 
+                    
+                        
+                            
+                    
+                
+            
+        
+    

 
 

     

@@ -88,7 +82,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -97,7 +90,7 @@ 
Synopsis

     

 
     

-                                                                                                                

+                            
 
 
 
@@ -116,7 +109,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -125,7 +117,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+                            
 
 
 
@@ -144,7 +136,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -182,7 +173,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/using-3.adoc b/test-files/golden-tests/using-3.adoc
index c372b568a..a7504f548 100644
--- a/test-files/golden-tests/using-3.adoc
+++ b/test-files/golden-tests/using-3.adoc
@@ -6,15 +6,19 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A[`A`]  ¦
-
-¦xref:#B[`B`]  ¦
-
-¦xref:#C[`C`]  ¦
-
+| Name | Description 
+
+| xref:#A[`A`] 
+| 
+    
+| xref:#B[`B`] 
+| 
+    
+| xref:#C[`C`] 
+| 
+    
 |===
 
 
@@ -34,11 +38,13 @@ struct A;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-f[`f`]  ¦
+| Name | Description 
 
+| xref:#A-f[`f`] 
+| 
+    
 |===
 
 
@@ -46,7 +52,7 @@ struct A;
 
 
 [#A-f]
-== xref:#A[pass:[A]]::f
+== xref:#A[A]::f
 
 
 
@@ -84,11 +90,13 @@ struct B;
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#B-f[`f`]  ¦
+| Name | Description 
 
+| xref:#B-f[`f`] 
+| 
+    
 |===
 
 
@@ -96,7 +104,7 @@ struct B;
 
 
 [#B-f]
-== xref:#B[pass:[B]]::f
+== xref:#B[B]::f
 
 
 
@@ -136,19 +144,24 @@ struct C
 ----
 
 ===  Member Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:A-f[`f`]  ¦
+| Name | Description 
+
+| xref:A-f[`f`] 
+| 
 |===
 ===  Using Declarations
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C-f-08[`f`]  ¦
-
-¦xref:#C-f-03[`f`]  ¦
-
+| Name | Description 
+
+| xref:#C-f-08[`f`] 
+| 
+    
+| xref:#C-f-03[`f`] 
+| 
+    
 |===
 
 
@@ -156,7 +169,7 @@ struct C
 
 
 [#C-f-08]
-== xref:#C[pass:[C]]::f
+== xref:#C[C]::f
 
 
 
@@ -181,7 +194,7 @@ using xref:#A[A]::f;
 
 
 [#C-f-03]
-== xref:#C[pass:[C]]::f
+== xref:#C[C]::f
 
 
 
diff --git a/test-files/golden-tests/using-3.html b/test-files/golden-tests/using-3.html
index 0615c0168..6d3e914b4 100644
--- a/test-files/golden-tests/using-3.html
+++ b/test-files/golden-tests/using-3.html
@@ -9,45 +9,42 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                A 
-                            
-
-                                    
                

-                                B 
-                            
-
-                                    
                

-                                C 
-                            
-
-                                    
        

-        

-                

+                    Name
+Description
+
+
+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+                    
+                        B 
+                    
+                        
+                            
+                    
+                
+                    
+                        C 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -64,7 +61,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -73,31 +69,28 @@ 
Synopsis

     

 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -116,7 +109,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -144,7 +136,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -153,31 +144,28 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
        

-            

-                                                                                                    

+
+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -196,7 +184,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -224,7 +211,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -235,61 +221,55 @@ 
Synopsis

     
 
     

-            

-                
 Member Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Member Functions

+




NameDescription

+            
+                
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                
NameDescription

                 

-                                    f 
-                                
-    
        

-            

-                        

-                
 Using Declarations

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+                
+            
+        




NameDescription

+                        f 
+                    
+                        
+                    

+
 Using Declarations

+
+            
-                                
-                                
+
 
-                                        
-                            
-                                
-                                
-                            
-                

                 

-                                    f 
-                                
+                    NameDescription
                

-                                    f 
-                                
 
-                                        
        

-            

-                                                                            

+                
+            
+
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+                    
+                        f 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -308,7 +288,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -346,7 +325,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/utf-8.adoc b/test-files/golden-tests/utf-8.adoc
index 09e3a68ab..192601975 100644
--- a/test-files/golden-tests/utf-8.adoc
+++ b/test-files/golden-tests/utf-8.adoc
@@ -6,11 +6,13 @@
 == Global namespace
 
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#Христос_воскрес[`Христос_воскрес`]  ¦
+| Name | Description 
 
+| xref:#Христос_воскрес[`Христос_воскрес`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/utf-8.html b/test-files/golden-tests/utf-8.html
index 8fb1b195c..1e5358568 100644
--- a/test-files/golden-tests/utf-8.html
+++ b/test-files/golden-tests/utf-8.html
@@ -9,31 +9,28 @@
         
Global namespace

     
     

-            

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
Functions

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                

                 

-                                    Христос_воскрес 
-                                
+                    NameDescription
        

-            

-            

+
+                
+            
+
+                
+                    
+                        Христос_воскрес 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -50,7 +47,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
diff --git a/test-files/golden-tests/var-template.adoc b/test-files/golden-tests/var-template.adoc
index ae681b9f0..be274af64 100644
--- a/test-files/golden-tests/var-template.adoc
+++ b/test-files/golden-tests/var-template.adoc
@@ -6,22 +6,28 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#B[`B`]  ¦
+| Name | Description 
 
+| xref:#B[`B`] 
+| 
+    
 |===
 === Variables
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#A-084[`A`]  ¦
-
-¦xref:#A-08e[`A`]  ¦
-
-¦xref:#A-01[`A`]  ¦
-
+| Name | Description 
+
+| xref:#A-084[`A`] 
+| 
+    
+| xref:#A-08e[`A`] 
+| 
+    
+| xref:#A-01[`A`] 
+| 
+    
 |===
 
 
@@ -56,7 +62,7 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
-unsigned int xref:#A-084[pass:[A]] = 0;
+unsigned int xref:#A-084[A] = 0;
 ----
 
 
@@ -74,7 +80,7 @@ Declared in ``
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template
-unsigned int xref:#A-084[pass:[A]] = sizeof(T);
+unsigned int xref:#A-084[A] = sizeof(T);
 ----
 
 
@@ -95,15 +101,19 @@ struct B;
 ----
 
 ===  Static Data Members
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#B-C-0e[`C`]  ¦
-
-¦xref:#B-C-05[`C`]  ¦
-
-¦xref:#B-C-0c[`C`]  ¦
-
+| Name | Description 
+
+| xref:#B-C-0e[`C`] 
+| 
+    
+| xref:#B-C-05[`C`] 
+| 
+    
+| xref:#B-C-0c[`C`] 
+| 
+    
 |===
 
 
@@ -111,7 +121,7 @@ struct B;
 
 
 [#B-C-0e]
-== xref:#B[pass:[B]]::C
+== xref:#B[B]::C
 
 
 
@@ -130,7 +140,7 @@ unsigned int C = 0;
 
 
 [#B-C-05]
-== xref:#B[pass:[B]]::C
+== xref:#B[B]::C
 
 
 
@@ -142,14 +152,14 @@ Declared in ``
 ----
 template<>
 static
-unsigned int xref:#B-C-0e[pass:[C]] = -1;
+unsigned int xref:#B-C-0e[C] = -1;
 ----
 
 
 
 
 [#B-C-0c]
-== xref:#B[pass:[B]]::C
+== xref:#B[B]::C
 
 
 
@@ -161,7 +171,7 @@ Declared in ``
 ----
 template
 static
-unsigned int xref:#B-C-0e[pass:[C]] = sizeof(T);
+unsigned int xref:#B-C-0e[C] = sizeof(T);
 ----
 
 
diff --git a/test-files/golden-tests/var-template.html b/test-files/golden-tests/var-template.html
index 78c880ea5..80a925647 100644
--- a/test-files/golden-tests/var-template.html
+++ b/test-files/golden-tests/var-template.html
@@ -9,69 +9,63 @@
         
Global namespace

     

     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
+
 
-                                    
-                        
-            

                 

-                                B 
-                            
+                    NameDescription
        

-        

-        

-                
Variables

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
-                
-                                
-                                
-                            
-                                
-                                
+            
+
+                
+                    
+                
+            
+        




NameDescription

-                                    A 
-                                
 
-                                        
                

-                                    A 
-                                
+                

+                        B 
+                    
+                        
+                            
+                    

+
Variables

+
+            
+                
+                    
+
 
-                                        
-                            
-                                
-                                
-                            
-                
NameDescription
                

-                                    A 
-                                
 
-                                        
        

-            

-        

+                
+            
+
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+                    
+                        A 
+                    
+                        
+                            
+                    
+                
+            
+        
+    
 
 

     

@@ -88,7 +82,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -113,7 +106,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -138,7 +130,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -163,7 +154,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -172,45 +162,42 @@ 
Synopsis

     
 
     

-                        

-                
 Static Data Members

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+        
 Static Data Members

+




NameDescription

+            
-                                
-                                
+
 
-                                        
-                            
-                                
-                                
-                            
-                                
-                                
-                            
-                

                 

-                                    C 
-                                
+                    NameDescription
                

-                                    C 
-                                
 
-                                        
                

-                                    C 
-                                
-
-                                        
        

-            

-                                                                                        

+                
+            
+
+                
+                    
+                        C 
+                    
+                        
+                            
+                    
+                
+                    
+                        C 
+                    
+                        
+                            
+                    
+                
+                    
+                        C 
+                    
+                        
+                            
+                    
+                
+            
+        
+                    
 
 
 
@@ -229,7 +216,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -255,7 +241,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -281,7 +266,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
diff --git a/test-files/golden-tests/variadic-function.adoc b/test-files/golden-tests/variadic-function.adoc
index a5fd66184..24748ac40 100644
--- a/test-files/golden-tests/variadic-function.adoc
+++ b/test-files/golden-tests/variadic-function.adoc
@@ -6,24 +6,31 @@
 == Global namespace
 
 ===  Types
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#C[`C`]  ¦
-
-¦xref:#T[`T`]  ¦
-
-¦xref:#U[`U`]  ¦
-
+| Name | Description 
+
+| xref:#C[`C`] 
+| 
+    
+| xref:#T[`T`] 
+| 
+    
+| xref:#U[`U`] 
+| 
+    
 |===
 === Functions
-[cols=2,separator=¦]
+[cols=2]
 |===
-¦Name ¦Description
-¦xref:#f[`f`]  ¦
-
-¦xref:#g[`g`]  ¦
-
+| Name | Description 
+
+| xref:#f[`f`] 
+| 
+    
+| xref:#g[`g`] 
+| 
+    
 |===
 
 
diff --git a/test-files/golden-tests/variadic-function.html b/test-files/golden-tests/variadic-function.html
index 96e9ea7e0..7aa3e9fc6 100644
--- a/test-files/golden-tests/variadic-function.html
+++ b/test-files/golden-tests/variadic-function.html
@@ -9,76 +9,70 @@
         
Global namespace

     
     

-        

-            
 Types

-            
-                -                    -                    -                
-                
-                    
-                        
-                        
-                    
-                
-                
+        
 Types

+




NameDescription

+            
-                            
-                            
-                        
-                            
-                            
-                        
-                            
-                            
-                        
-            

                 

-                                C 
-                            
-
-                                    
                

-                                T 
-                            
-
-                                    
                

-                                U 
-                            
-
-                                    
        

-        

-    

-                
Functions

-                
-                    -                        -                        -                    
-                    
-                        
-                            
-                            
-                        
-                    
-                    
+                    
+
+
+
+                
+            
+
-                                
-                                
-                            
-                                
-                                
-                            
-                




NameDescription
NameDescription

                 

-                                    f 
-                                
-
-                                        
                

-                                    g 
-                                
-
-                                        
        

-            

-            

+                    
+                        C 
+                    
+                        
+                            
+                    
+                
+                    
+                        T 
+                    
+                        
+                            
+                    
+                
+                    
+                        U 
+                    
+                        
+                            
+                    
+                
+            
+        
+
Functions

+
+            
+                
+                    
+
+
+
+                
+            
+
+                
+                    
+                
+                    
+                
+            
+        
NameDescription

+                        f 
+                    
+                        
+                            
+                    

+                        g 
+                    
+                        
+                            
+                    

+    
 
 

     

@@ -95,7 +89,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -119,7 +112,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         

         
@@ -143,7 +135,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -171,7 +162,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -199,7 +189,6 @@ 
Synopsis

                         Declared in 
                     
                 

-                
             
         
         
@@ -211,7 +200,7 @@ 
Synopsis

     
 
     

-                                                                                                                

+