Skip to content

Commit b305f67

Browse files
committed
no empty column templates
#style
1 parent 351658e commit b305f67

File tree

160 files changed

+2770
-6059
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+2770
-6059
lines changed

share/mrdocs/addons/generator/common/partials/symbol/detail/members-table-row.hbs

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
{{! Member name, linked to its documentation }}
55
{{#>markup/a href=url}}{{#>markup/code}}{{>symbol/name . nolink=true}}{{/markup/code}}{{/markup/a}} {{>symbol/special-function-suffix .}}
66
{{~/markup/td}}
7+
{{#if (eq includeBrief true)}}
78
{{#>markup/td}}
89
{{#if (ne kind "overloads")~}}
910
{{{~doc.brief}}}
1011
{{else~}}
1112
{{#each (unique (pluck (pluck members "doc") "brief"))~}}
1213
{{{.}}}
1314
{{/each~}}
15+
{{/if~}}
16+
{{~/markup/td~}}
1417
{{/if}}
15-
{{~/markup/td}}
1618
{{~/markup/tr}}

share/mrdocs/addons/generator/common/partials/symbol/members-table.hbs

+16-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
--}}
1414
{{#if (any_of_by members "isRegular" "isSeeBelow")}}
1515
{{#>markup/h level=(select @root.config.multipage 1 2)}}{{title}}{{/markup/h}}
16+
{{#if (any_of_by members "doc")}}
1617
{{#>markup/table cols=2}}
1718
{{#>markup/thead}}
1819
{{#>markup/tr~}}
@@ -22,8 +23,22 @@
2223
{{/markup/thead}}
2324
{{#>markup/tbody}}
2425
{{#each (filter_by (sort_by members "name") "isRegular" "isSeeBelow")}}
25-
{{> symbol/detail/members-table-row .}}
26+
{{> symbol/detail/members-table-row . includeBrief=true}}
2627
{{/each}}
2728
{{/markup/tbody}}
2829
{{/markup/table}}
30+
{{else}}
31+
{{#>markup/table cols=1}}
32+
{{#>markup/thead}}
33+
{{#>markup/tr~}}
34+
{{#>markup/th}}Name{{/markup/th}}
35+
{{/markup/tr}}
36+
{{/markup/thead}}
37+
{{#>markup/tbody}}
38+
{{#each (filter_by (sort_by members "name") "isRegular" "isSeeBelow")}}
39+
{{> symbol/detail/members-table-row . includeBrief=false}}
40+
{{/each}}
41+
{{/markup/tbody}}
42+
{{/markup/table}}
43+
{{/if}}
2944
{{/if}}

test-files/golden-tests/core/libcxx.adoc

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77

88
=== Namespaces
99

10-
[cols=2]
10+
[cols=1]
1111
|===
12-
| Name | Description
12+
| Name
1313

1414
| <<std,`std`>>
15-
|
16-
1715
|===
1816
=== Functions
1917

test-files/golden-tests/core/libcxx.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@ <h2>Namespaces</h2>
1313
<table style="table-layout: fixed; width: 100%;">
1414
<thead>
1515
<tr>
16-
<th>Name</th><th>Description</th>
16+
<th>Name</th>
1717
</tr>
1818
</thead>
1919
<tbody>
2020
<tr>
21-
<td><a href="#std"><code>std</code></a> </td><td>
22-
</td></tr>
21+
<td><a href="#std"><code>std</code></a> </td></tr>
2322
</tbody>
2423
</table>
2524
<h2>Functions</h2>

test-files/golden-tests/core/utf-8.adoc

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77

88
=== Functions
99

10-
[cols=2]
10+
[cols=1]
1111
|===
12-
| Name | Description
12+
| Name
1313

1414
| <<Христос_воскрес,`Христос&lowbar;воскрес`>>
15-
|
16-
1715
|===
1816

1917
[#Христос_воскрес]

test-files/golden-tests/core/utf-8.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@ <h2>Functions</h2>
1313
<table style="table-layout: fixed; width: 100%;">
1414
<thead>
1515
<tr>
16-
<th>Name</th><th>Description</th>
16+
<th>Name</th>
1717
</tr>
1818
</thead>
1919
<tbody>
2020
<tr>
21-
<td><a href="#Христос_воскрес"><code>Христос_воскрес</code></a> </td><td>
22-
</td></tr>
21+
<td><a href="#Христос_воскрес"><code>Христос_воскрес</code></a> </td></tr>
2322
</tbody>
2423
</table>
2524
</div>

test-files/golden-tests/filters/file/include-self.adoc

+4-8
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77

88
=== Namespaces
99

10-
[cols=2]
10+
[cols=1]
1111
|===
12-
| Name | Description
12+
| Name
1313

1414
| <<TEST,`TEST`>>
15-
|
16-
1715
|===
1816

1917
[#TEST]
@@ -22,13 +20,11 @@
2220

2321
=== Types
2422

25-
[cols=2]
23+
[cols=1]
2624
|===
27-
| Name | Description
25+
| Name
2826

2927
| <<TEST-SUCCESS,`SUCCESS`>>
30-
|
31-
3228
|===
3329

3430
[#TEST-SUCCESS]

test-files/golden-tests/filters/file/include-self.html

+4-6
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@ <h2>Namespaces</h2>
1313
<table style="table-layout: fixed; width: 100%;">
1414
<thead>
1515
<tr>
16-
<th>Name</th><th>Description</th>
16+
<th>Name</th>
1717
</tr>
1818
</thead>
1919
<tbody>
2020
<tr>
21-
<td><a href="#TEST"><code>TEST</code></a> </td><td>
22-
</td></tr>
21+
<td><a href="#TEST"><code>TEST</code></a> </td></tr>
2322
</tbody>
2423
</table>
2524
</div>
@@ -31,13 +30,12 @@ <h2>Types</h2>
3130
<table style="table-layout: fixed; width: 100%;">
3231
<thead>
3332
<tr>
34-
<th>Name</th><th>Description</th>
33+
<th>Name</th>
3534
</tr>
3635
</thead>
3736
<tbody>
3837
<tr>
39-
<td><a href="#TEST-SUCCESS"><code>SUCCESS</code></a> </td><td>
40-
</td></tr>
38+
<td><a href="#TEST-SUCCESS"><code>SUCCESS</code></a> </td></tr>
4139
</tbody>
4240
</table>
4341
</div>

test-files/golden-tests/filters/symbol-name/blacklist_0.adoc

+14-38
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,14 @@
77

88
=== Namespaces
99

10-
[cols=2]
10+
[cols=1]
1111
|===
12-
| Name | Description
12+
| Name
1313

1414
| <<N0,`N0`>>
15-
|
16-
1715
| <<N3,`N3`>>
18-
|
19-
2016
| <<N4,`N4`>>
21-
|
22-
2317
| <<N7,`N7`>>
24-
|
25-
2618
|===
2719

2820
[#N0]
@@ -31,13 +23,11 @@
3123

3224
=== Functions
3325

34-
[cols=2]
26+
[cols=1]
3527
|===
36-
| Name | Description
28+
| Name
3729

3830
| <<N0-f0,`f0`>>
39-
|
40-
4131
|===
4232

4333
[#N0-f0]
@@ -66,16 +56,12 @@ f0();
6656

6757
=== Namespaces
6858

69-
[cols=2]
59+
[cols=1]
7060
|===
71-
| Name | Description
61+
| Name
7262

7363
| <<N4-N5,`N5`>>
74-
|
75-
7664
| <<N4-N6,`N6`>>
77-
|
78-
7965
|===
8066

8167
[#N4-N5]
@@ -84,13 +70,11 @@ f0();
8470

8571
=== Functions
8672

87-
[cols=2]
73+
[cols=1]
8874
|===
89-
| Name | Description
75+
| Name
9076

9177
| <<N4-N5-f1,`f1`>>
92-
|
93-
9478
|===
9579

9680
[#N4-N5-f1]
@@ -114,13 +98,11 @@ f1();
11498

11599
=== Functions
116100

117-
[cols=2]
101+
[cols=1]
118102
|===
119-
| Name | Description
103+
| Name
120104

121105
| <<N4-N6-f1,`f1`>>
122-
|
123-
124106
|===
125107

126108
[#N4-N6-f1]
@@ -144,16 +126,12 @@ f1();
144126

145127
=== Namespaces
146128

147-
[cols=2]
129+
[cols=1]
148130
|===
149-
| Name | Description
131+
| Name
150132

151133
| <<N7-N8,`N8`>>
152-
|
153-
154134
| <<N7-N9,`N9`>>
155-
|
156-
157135
|===
158136

159137
[#N7-N8]
@@ -167,13 +145,11 @@ f1();
167145

168146
=== Functions
169147

170-
[cols=2]
148+
[cols=1]
171149
|===
172-
| Name | Description
150+
| Name
173151

174152
| <<N7-N9-g0,`g0`>>
175-
|
176-
177153
|===
178154

179155
[#N7-N9-g0]

0 commit comments

Comments
 (0)