Skip to content

Commit d577ae5

Browse files
committed
Doc update
1 parent 7c64374 commit d577ae5

File tree

2 files changed

+32
-80
lines changed

2 files changed

+32
-80
lines changed

CHANGELOG.md

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
1.5.0
22
-----
33

4+
- Fixed bugs:
5+
6+
- Git Issue #644: flatten/unflatten does not preserve arrays with more than 10 elements
7+
8+
- Git Issue #652: Fixed issue with JSON Schema **AdditionalProperties** validator
9+
10+
- Git Issue #653: Fixed issue with non existing default values being added in JSON Schema patch
11+
12+
- Git Issue #659: Fixed jsonschema validation message
13+
414
- Changes
515

616
- `jsonpointer::unflatten` now throws an exception if passed an empty object
@@ -14,7 +24,7 @@
1424
argument have been deprecated and will be removed in a future release. Use the
1525
`allow_trailing_comma` and `allow_comments` options instead.
1626

17-
- The functors `strict_json_parsing` and `allow_trailing_commas have been deprecated and
27+
- The functors `strict_json_parsing` and `allow_trailing_commas` have been deprecated and
1828
will be removed in a future release. Use the `allow_trailing_comma` and `allow_comments`
1929
options instead.
2030

@@ -47,17 +57,6 @@
4757

4858
- Git Discussions #660: Added reflection traits for read/write of enum values as integers.
4959

50-
- Fixed bug:
51-
52-
- Git Issue #644: flatten/unflatten does not preserve arrays with more than 10 elements
53-
54-
- Git Issue #652: Fixed issue with JSON Schema **AdditionalProperties** validator
55-
56-
- Git Issue #653: Fixed issue with non existing default values being added in JSON Schema patch
57-
58-
- Git Issue #659: Fixed jsonschema validation message
59-
60-
6160
1.4.3
6261
-----
6362

doc/ref/corelib/basic_json_options.md

Lines changed: 21 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -370,18 +370,18 @@ int main()
370370

371371
std::cout << "multi_line: (default)" << '\n';
372372
auto options1 = json_options{}
373-
.object_array_line_splits(line_split_kind::multi_line);
374-
std::cout << pretty_print(j, options1) << '\n';
373+
.object_array_line_splits(line_split_kind::multi_line);
374+
std::cout << pretty_print(j, options1) << "\n\n";
375375

376376
std::cout << "same_line: " << '\n';
377377
auto options2 = json_options{}
378-
.object_array_line_splits(line_split_kind::same_line);
379-
std::cout << pretty_print(j, options2) << '\n';
378+
.object_array_line_splits(line_split_kind::same_line);
379+
std::cout << pretty_print(j, options2) << "\n\n";
380380

381381
std::cout << "new_ine:" << '\n';
382382
auto options3 = json_options{}
383-
.object_array_line_splits(line_split_kind::new_line);
384-
std::cout << pretty_print(j, options3) << '\n';
383+
.object_array_line_splits(line_split_kind::new_line);
384+
std::cout << pretty_print(j, options3) << "\n\n";
385385
}
386386
```
387387

@@ -406,12 +406,14 @@ multi_line: (default)
406406
3
407407
]
408408
}
409+
409410
same_line:
410411
{
411412
"normals": [1, 0, 1],
412413
"uvs": [0, 0, 1, 1],
413414
"verts": [1, 2, 3]
414415
}
416+
415417
new_ine:
416418
{
417419
"normals": [
@@ -439,30 +441,25 @@ using namespace jsoncons;
439441
int main()
440442
{
441443
json j;
442-
j["data"]["id"] = json(json_array_arg, {0, 1, 2, 3, 4, 5, 6, 7});
444+
j["data"]["id"] = json(json_array_arg, {0, 1, 2});
443445
j["data"]["item"] = json(json_array_arg, {json(json_array_arg, {2}),
444446
json(json_array_arg, {4, 5, 2, 3}),
445-
json(json_array_arg, {4}),
446-
json(json_array_arg, {4, 5, 2, 3}),
447-
json(json_array_arg, {2}),
448-
json(json_array_arg, {4, 5, 3}),
449-
json(json_array_arg, {2}),
450-
json(json_array_arg, {4, 3})});
447+
json(json_array_arg, {4})});
451448

452-
std::cout << "multi_line (default):" << '\n';
449+
std::cout << "multi_line (default):" << "\n";
453450
auto options1 = json_options{}
454451
.array_array_line_splits(line_split_kind::multi_line);
455-
std::cout << pretty_print(j, options1) << '\n';
452+
std::cout << pretty_print(j, options1) << "\n\n";
456453

457454
std::cout << "same_line:" << '\n';
458455
auto options2 = json_options{}
459456
.array_array_line_splits(line_split_kind::same_line);
460-
std::cout << pretty_print(j, options2) << '\n';
457+
std::cout << pretty_print(j, options2) << "\n\n";
461458

462459
std::cout << "new_line" << '\n';
463460
auto options3 = json_options{}
464461
.array_array_line_splits(line_split_kind::new_line);
465-
std::cout << pretty_print(j, options3) << '\n';
462+
std::cout << pretty_print(j, options3) << "\n\n";
466463
}
467464
```
468465

@@ -474,12 +471,7 @@ multi_line (default):
474471
"id": [
475472
0,
476473
1,
477-
2,
478-
3,
479-
4,
480-
5,
481-
6,
482-
7
474+
2
483475
],
484476
"item": [
485477
[
@@ -493,78 +485,39 @@ multi_line (default):
493485
],
494486
[
495487
4
496-
],
497-
[
498-
4,
499-
5,
500-
2,
501-
3
502-
],
503-
[
504-
2
505-
],
506-
[
507-
4,
508-
5,
509-
3
510-
],
511-
[
512-
2
513-
],
514-
[
515-
4,
516-
3
517488
]
518489
]
519490
}
520491
}
492+
521493
same_line:
522494
{
523495
"data": {
524496
"id": [
525497
0,
526498
1,
527-
2,
528-
3,
529-
4,
530-
5,
531-
6,
532-
7
499+
2
533500
],
534501
"item": [
535502
[2],
536503
[4, 5, 2, 3],
537-
[4],
538-
[4, 5, 2, 3],
539-
[2],
540-
[4, 5, 3],
541-
[2],
542-
[4, 3]
504+
[4]
543505
]
544506
}
545507
}
508+
546509
new_line
547510
{
548511
"data": {
549512
"id": [
550513
0,
551514
1,
552-
2,
553-
3,
554-
4,
555-
5,
556-
6,
557-
7
515+
2
558516
],
559517
"item": [
560518
[2],
561519
[4, 5, 2, 3],
562-
[4],
563-
[4, 5, 2, 3],
564-
[2],
565-
[4, 5, 3],
566-
[2],
567-
[4, 3]
520+
[4]
568521
]
569522
}
570523
}

0 commit comments

Comments
 (0)