fix(HandlebarsGenerator): sync HTML helper templates

cppalliance · Nov 21, 2024 · 12bbc1d · 12bbc1d
1 parent 3cce490
commit 12bbc1d
Show file tree

Hide file tree

Showing 236 changed files with 14,323 additions and 15,076 deletions.
diff --git 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
@@ -0,0 +1 @@
+xref:{{href}}[{{> @partial-block }}]
diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/code.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/code.adoc.hbs
@@ -0,0 +1 @@
+`{{> @partial-block }}`
diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/h.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/h.adoc.hbs
@@ -0,0 +1 @@
+={{select level (repeat "=" level) (select @root.config.multipage "==" "=")}} {{> @partial-block }}
diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/p.adoc.hbs 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
@@ -0,0 +1 @@
+{{#if class}}[.{{class}}]#{{/if}}{{> @partial-block }}{{#if class}}#{{/if}}
diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/table.adoc.hbs 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
@@ -0,0 +1 @@
+{{> @partial-block }}
diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/td.adoc.hbs 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
@@ -0,0 +1 @@
+| {{> @partial-block }} 
diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/thead.adoc.hbs 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
@@ -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
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
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
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
diff --git a/share/mrdocs/addons/generator/adoc/partials/types/source.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/types/source.adoc.hbs
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
diff --git a/share/mrdocs/addons/generator/common/partials/symbol.hbs b/share/mrdocs/addons/generator/common/partials/symbol.hbs
@@ -0,0 +1 @@
+{{> (concat 'symbols' '/' (lookup symbol 'kind')) symbol=symbol }}
diff --git a/.../partials/types/declarator-after.adoc.hbs → ...ommon/partials/types/declarator-after.hbs b/.../partials/types/declarator-after.adoc.hbs → ...ommon/partials/types/declarator-after.hbs
diff --git a/...partials/types/declarator-before.adoc.hbs → ...mmon/partials/types/declarator-before.hbs b/...partials/types/declarator-before.adoc.hbs → ...mmon/partials/types/declarator-before.hbs
diff --git a/...doc/partials/types/declarator-id.adoc.hbs → ...r/common/partials/types/declarator-id.hbs b/...doc/partials/types/declarator-id.adoc.hbs → ...r/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/...r/adoc/partials/types/declarator.adoc.hbs → ...ator/common/partials/types/declarator.hbs b/...r/adoc/partials/types/declarator.adoc.hbs → ...ator/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
@@ -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
@@ -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}}
diff --git a/...or/html/partials/types/name-info.html.hbs → ...rator/common/partials/types/name-info.hbs b/...or/html/partials/types/name-info.html.hbs → ...rator/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))}}<a href="{{symbol.ref}}">{{name}}</a>{{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~}}
diff --git a/...ials/types/nested-name-specifier.adoc.hbs → .../partials/types/nested-name-specifier.hbs b/...ials/types/nested-name-specifier.adoc.hbs → .../partials/types/nested-name-specifier.hbs
diff --git a/...ml/partials/types/qualified-path.html.hbs → .../common/partials/types/qualified-path.hbs b/...ml/partials/types/qualified-path.html.hbs → .../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)}}<a href="{{symbol.ref}}">{{symbol.name}}</a>{{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}}
diff --git a/share/mrdocs/addons/generator/common/partials/types/source.hbs 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
@@ -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}}
diff --git a/...adoc/partials/types/template-arg.adoc.hbs → ...or/common/partials/types/template-arg.hbs b/...adoc/partials/types/template-arg.adoc.hbs → ...or/common/partials/types/template-arg.hbs
diff --git a/...doc/partials/types/template-args.adoc.hbs → ...r/common/partials/types/template-args.hbs b/...doc/partials/types/template-args.adoc.hbs → ...r/common/partials/types/template-args.hbs
diff --git a/...doc/partials/types/template-head.adoc.hbs → ...r/common/partials/types/template-head.hbs b/...doc/partials/types/template-head.adoc.hbs → ...r/common/partials/types/template-head.hbs
diff --git a/...oc/partials/types/template-param.adoc.hbs → .../common/partials/types/template-param.hbs b/...oc/partials/types/template-param.adoc.hbs → .../common/partials/types/template-param.hbs
diff --git a/...ator/adoc/partials/types/tranche.adoc.hbs → ...nerator/common/partials/types/tranche.hbs b/...ator/adoc/partials/types/tranche.adoc.hbs → ...nerator/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
@@ -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
@@ -0,0 +1 @@
+<a href="{{href}}">{{> @partial-block }}</a>
diff --git a/share/mrdocs/addons/generator/html/partials/markup/code.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/code.html.hbs
@@ -0,0 +1 @@
+<code>{{> @partial-block }}</code>
diff --git a/share/mrdocs/addons/generator/html/partials/markup/h.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/h.html.hbs
@@ -0,0 +1 @@
+<h{{or level 3}}{{#if class}} class="{{class}}"{{/if}}>{{> @partial-block }}</h{{or level 3}}>
diff --git a/share/mrdocs/addons/generator/html/partials/markup/p.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/p.html.hbs
@@ -0,0 +1,4 @@
+<p>
+    {{> @partial-block }}
+
+</p>
diff --git a/share/mrdocs/addons/generator/html/partials/markup/span.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/span.html.hbs
@@ -0,0 +1,4 @@
+<span{{#if class}} class="{{class}}"{{/if}}>
+    {{> @partial-block }}
+
+</span>
diff --git a/share/mrdocs/addons/generator/html/partials/markup/table.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/table.html.hbs
@@ -0,0 +1,4 @@
+<table style="table-layout: fixed; width: 100%;">
+    {{> @partial-block }}
+
+</table>
diff --git a/share/mrdocs/addons/generator/html/partials/markup/tbody.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/tbody.html.hbs
@@ -0,0 +1,4 @@
+<tbody>
+    {{> @partial-block }}
+
+</tbody>
diff --git a/share/mrdocs/addons/generator/html/partials/markup/td.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/td.html.hbs
@@ -0,0 +1,4 @@
+<td>
+    {{> @partial-block }}
+
+</td>
diff --git a/share/mrdocs/addons/generator/html/partials/markup/th.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/th.html.hbs
@@ -0,0 +1 @@
+<th>{{> @partial-block }}</th>
diff --git a/share/mrdocs/addons/generator/html/partials/markup/thead.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/thead.html.hbs
@@ -0,0 +1,4 @@
+<thead>
+    {{> @partial-block }}
+
+</thead>
diff --git a/share/mrdocs/addons/generator/html/partials/markup/tr.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/tr.html.hbs
@@ -0,0 +1,4 @@
+<tr>
+    {{> @partial-block }}
+
+</tr>
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
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
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
diff --git a/share/mrdocs/addons/generator/html/partials/types/declarator.html.hbs b/share/mrdocs/addons/generator/html/partials/types/declarator.html.hbs
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
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
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
diff --git a/share/mrdocs/addons/generator/html/partials/types/source.html.hbs b/share/mrdocs/addons/generator/html/partials/types/source.html.hbs
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
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
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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		={{select level (repeat "=" level) (select @root.config.multipage "==" "=")}} {{> @partial-block }}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{{#if class}}[.{{class}}]#{{/if}}{{> @partial-block }}{{#if class}}#{{/if}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{{> (concat 'symbols' '/' (lookup symbol 'kind')) symbol=symbol }}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<h{{or level 3}}{{#if class}} class="{{class}}"{{/if}}>{{> @partial-block }}</h{{or level 3}}>