yard 0.9.41 → 0.9.43
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +16 -0
- data/docs/Parser.md +17 -42
- data/lib/yard/handlers/rbs/attribute_handler.rb +44 -8
- data/lib/yard/server/commands/base.rb +1 -1
- data/lib/yard/server/templates/default/fulldoc/html/css/custom.css +168 -88
- data/lib/yard/server/templates/default/fulldoc/html/js/autocomplete.js +202 -207
- data/lib/yard/version.rb +1 -1
- data/templates/default/fulldoc/html/css/common.css +1 -1
- data/templates/default/fulldoc/html/css/full_list.css +201 -53
- data/templates/default/fulldoc/html/css/style.css +980 -412
- data/templates/default/fulldoc/html/js/app.js +800 -639
- data/templates/default/fulldoc/html/js/full_list.js +333 -371
- data/templates/default/layout/html/layout.erb +2 -1
- data/templates/guide/fulldoc/html/css/style.css +347 -97
- data/templates/guide/fulldoc/html/js/app.js +61 -64
- data/templates/guide/layout/html/layout.erb +67 -68
- metadata +2 -2
|
@@ -4,13 +4,14 @@
|
|
|
4
4
|
<%= erb(:headers) %>
|
|
5
5
|
</head>
|
|
6
6
|
<body>
|
|
7
|
+
<div id="main_progress" aria-hidden="true"></div>
|
|
8
|
+
|
|
7
9
|
<div class="nav_wrap">
|
|
8
10
|
<iframe id="nav" src="<%= @nav_url %>?1"></iframe>
|
|
9
11
|
<div id="resizer"></div>
|
|
10
12
|
</div>
|
|
11
13
|
|
|
12
14
|
<div id="main" tabindex="-1">
|
|
13
|
-
<div id="main_progress" aria-hidden="true"></div>
|
|
14
15
|
<div id="header">
|
|
15
16
|
<%= erb(:breadcrumb) %>
|
|
16
17
|
<%= erb(:search) %>
|
|
@@ -1,108 +1,358 @@
|
|
|
1
|
-
body {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
#
|
|
31
|
-
|
|
32
|
-
#
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
.
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
.
|
|
45
|
-
.
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
1
|
+
body {
|
|
2
|
+
color: #3e4349;
|
|
3
|
+
font-family: Georgia, serif;
|
|
4
|
+
font-size: 17px;
|
|
5
|
+
margin: 0;
|
|
6
|
+
}
|
|
7
|
+
h1,
|
|
8
|
+
h2,
|
|
9
|
+
h3,
|
|
10
|
+
h4,
|
|
11
|
+
h5,
|
|
12
|
+
h6 {
|
|
13
|
+
font-weight: normal;
|
|
14
|
+
color: #000;
|
|
15
|
+
font-family: Georgia, serif;
|
|
16
|
+
}
|
|
17
|
+
h1 {
|
|
18
|
+
color: #040;
|
|
19
|
+
}
|
|
20
|
+
h2 {
|
|
21
|
+
color: #060;
|
|
22
|
+
}
|
|
23
|
+
h3 {
|
|
24
|
+
color: #070;
|
|
25
|
+
}
|
|
26
|
+
h4 {
|
|
27
|
+
color: #080;
|
|
28
|
+
}
|
|
29
|
+
h5 {
|
|
30
|
+
color: #090;
|
|
31
|
+
}
|
|
32
|
+
#sidebar h2 {
|
|
33
|
+
color: #2f2;
|
|
34
|
+
}
|
|
35
|
+
strong {
|
|
36
|
+
color: #000;
|
|
37
|
+
}
|
|
38
|
+
.object_link,
|
|
39
|
+
tt,
|
|
40
|
+
code {
|
|
41
|
+
font-family: "Consolas", "BitStream Vera Sans Mono", monospace;
|
|
42
|
+
font-size: 14px;
|
|
43
|
+
}
|
|
44
|
+
.method_header .path,
|
|
45
|
+
.module_header .path {
|
|
46
|
+
font-family: "Consolas", "BitStream Vera Sans Mono", monospace;
|
|
47
|
+
}
|
|
48
|
+
.method_header .path.space,
|
|
49
|
+
.module_header .path.space {
|
|
50
|
+
padding-left: 5px;
|
|
51
|
+
}
|
|
52
|
+
.method_header {
|
|
53
|
+
font-size: 0.95em;
|
|
54
|
+
}
|
|
55
|
+
.method_body {
|
|
56
|
+
margin-left: 2em;
|
|
57
|
+
}
|
|
58
|
+
.tags h3,
|
|
59
|
+
.tags h4 {
|
|
60
|
+
font-size: 0.9em;
|
|
61
|
+
font-weight: bold;
|
|
62
|
+
color: #3e4349;
|
|
63
|
+
}
|
|
64
|
+
.tags .param .name {
|
|
65
|
+
font-style: italic;
|
|
66
|
+
}
|
|
67
|
+
.tags .option .name {
|
|
68
|
+
font-family: monospace;
|
|
69
|
+
color: #000;
|
|
70
|
+
font-size: 0.8em;
|
|
71
|
+
}
|
|
72
|
+
.tags .option .type,
|
|
73
|
+
.tags .param .type {
|
|
74
|
+
font-size: 10px;
|
|
75
|
+
vertical-align: super;
|
|
76
|
+
}
|
|
77
|
+
.tags .option .type tt,
|
|
78
|
+
.tags .param .type tt,
|
|
79
|
+
.tags .option .type tt .object_link,
|
|
80
|
+
.tags .param .type tt .object_link {
|
|
81
|
+
font-size: 10px;
|
|
82
|
+
}
|
|
83
|
+
.module_methods {
|
|
84
|
+
margin-left: 2em;
|
|
85
|
+
}
|
|
86
|
+
.method_header .since,
|
|
87
|
+
.module_header .since {
|
|
88
|
+
font-size: 0.75em;
|
|
89
|
+
color: #888;
|
|
90
|
+
vertical-align: super;
|
|
91
|
+
}
|
|
92
|
+
ul {
|
|
93
|
+
list-style: square;
|
|
94
|
+
}
|
|
95
|
+
.inline {
|
|
96
|
+
display: inline;
|
|
97
|
+
}
|
|
98
|
+
.inline p:first-child {
|
|
99
|
+
display: inline;
|
|
100
|
+
}
|
|
101
|
+
.inline p {
|
|
102
|
+
font-family: Georgia, serif;
|
|
103
|
+
font-size: 16px;
|
|
104
|
+
color: #3e4349;
|
|
105
|
+
}
|
|
106
|
+
.docstring table,
|
|
107
|
+
#filecontents table {
|
|
108
|
+
border-collapse: collapse;
|
|
109
|
+
}
|
|
110
|
+
.docstring table th,
|
|
111
|
+
.docstring table td,
|
|
112
|
+
#filecontents table th,
|
|
113
|
+
#filecontents table td {
|
|
114
|
+
border: 1px solid #ccc;
|
|
115
|
+
padding: 8px;
|
|
116
|
+
padding-right: 17px;
|
|
117
|
+
}
|
|
118
|
+
.docstring table tr:nth-child(odd),
|
|
119
|
+
#filecontents table tr:nth-child(odd) {
|
|
120
|
+
background: #eee;
|
|
121
|
+
}
|
|
122
|
+
.docstring table tr:nth-child(even),
|
|
123
|
+
#filecontents table tr:nth-child(even) {
|
|
124
|
+
background: #fff;
|
|
125
|
+
}
|
|
126
|
+
.docstring table th,
|
|
127
|
+
#filecontents table th {
|
|
128
|
+
background: #fff;
|
|
129
|
+
}
|
|
130
|
+
.docstring .note {
|
|
131
|
+
margin: 1em 0;
|
|
132
|
+
}
|
|
133
|
+
.docstring h1,
|
|
134
|
+
.docstring h2,
|
|
135
|
+
.docstring h3,
|
|
136
|
+
.docstring h4 {
|
|
137
|
+
padding: 0;
|
|
138
|
+
border: 0;
|
|
139
|
+
border-bottom: 1px dotted #bbb;
|
|
140
|
+
}
|
|
141
|
+
.docstring h1 {
|
|
142
|
+
font-size: 1.2em;
|
|
143
|
+
}
|
|
144
|
+
.docstring h2 {
|
|
145
|
+
font-size: 1.1em;
|
|
146
|
+
}
|
|
147
|
+
.docstring h3 {
|
|
148
|
+
font-size: 1.1em;
|
|
149
|
+
}
|
|
150
|
+
.docstring h4 {
|
|
151
|
+
font-size: 1em;
|
|
152
|
+
font-weight: bold;
|
|
153
|
+
}
|
|
154
|
+
.docstring h5 {
|
|
155
|
+
font-size: 1em;
|
|
156
|
+
font-weight: bold;
|
|
157
|
+
}
|
|
158
|
+
.docstring h6 {
|
|
159
|
+
font-size: 1em;
|
|
160
|
+
font-weight: bold;
|
|
161
|
+
}
|
|
162
|
+
#filecontents strong {
|
|
163
|
+
font-weight: normal;
|
|
164
|
+
color: #000;
|
|
165
|
+
}
|
|
166
|
+
.readonly {
|
|
167
|
+
font-size: 0.75em;
|
|
168
|
+
color: #888;
|
|
169
|
+
vertical-align: super;
|
|
170
|
+
}
|
|
171
|
+
.rdoc-term {
|
|
172
|
+
padding-right: 25px;
|
|
173
|
+
font-weight: bold;
|
|
174
|
+
}
|
|
175
|
+
.rdoc-list p {
|
|
176
|
+
margin: 0;
|
|
177
|
+
padding: 0;
|
|
178
|
+
margin-bottom: 4px;
|
|
179
|
+
}
|
|
68
180
|
|
|
181
|
+
#page {
|
|
182
|
+
width: 940px;
|
|
183
|
+
margin: 0px auto;
|
|
184
|
+
}
|
|
185
|
+
a {
|
|
186
|
+
color: #268;
|
|
187
|
+
text-decoration: none;
|
|
188
|
+
}
|
|
189
|
+
a:hover {
|
|
190
|
+
color: #6ae;
|
|
191
|
+
}
|
|
192
|
+
#top_nav {
|
|
193
|
+
background: #7d0;
|
|
194
|
+
padding: 8px 12px;
|
|
195
|
+
}
|
|
196
|
+
#inner_nav {
|
|
197
|
+
width: 940px;
|
|
198
|
+
margin: 0px auto;
|
|
199
|
+
}
|
|
200
|
+
#inner_nav a {
|
|
201
|
+
border: 0;
|
|
202
|
+
text-decoration: none;
|
|
203
|
+
color: #777;
|
|
204
|
+
}
|
|
205
|
+
#inner_nav a:hover {
|
|
206
|
+
color: #222;
|
|
207
|
+
}
|
|
208
|
+
#top_nav .links {
|
|
209
|
+
display: block;
|
|
210
|
+
float: right;
|
|
211
|
+
}
|
|
212
|
+
#content {
|
|
213
|
+
margin-left: 30px;
|
|
214
|
+
width: 660px;
|
|
215
|
+
float: left;
|
|
216
|
+
}
|
|
217
|
+
#sidebar {
|
|
218
|
+
float: left;
|
|
219
|
+
width: 200px;
|
|
220
|
+
padding: 18px 10px;
|
|
221
|
+
padding-top: 0;
|
|
222
|
+
}
|
|
223
|
+
#sidebar h2 {
|
|
224
|
+
font-weight: 100;
|
|
225
|
+
color: #3e4349;
|
|
226
|
+
font-size: 1.45em;
|
|
227
|
+
}
|
|
228
|
+
#sidebar ol {
|
|
229
|
+
padding-left: 16px;
|
|
230
|
+
margin-left: 0;
|
|
231
|
+
list-style: square;
|
|
232
|
+
}
|
|
233
|
+
#sidebar a {
|
|
234
|
+
color: #468;
|
|
235
|
+
text-decoration: none;
|
|
236
|
+
}
|
|
237
|
+
#sidebar a:hover {
|
|
238
|
+
color: #000;
|
|
239
|
+
background: #8e0;
|
|
240
|
+
padding: 4px;
|
|
241
|
+
}
|
|
242
|
+
#sidebar ol.top {
|
|
243
|
+
padding-left: 0;
|
|
244
|
+
margin-left: 0;
|
|
245
|
+
list-style: none;
|
|
246
|
+
}
|
|
247
|
+
#sidebar a {
|
|
248
|
+
font-size: 0.9em;
|
|
249
|
+
}
|
|
250
|
+
#footer {
|
|
251
|
+
margin: 0 auto;
|
|
252
|
+
width: 940px;
|
|
253
|
+
text-align: center;
|
|
254
|
+
margin-top: 30px;
|
|
255
|
+
padding: 20px 0;
|
|
256
|
+
color: #888;
|
|
257
|
+
font-size: 0.8em;
|
|
258
|
+
border-top: 1px dotted #bbb;
|
|
259
|
+
}
|
|
260
|
+
#footer a {
|
|
261
|
+
color: #444;
|
|
262
|
+
}
|
|
69
263
|
/* syntax highlighting */
|
|
70
|
-
.source_code {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
264
|
+
.source_code {
|
|
265
|
+
display: none;
|
|
266
|
+
padding: 3px 8px;
|
|
267
|
+
border-left: 8px solid #ddd;
|
|
268
|
+
margin-top: 5px;
|
|
269
|
+
}
|
|
270
|
+
pre.code {
|
|
271
|
+
color: #3e4349;
|
|
272
|
+
}
|
|
273
|
+
pre.code a {
|
|
274
|
+
border-bottom: 1px dotted #bbf;
|
|
275
|
+
}
|
|
276
|
+
.docstring pre.code,
|
|
277
|
+
#filecontents pre.code,
|
|
278
|
+
.source_code pre {
|
|
279
|
+
font-family: monospace;
|
|
280
|
+
}
|
|
281
|
+
.docstring pre.code,
|
|
282
|
+
#filecontents pre.code {
|
|
283
|
+
display: block;
|
|
284
|
+
}
|
|
285
|
+
.source_code .lines {
|
|
286
|
+
padding-right: 12px;
|
|
287
|
+
color: #555;
|
|
288
|
+
text-align: right;
|
|
289
|
+
}
|
|
290
|
+
.docstring pre.code,
|
|
291
|
+
#filecontents pre.code,
|
|
75
292
|
.tags pre.example {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
pre.code {
|
|
85
|
-
|
|
86
|
-
|
|
293
|
+
font-size: 0.9em;
|
|
294
|
+
padding: 7px 30px;
|
|
295
|
+
margin: 15px -30px;
|
|
296
|
+
margin-left: -30px;
|
|
297
|
+
background: #eee;
|
|
298
|
+
line-height: 1.3em;
|
|
299
|
+
font-family: "Consolas", "BitStream Vera Sans Mono", monospace;
|
|
300
|
+
}
|
|
301
|
+
pre.code .info.file {
|
|
302
|
+
color: #555;
|
|
303
|
+
}
|
|
304
|
+
pre.code .val {
|
|
305
|
+
color: #036a07;
|
|
306
|
+
}
|
|
87
307
|
pre.code .tstring_content,
|
|
88
|
-
pre.code .heredoc_beg,
|
|
89
|
-
pre.code .
|
|
90
|
-
pre.code .
|
|
91
|
-
pre.code .
|
|
92
|
-
pre.code .
|
|
308
|
+
pre.code .heredoc_beg,
|
|
309
|
+
pre.code .heredoc_end,
|
|
310
|
+
pre.code .qwords_beg,
|
|
311
|
+
pre.code .qwords_end,
|
|
312
|
+
pre.code .tstring,
|
|
313
|
+
pre.code .dstring {
|
|
314
|
+
color: #036a07;
|
|
315
|
+
}
|
|
316
|
+
pre.code .fid,
|
|
317
|
+
pre.code .rubyid_new,
|
|
318
|
+
pre.code .rubyid_to_s,
|
|
319
|
+
pre.code .rubyid_to_sym,
|
|
320
|
+
pre.code .rubyid_to_f,
|
|
93
321
|
pre.code .dot + pre.code .id,
|
|
94
|
-
pre.code .rubyid_to_i pre.code .rubyid_each {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
pre.code .
|
|
322
|
+
pre.code .rubyid_to_i pre.code .rubyid_each {
|
|
323
|
+
color: #0085ff;
|
|
324
|
+
}
|
|
325
|
+
pre.code .comment {
|
|
326
|
+
color: #0066ff;
|
|
327
|
+
}
|
|
328
|
+
pre.code .const,
|
|
329
|
+
pre.code .constant {
|
|
330
|
+
color: #585cf6;
|
|
331
|
+
}
|
|
332
|
+
pre.code .symbol {
|
|
333
|
+
color: #c5060b;
|
|
334
|
+
}
|
|
98
335
|
pre.code .kw,
|
|
99
336
|
pre.code .label,
|
|
100
337
|
pre.code .rubyid_require,
|
|
101
338
|
pre.code .rubyid_extend,
|
|
102
|
-
pre.code .rubyid_include {
|
|
103
|
-
|
|
339
|
+
pre.code .rubyid_include {
|
|
340
|
+
color: #0000ff;
|
|
341
|
+
}
|
|
342
|
+
pre.code .ivar {
|
|
343
|
+
color: #318495;
|
|
344
|
+
}
|
|
104
345
|
pre.code .gvar,
|
|
105
346
|
pre.code .rubyid_backref,
|
|
106
|
-
pre.code .rubyid_nth_ref {
|
|
107
|
-
|
|
108
|
-
|
|
347
|
+
pre.code .rubyid_nth_ref {
|
|
348
|
+
color: #6d79de;
|
|
349
|
+
}
|
|
350
|
+
pre.code .regexp,
|
|
351
|
+
.dregexp {
|
|
352
|
+
color: #036a07;
|
|
353
|
+
}
|
|
354
|
+
#links strong {
|
|
355
|
+
font-size: 0.95em;
|
|
356
|
+
font-weight: normal;
|
|
357
|
+
color: #000;
|
|
358
|
+
}
|
|
@@ -1,64 +1,61 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
if (!hasEntries) return;
|
|
63
|
-
tocRoot.appendChild(topLevel);
|
|
64
|
-
}
|
|
1
|
+
window.generateTOC = () => {
|
|
2
|
+
const fileContents = document.getElementById("filecontents");
|
|
3
|
+
const tocRoot = document.getElementById("toc");
|
|
4
|
+
const topLevel = document.createElement("ol");
|
|
5
|
+
let currentList = topLevel;
|
|
6
|
+
let lastLevel = 1;
|
|
7
|
+
let currentItem = null;
|
|
8
|
+
let counter = 0;
|
|
9
|
+
let hasEntries = false;
|
|
10
|
+
|
|
11
|
+
if (!fileContents || !tocRoot) return;
|
|
12
|
+
|
|
13
|
+
topLevel.className = "top";
|
|
14
|
+
const headings = fileContents.querySelectorAll(
|
|
15
|
+
":scope > h1, :scope > h2, :scope > h3, :scope > h4, :scope > h5, :scope > h6",
|
|
16
|
+
);
|
|
17
|
+
|
|
18
|
+
Array.prototype.forEach.call(headings, (heading) => {
|
|
19
|
+
let level;
|
|
20
|
+
|
|
21
|
+
if (heading.id === "filecontents") return;
|
|
22
|
+
hasEntries = true;
|
|
23
|
+
level = parseInt(heading.tagName.substring(1), 10);
|
|
24
|
+
|
|
25
|
+
if (!heading.id) {
|
|
26
|
+
let proposedId = heading.textContent.replace(/[^a-z0-9-]/gi, "_");
|
|
27
|
+
if (document.getElementById(proposedId)) proposedId += counter++;
|
|
28
|
+
heading.id = proposedId;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
if (level > lastLevel) {
|
|
32
|
+
while (level > lastLevel) {
|
|
33
|
+
if (!currentItem) {
|
|
34
|
+
currentItem = document.createElement("li");
|
|
35
|
+
currentList.appendChild(currentItem);
|
|
36
|
+
}
|
|
37
|
+
const nestedList = document.createElement("ol");
|
|
38
|
+
currentItem.appendChild(nestedList);
|
|
39
|
+
currentList = nestedList;
|
|
40
|
+
currentItem = null;
|
|
41
|
+
lastLevel += 1;
|
|
42
|
+
}
|
|
43
|
+
} else if (level < lastLevel) {
|
|
44
|
+
while (level < lastLevel && currentList.parentElement) {
|
|
45
|
+
currentList = currentList.parentElement.parentElement;
|
|
46
|
+
lastLevel -= 1;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
const item = document.createElement("li");
|
|
51
|
+
const link = document.createElement("a");
|
|
52
|
+
link.href = `#${heading.id}`;
|
|
53
|
+
link.textContent = heading.textContent;
|
|
54
|
+
item.appendChild(link);
|
|
55
|
+
currentList.appendChild(item);
|
|
56
|
+
currentItem = item;
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
if (!hasEntries) return;
|
|
60
|
+
tocRoot.appendChild(topLevel);
|
|
61
|
+
};
|