Commit f92c661bd15394805449fdcc9c540cbd391e059c

Baptiste 2024-08-09T16:50:29

rework: still wip

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
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
diff --git a/libkc3/buf_inspect_s.c.in b/libkc3/buf_inspect_s.c.in
index 16a9768..948255e 100644
--- a/libkc3/buf_inspect_s.c.in
+++ b/libkc3/buf_inspect_s.c.in
@@ -46,14 +46,14 @@ sw buf_inspect_s_bits$ (s_buf *buf, const s_bits$ *s)
   return result;
 }
 
-sw buf_inspect_s_bits$_size (const s_bits$ *s)
+sw buf_inspect_s_bits$_size (s_pretty *pretty, const s_bits$ *s)
 {
   sw r;
   sw result = 0;
   u_bits$ u;
   if (g_buf_inspect_type != &g_sym_S_bits$ &&
       cast_needed_s_bits$(*s)) {
-    if ((r = buf_inspect_paren_sym_size(&g_sym_S_bits$)) < 0)
+    if ((r = buf_inspect_paren_sym_size(pretty, &g_sym_S_bits$)) < 0)
       return r;
     result += r;
     result += strlen(" ");
diff --git a/libkc3/buf_inspect_s16.c b/libkc3/buf_inspect_s16.c
index b0e05fe..1d22cdd 100644
--- a/libkc3/buf_inspect_s16.c
+++ b/libkc3/buf_inspect_s16.c
@@ -46,14 +46,14 @@ sw buf_inspect_s16 (s_buf *buf, const s16 *s)
   return result;
 }
 
-sw buf_inspect_s16_size (const s16 *s)
+sw buf_inspect_s16_size (s_pretty *pretty, const s16 *s)
 {
   sw r;
   sw result = 0;
   u16 u;
   if (g_buf_inspect_type != &g_sym_S16 &&
       cast_needed_s16(*s)) {
-    if ((r = buf_inspect_paren_sym_size(&g_sym_S16)) < 0)
+    if ((r = buf_inspect_paren_sym_size(pretty, &g_sym_S16)) < 0)
       return r;
     result += r;
     result += strlen(" ");
diff --git a/libkc3/buf_inspect_s32.c b/libkc3/buf_inspect_s32.c
index 73a36ad..5e9b075 100644
--- a/libkc3/buf_inspect_s32.c
+++ b/libkc3/buf_inspect_s32.c
@@ -46,14 +46,14 @@ sw buf_inspect_s32 (s_buf *buf, const s32 *s)
   return result;
 }
 
-sw buf_inspect_s32_size (const s32 *s)
+sw buf_inspect_s32_size (s_pretty *pretty, const s32 *s)
 {
   sw r;
   sw result = 0;
   u32 u;
   if (g_buf_inspect_type != &g_sym_S32 &&
       cast_needed_s32(*s)) {
-    if ((r = buf_inspect_paren_sym_size(&g_sym_S32)) < 0)
+    if ((r = buf_inspect_paren_sym_size(pretty, &g_sym_S32)) < 0)
       return r;
     result += r;
     result += strlen(" ");
diff --git a/libkc3/buf_inspect_s64.c b/libkc3/buf_inspect_s64.c
index 1cc1f25..54bf247 100644
--- a/libkc3/buf_inspect_s64.c
+++ b/libkc3/buf_inspect_s64.c
@@ -46,14 +46,14 @@ sw buf_inspect_s64 (s_buf *buf, const s64 *s)
   return result;
 }
 
-sw buf_inspect_s64_size (const s64 *s)
+sw buf_inspect_s64_size (s_pretty *pretty, const s64 *s)
 {
   sw r;
   sw result = 0;
   u64 u;
   if (g_buf_inspect_type != &g_sym_S64 &&
       cast_needed_s64(*s)) {
-    if ((r = buf_inspect_paren_sym_size(&g_sym_S64)) < 0)
+    if ((r = buf_inspect_paren_sym_size(pretty, &g_sym_S64)) < 0)
       return r;
     result += r;
     result += strlen(" ");
diff --git a/libkc3/buf_inspect_s8.c b/libkc3/buf_inspect_s8.c
index c7644ee..33682a3 100644
--- a/libkc3/buf_inspect_s8.c
+++ b/libkc3/buf_inspect_s8.c
@@ -46,14 +46,14 @@ sw buf_inspect_s8 (s_buf *buf, const s8 *s)
   return result;
 }
 
-sw buf_inspect_s8_size (const s8 *s)
+sw buf_inspect_s8_size (s_pretty *pretty, const s8 *s)
 {
   sw r;
   sw result = 0;
   u8 u;
   if (g_buf_inspect_type != &g_sym_S8 &&
       cast_needed_s8(*s)) {
-    if ((r = buf_inspect_paren_sym_size(&g_sym_S8)) < 0)
+    if ((r = buf_inspect_paren_sym_size(pretty, &g_sym_S8)) < 0)
       return r;
     result += r;
     result += strlen(" ");
diff --git a/libkc3/buf_inspect_sw.c b/libkc3/buf_inspect_sw.c
index 5db60af..59df1ab 100644
--- a/libkc3/buf_inspect_sw.c
+++ b/libkc3/buf_inspect_sw.c
@@ -46,14 +46,14 @@ sw buf_inspect_sw (s_buf *buf, const sw *s)
   return result;
 }
 
-sw buf_inspect_sw_size (const sw *s)
+sw buf_inspect_sw_size (s_pretty *pretty, const sw *s)
 {
   sw r;
   sw result = 0;
   uw u;
   if (g_buf_inspect_type != &g_sym_Sw &&
       cast_needed_sw(*s)) {
-    if ((r = buf_inspect_paren_sym_size(&g_sym_Sw)) < 0)
+    if ((r = buf_inspect_paren_sym_size(pretty, &g_sym_Sw)) < 0)
       return r;
     result += r;
     result += strlen(" ");
diff --git a/libkc3/buf_inspect_u.c.in b/libkc3/buf_inspect_u.c.in
index 9ed7851..cf71184 100644
--- a/libkc3/buf_inspect_u.c.in
+++ b/libkc3/buf_inspect_u.c.in
@@ -21,26 +21,26 @@
 #include "str.h"
 #include "sym.h"
 
-sw buf_inspect_u_bits$ (s_buf *buf, const u_bits$ *u)
+sw buf_inspect_u_bits$ (s_pretty *pretty, s_buf *buf, const u_bits$ *u)
 {
   sw r;
   sw result = 0;
   if (g_buf_inspect_type != &g_sym_U_bits$ &&
       cast_needed_u_bits$(*u)) {
-    if ((r = buf_inspect_paren_sym(buf, &g_sym_U_bits$)) < 0)
+    if ((r = buf_inspect_paren_sym(pretty, buf, &g_sym_U_bits$)) < 0)
       return r;
     result += r;
     if ((r = buf_write_1(buf, " ")) < 0)
       return r;
     result += r;
   }
-  if ((r = buf_inspect_u_bits$_base(buf, &g_kc3_base_decimal, u)) < 0)
+  if ((r = buf_inspect_u_bits$_base(pretty, buf, &g_kc3_base_decimal, u)) < 0)
     return r;
   result += r;
   return result;
 }
 
-sw buf_inspect_u_bits$_base (s_buf *buf,
+sw buf_inspect_u_bits$_base (s_pretty *pretty, s_buf *buf,
                              const s_str *base,
                              const u_bits$ *u)
 {
@@ -60,7 +60,7 @@ sw buf_inspect_u_bits$_base (s_buf *buf,
       return -1;
     return buf_write_character_utf8(buf, zero);
   }
-  size = buf_inspect_u_bits$_base_digits(base, u);
+  size = buf_inspect_u_bits$_base_digits(pretty, base, u);
   c = alloc(size * sizeof(character));
   buf_save_init(buf, &save);
   radix = base->size;
@@ -89,7 +89,7 @@ sw buf_inspect_u_bits$_base (s_buf *buf,
   return r;
 }
 
-sw buf_inspect_u_bits$_base_digits (const s_str *base,
+sw buf_inspect_u_bits$_base_digits (s_pretty *pretty, const s_str *base,
                                     const u_bits$ *u)
 {
   uw radix;
@@ -106,7 +106,7 @@ sw buf_inspect_u_bits$_base_digits (const s_str *base,
   return size;
 }
 
-sw buf_inspect_u_bits$_base_size (const s_str *base,
+sw buf_inspect_u_bits$_base_size (s_pretty *pretty, const s_str *base,
                                   const u_bits$ *u)
 {
   character c;
@@ -123,23 +123,23 @@ sw buf_inspect_u_bits$_base_size (const s_str *base,
     u_ /= radix;
     if (str_character(base, digit, &c) < 0)
       return -1;
-    result += buf_inspect_str_character_size(&c);
+    result += buf_inspect_str_character_size(pretty, &c);
   }
   return result;
 }
 
-sw buf_inspect_u_bits$_size (const u_bits$ *u)
+sw buf_inspect_u_bits$_size (s_pretty *pretty, const u_bits$ *u)
 {
   sw r;
   sw result = 0;
   if (g_buf_inspect_type != &g_sym_U_bits$ &&
       cast_needed_u_bits$(*u)) {
-    if ((r = buf_inspect_paren_sym_size(&g_sym_U_bits$)) < 0)
+    if ((r = buf_inspect_paren_sym_size(pretty, &g_sym_U_bits$)) < 0)
       return r;
     result += r;
     result += strlen(" ");
   }
-  if ((r = buf_inspect_u_bits$_base_size(&g_kc3_base_decimal, u)) < 0)
+  if ((r = buf_inspect_u_bits$_base_size(pretty, &g_kc3_base_decimal, u)) < 0)
     return r;
   result += r;
   return result;
diff --git a/libkc3/buf_inspect_u16.c b/libkc3/buf_inspect_u16.c
index d4358be..4cbc7e0 100644
--- a/libkc3/buf_inspect_u16.c
+++ b/libkc3/buf_inspect_u16.c
@@ -21,26 +21,26 @@
 #include "str.h"
 #include "sym.h"
 
-sw buf_inspect_u16 (s_buf *buf, const u16 *u)
+sw buf_inspect_u16 (s_pretty *pretty, s_buf *buf, const u16 *u)
 {
   sw r;
   sw result = 0;
   if (g_buf_inspect_type != &g_sym_U16 &&
       cast_needed_u16(*u)) {
-    if ((r = buf_inspect_paren_sym(buf, &g_sym_U16)) < 0)
+    if ((r = buf_inspect_paren_sym(pretty, buf, &g_sym_U16)) < 0)
       return r;
     result += r;
     if ((r = buf_write_1(buf, " ")) < 0)
       return r;
     result += r;
   }
-  if ((r = buf_inspect_u16_base(buf, &g_kc3_base_decimal, u)) < 0)
+  if ((r = buf_inspect_u16_base(pretty, buf, &g_kc3_base_decimal, u)) < 0)
     return r;
   result += r;
   return result;
 }
 
-sw buf_inspect_u16_base (s_buf *buf,
+sw buf_inspect_u16_base (s_pretty *pretty, s_buf *buf,
                              const s_str *base,
                              const u16 *u)
 {
@@ -60,7 +60,7 @@ sw buf_inspect_u16_base (s_buf *buf,
       return -1;
     return buf_write_character_utf8(buf, zero);
   }
-  size = buf_inspect_u16_base_digits(base, u);
+  size = buf_inspect_u16_base_digits(pretty, base, u);
   c = alloc(size * sizeof(character));
   buf_save_init(buf, &save);
   radix = base->size;
@@ -89,7 +89,7 @@ sw buf_inspect_u16_base (s_buf *buf,
   return r;
 }
 
-sw buf_inspect_u16_base_digits (const s_str *base,
+sw buf_inspect_u16_base_digits (s_pretty *pretty, const s_str *base,
                                     const u16 *u)
 {
   uw radix;
@@ -106,7 +106,7 @@ sw buf_inspect_u16_base_digits (const s_str *base,
   return size;
 }
 
-sw buf_inspect_u16_base_size (const s_str *base,
+sw buf_inspect_u16_base_size (s_pretty *pretty, const s_str *base,
                                   const u16 *u)
 {
   character c;
@@ -123,23 +123,23 @@ sw buf_inspect_u16_base_size (const s_str *base,
     u_ /= radix;
     if (str_character(base, digit, &c) < 0)
       return -1;
-    result += buf_inspect_str_character_size(&c);
+    result += buf_inspect_str_character_size(pretty, &c);
   }
   return result;
 }
 
-sw buf_inspect_u16_size (const u16 *u)
+sw buf_inspect_u16_size (s_pretty *pretty, const u16 *u)
 {
   sw r;
   sw result = 0;
   if (g_buf_inspect_type != &g_sym_U16 &&
       cast_needed_u16(*u)) {
-    if ((r = buf_inspect_paren_sym_size(&g_sym_U16)) < 0)
+    if ((r = buf_inspect_paren_sym_size(pretty, &g_sym_U16)) < 0)
       return r;
     result += r;
     result += strlen(" ");
   }
-  if ((r = buf_inspect_u16_base_size(&g_kc3_base_decimal, u)) < 0)
+  if ((r = buf_inspect_u16_base_size(pretty, &g_kc3_base_decimal, u)) < 0)
     return r;
   result += r;
   return result;
diff --git a/libkc3/buf_inspect_u16_binary.c b/libkc3/buf_inspect_u16_binary.c
index f3df679..7d742f9 100644
--- a/libkc3/buf_inspect_u16_binary.c
+++ b/libkc3/buf_inspect_u16_binary.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_u16_binary (s_buf *buf, const u16 *u)
+sw buf_inspect_u16_binary (s_pretty *pretty, s_buf *buf, const u16 *u)
 {
-  return buf_inspect_u16_base(buf,
+  return buf_inspect_u16_base(pretty, buf,
                                   &g_kc3_base_binary,
                                   u);
 }
 
-sw buf_inspect_u16_binary_size (const u16 *u)
+sw buf_inspect_u16_binary_size (s_pretty *pretty, const u16 *u)
 {
-  return buf_inspect_u16_base_size(&g_kc3_base_binary,
+  return buf_inspect_u16_base_size(pretty, &g_kc3_base_binary,
                                        u);
 }
diff --git a/libkc3/buf_inspect_u16_decimal.c b/libkc3/buf_inspect_u16_decimal.c
index f03e14d..46e0030 100644
--- a/libkc3/buf_inspect_u16_decimal.c
+++ b/libkc3/buf_inspect_u16_decimal.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_u16_decimal (s_buf *buf, const u16 *u)
+sw buf_inspect_u16_decimal (s_pretty *pretty, s_buf *buf, const u16 *u)
 {
-  return buf_inspect_u16_base(buf,
+  return buf_inspect_u16_base(pretty, buf,
                                   &g_kc3_base_decimal,
                                   u);
 }
 
-sw buf_inspect_u16_decimal_size (const u16 *u)
+sw buf_inspect_u16_decimal_size (s_pretty *pretty, const u16 *u)
 {
-  return buf_inspect_u16_base_size(&g_kc3_base_decimal,
+  return buf_inspect_u16_base_size(pretty, &g_kc3_base_decimal,
                                        u);
 }
diff --git a/libkc3/buf_inspect_u16_hexadecimal.c b/libkc3/buf_inspect_u16_hexadecimal.c
index eb4214f..dd496d1 100644
--- a/libkc3/buf_inspect_u16_hexadecimal.c
+++ b/libkc3/buf_inspect_u16_hexadecimal.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_u16_hexadecimal (s_buf *buf, const u16 *u)
+sw buf_inspect_u16_hexadecimal (s_pretty *pretty, s_buf *buf, const u16 *u)
 {
-  return buf_inspect_u16_base(buf,
+  return buf_inspect_u16_base(pretty, buf,
                                   &g_kc3_base_hexadecimal,
                                   u);
 }
 
-sw buf_inspect_u16_hexadecimal_size (const u16 *u)
+sw buf_inspect_u16_hexadecimal_size (s_pretty *pretty, const u16 *u)
 {
-  return buf_inspect_u16_base_size(&g_kc3_base_hexadecimal,
+  return buf_inspect_u16_base_size(pretty, &g_kc3_base_hexadecimal,
                                        u);
 }
diff --git a/libkc3/buf_inspect_u16_octal.c b/libkc3/buf_inspect_u16_octal.c
index 366bbff..1e16660 100644
--- a/libkc3/buf_inspect_u16_octal.c
+++ b/libkc3/buf_inspect_u16_octal.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_u16_octal (s_buf *buf, const u16 *u)
+sw buf_inspect_u16_octal (s_pretty *pretty, s_buf *buf, const u16 *u)
 {
-  return buf_inspect_u16_base(buf,
+  return buf_inspect_u16_base(pretty, buf,
                                   &g_kc3_base_octal,
                                   u);
 }
 
-sw buf_inspect_u16_octal_size (const u16 *u)
+sw buf_inspect_u16_octal_size (s_pretty *pretty, const u16 *u)
 {
-  return buf_inspect_u16_base_size(&g_kc3_base_octal,
+  return buf_inspect_u16_base_size(pretty, &g_kc3_base_octal,
                                        u);
 }
diff --git a/libkc3/buf_inspect_u32.c b/libkc3/buf_inspect_u32.c
index 4425abe..84b632d 100644
--- a/libkc3/buf_inspect_u32.c
+++ b/libkc3/buf_inspect_u32.c
@@ -21,26 +21,26 @@
 #include "str.h"
 #include "sym.h"
 
-sw buf_inspect_u32 (s_buf *buf, const u32 *u)
+sw buf_inspect_u32 (s_pretty *pretty, s_buf *buf, const u32 *u)
 {
   sw r;
   sw result = 0;
   if (g_buf_inspect_type != &g_sym_U32 &&
       cast_needed_u32(*u)) {
-    if ((r = buf_inspect_paren_sym(buf, &g_sym_U32)) < 0)
+    if ((r = buf_inspect_paren_sym(pretty, buf, &g_sym_U32)) < 0)
       return r;
     result += r;
     if ((r = buf_write_1(buf, " ")) < 0)
       return r;
     result += r;
   }
-  if ((r = buf_inspect_u32_base(buf, &g_kc3_base_decimal, u)) < 0)
+  if ((r = buf_inspect_u32_base(pretty, buf, &g_kc3_base_decimal, u)) < 0)
     return r;
   result += r;
   return result;
 }
 
-sw buf_inspect_u32_base (s_buf *buf,
+sw buf_inspect_u32_base (s_pretty *pretty, s_buf *buf,
                              const s_str *base,
                              const u32 *u)
 {
@@ -60,7 +60,7 @@ sw buf_inspect_u32_base (s_buf *buf,
       return -1;
     return buf_write_character_utf8(buf, zero);
   }
-  size = buf_inspect_u32_base_digits(base, u);
+  size = buf_inspect_u32_base_digits(pretty, base, u);
   c = alloc(size * sizeof(character));
   buf_save_init(buf, &save);
   radix = base->size;
@@ -89,7 +89,7 @@ sw buf_inspect_u32_base (s_buf *buf,
   return r;
 }
 
-sw buf_inspect_u32_base_digits (const s_str *base,
+sw buf_inspect_u32_base_digits (s_pretty *pretty, const s_str *base,
                                     const u32 *u)
 {
   uw radix;
@@ -106,7 +106,7 @@ sw buf_inspect_u32_base_digits (const s_str *base,
   return size;
 }
 
-sw buf_inspect_u32_base_size (const s_str *base,
+sw buf_inspect_u32_base_size (s_pretty *pretty, const s_str *base,
                                   const u32 *u)
 {
   character c;
@@ -123,23 +123,23 @@ sw buf_inspect_u32_base_size (const s_str *base,
     u_ /= radix;
     if (str_character(base, digit, &c) < 0)
       return -1;
-    result += buf_inspect_str_character_size(&c);
+    result += buf_inspect_str_character_size(pretty, &c);
   }
   return result;
 }
 
-sw buf_inspect_u32_size (const u32 *u)
+sw buf_inspect_u32_size (s_pretty *pretty, const u32 *u)
 {
   sw r;
   sw result = 0;
   if (g_buf_inspect_type != &g_sym_U32 &&
       cast_needed_u32(*u)) {
-    if ((r = buf_inspect_paren_sym_size(&g_sym_U32)) < 0)
+    if ((r = buf_inspect_paren_sym_size(pretty, &g_sym_U32)) < 0)
       return r;
     result += r;
     result += strlen(" ");
   }
-  if ((r = buf_inspect_u32_base_size(&g_kc3_base_decimal, u)) < 0)
+  if ((r = buf_inspect_u32_base_size(pretty, &g_kc3_base_decimal, u)) < 0)
     return r;
   result += r;
   return result;
diff --git a/libkc3/buf_inspect_u32_binary.c b/libkc3/buf_inspect_u32_binary.c
index d9b673e..7449fb9 100644
--- a/libkc3/buf_inspect_u32_binary.c
+++ b/libkc3/buf_inspect_u32_binary.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_u32_binary (s_buf *buf, const u32 *u)
+sw buf_inspect_u32_binary (s_pretty *pretty, s_buf *buf, const u32 *u)
 {
-  return buf_inspect_u32_base(buf,
+  return buf_inspect_u32_base(pretty, buf,
                                   &g_kc3_base_binary,
                                   u);
 }
 
-sw buf_inspect_u32_binary_size (const u32 *u)
+sw buf_inspect_u32_binary_size (s_pretty *pretty, const u32 *u)
 {
-  return buf_inspect_u32_base_size(&g_kc3_base_binary,
+  return buf_inspect_u32_base_size(pretty, &g_kc3_base_binary,
                                        u);
 }
diff --git a/libkc3/buf_inspect_u32_decimal.c b/libkc3/buf_inspect_u32_decimal.c
index cfd0db4..91efb35 100644
--- a/libkc3/buf_inspect_u32_decimal.c
+++ b/libkc3/buf_inspect_u32_decimal.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_u32_decimal (s_buf *buf, const u32 *u)
+sw buf_inspect_u32_decimal (s_pretty *pretty, s_buf *buf, const u32 *u)
 {
-  return buf_inspect_u32_base(buf,
+  return buf_inspect_u32_base(pretty, buf,
                                   &g_kc3_base_decimal,
                                   u);
 }
 
-sw buf_inspect_u32_decimal_size (const u32 *u)
+sw buf_inspect_u32_decimal_size (s_pretty *pretty, const u32 *u)
 {
-  return buf_inspect_u32_base_size(&g_kc3_base_decimal,
+  return buf_inspect_u32_base_size(pretty, &g_kc3_base_decimal,
                                        u);
 }
diff --git a/libkc3/buf_inspect_u32_hexadecimal.c b/libkc3/buf_inspect_u32_hexadecimal.c
index 019107a..5f2b768 100644
--- a/libkc3/buf_inspect_u32_hexadecimal.c
+++ b/libkc3/buf_inspect_u32_hexadecimal.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_u32_hexadecimal (s_buf *buf, const u32 *u)
+sw buf_inspect_u32_hexadecimal (s_pretty *pretty, s_buf *buf, const u32 *u)
 {
-  return buf_inspect_u32_base(buf,
+  return buf_inspect_u32_base(pretty, buf,
                                   &g_kc3_base_hexadecimal,
                                   u);
 }
 
-sw buf_inspect_u32_hexadecimal_size (const u32 *u)
+sw buf_inspect_u32_hexadecimal_size (s_pretty *pretty, const u32 *u)
 {
-  return buf_inspect_u32_base_size(&g_kc3_base_hexadecimal,
+  return buf_inspect_u32_base_size(pretty, &g_kc3_base_hexadecimal,
                                        u);
 }
diff --git a/libkc3/buf_inspect_u32_octal.c b/libkc3/buf_inspect_u32_octal.c
index 45ffb78..ff22ef2 100644
--- a/libkc3/buf_inspect_u32_octal.c
+++ b/libkc3/buf_inspect_u32_octal.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_u32_octal (s_buf *buf, const u32 *u)
+sw buf_inspect_u32_octal (s_pretty *pretty, s_buf *buf, const u32 *u)
 {
-  return buf_inspect_u32_base(buf,
+  return buf_inspect_u32_base(pretty, buf,
                                   &g_kc3_base_octal,
                                   u);
 }
 
-sw buf_inspect_u32_octal_size (const u32 *u)
+sw buf_inspect_u32_octal_size (s_pretty *pretty, const u32 *u)
 {
-  return buf_inspect_u32_base_size(&g_kc3_base_octal,
+  return buf_inspect_u32_base_size(pretty, &g_kc3_base_octal,
                                        u);
 }
diff --git a/libkc3/buf_inspect_u64.c b/libkc3/buf_inspect_u64.c
index c4692d1..1e060c4 100644
--- a/libkc3/buf_inspect_u64.c
+++ b/libkc3/buf_inspect_u64.c
@@ -21,26 +21,26 @@
 #include "str.h"
 #include "sym.h"
 
-sw buf_inspect_u64 (s_buf *buf, const u64 *u)
+sw buf_inspect_u64 (s_pretty *pretty, s_buf *buf, const u64 *u)
 {
   sw r;
   sw result = 0;
   if (g_buf_inspect_type != &g_sym_U64 &&
       cast_needed_u64(*u)) {
-    if ((r = buf_inspect_paren_sym(buf, &g_sym_U64)) < 0)
+    if ((r = buf_inspect_paren_sym(pretty, buf, &g_sym_U64)) < 0)
       return r;
     result += r;
     if ((r = buf_write_1(buf, " ")) < 0)
       return r;
     result += r;
   }
-  if ((r = buf_inspect_u64_base(buf, &g_kc3_base_decimal, u)) < 0)
+  if ((r = buf_inspect_u64_base(pretty, buf, &g_kc3_base_decimal, u)) < 0)
     return r;
   result += r;
   return result;
 }
 
-sw buf_inspect_u64_base (s_buf *buf,
+sw buf_inspect_u64_base (s_pretty *pretty, s_buf *buf,
                              const s_str *base,
                              const u64 *u)
 {
@@ -60,7 +60,7 @@ sw buf_inspect_u64_base (s_buf *buf,
       return -1;
     return buf_write_character_utf8(buf, zero);
   }
-  size = buf_inspect_u64_base_digits(base, u);
+  size = buf_inspect_u64_base_digits(pretty, base, u);
   c = alloc(size * sizeof(character));
   buf_save_init(buf, &save);
   radix = base->size;
@@ -89,7 +89,7 @@ sw buf_inspect_u64_base (s_buf *buf,
   return r;
 }
 
-sw buf_inspect_u64_base_digits (const s_str *base,
+sw buf_inspect_u64_base_digits (s_pretty *pretty, const s_str *base,
                                     const u64 *u)
 {
   uw radix;
@@ -106,7 +106,7 @@ sw buf_inspect_u64_base_digits (const s_str *base,
   return size;
 }
 
-sw buf_inspect_u64_base_size (const s_str *base,
+sw buf_inspect_u64_base_size (s_pretty *pretty, const s_str *base,
                                   const u64 *u)
 {
   character c;
@@ -123,23 +123,23 @@ sw buf_inspect_u64_base_size (const s_str *base,
     u_ /= radix;
     if (str_character(base, digit, &c) < 0)
       return -1;
-    result += buf_inspect_str_character_size(&c);
+    result += buf_inspect_str_character_size(pretty, &c);
   }
   return result;
 }
 
-sw buf_inspect_u64_size (const u64 *u)
+sw buf_inspect_u64_size (s_pretty *pretty, const u64 *u)
 {
   sw r;
   sw result = 0;
   if (g_buf_inspect_type != &g_sym_U64 &&
       cast_needed_u64(*u)) {
-    if ((r = buf_inspect_paren_sym_size(&g_sym_U64)) < 0)
+    if ((r = buf_inspect_paren_sym_size(pretty, &g_sym_U64)) < 0)
       return r;
     result += r;
     result += strlen(" ");
   }
-  if ((r = buf_inspect_u64_base_size(&g_kc3_base_decimal, u)) < 0)
+  if ((r = buf_inspect_u64_base_size(pretty, &g_kc3_base_decimal, u)) < 0)
     return r;
   result += r;
   return result;
diff --git a/libkc3/buf_inspect_u64_binary.c b/libkc3/buf_inspect_u64_binary.c
index c09ac5c..edc0363 100644
--- a/libkc3/buf_inspect_u64_binary.c
+++ b/libkc3/buf_inspect_u64_binary.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_u64_binary (s_buf *buf, const u64 *u)
+sw buf_inspect_u64_binary (s_pretty *pretty, s_buf *buf, const u64 *u)
 {
-  return buf_inspect_u64_base(buf,
+  return buf_inspect_u64_base(pretty, buf,
                                   &g_kc3_base_binary,
                                   u);
 }
 
-sw buf_inspect_u64_binary_size (const u64 *u)
+sw buf_inspect_u64_binary_size (s_pretty *pretty, const u64 *u)
 {
-  return buf_inspect_u64_base_size(&g_kc3_base_binary,
+  return buf_inspect_u64_base_size(pretty, &g_kc3_base_binary,
                                        u);
 }
diff --git a/libkc3/buf_inspect_u64_decimal.c b/libkc3/buf_inspect_u64_decimal.c
index 9b98ab3..c525598 100644
--- a/libkc3/buf_inspect_u64_decimal.c
+++ b/libkc3/buf_inspect_u64_decimal.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_u64_decimal (s_buf *buf, const u64 *u)
+sw buf_inspect_u64_decimal (s_pretty *pretty, s_buf *buf, const u64 *u)
 {
-  return buf_inspect_u64_base(buf,
+  return buf_inspect_u64_base(pretty, buf,
                                   &g_kc3_base_decimal,
                                   u);
 }
 
-sw buf_inspect_u64_decimal_size (const u64 *u)
+sw buf_inspect_u64_decimal_size (s_pretty *pretty, const u64 *u)
 {
-  return buf_inspect_u64_base_size(&g_kc3_base_decimal,
+  return buf_inspect_u64_base_size(pretty, &g_kc3_base_decimal,
                                        u);
 }
diff --git a/libkc3/buf_inspect_u64_hexadecimal.c b/libkc3/buf_inspect_u64_hexadecimal.c
index ae9f76a..8c22a73 100644
--- a/libkc3/buf_inspect_u64_hexadecimal.c
+++ b/libkc3/buf_inspect_u64_hexadecimal.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_u64_hexadecimal (s_buf *buf, const u64 *u)
+sw buf_inspect_u64_hexadecimal (s_pretty *pretty, s_buf *buf, const u64 *u)
 {
-  return buf_inspect_u64_base(buf,
+  return buf_inspect_u64_base(pretty, buf,
                                   &g_kc3_base_hexadecimal,
                                   u);
 }
 
-sw buf_inspect_u64_hexadecimal_size (const u64 *u)
+sw buf_inspect_u64_hexadecimal_size (s_pretty *pretty, const u64 *u)
 {
-  return buf_inspect_u64_base_size(&g_kc3_base_hexadecimal,
+  return buf_inspect_u64_base_size(pretty, &g_kc3_base_hexadecimal,
                                        u);
 }
diff --git a/libkc3/buf_inspect_u64_octal.c b/libkc3/buf_inspect_u64_octal.c
index 93a15a2..56495bf 100644
--- a/libkc3/buf_inspect_u64_octal.c
+++ b/libkc3/buf_inspect_u64_octal.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_u64_octal (s_buf *buf, const u64 *u)
+sw buf_inspect_u64_octal (s_pretty *pretty, s_buf *buf, const u64 *u)
 {
-  return buf_inspect_u64_base(buf,
+  return buf_inspect_u64_base(pretty, buf,
                                   &g_kc3_base_octal,
                                   u);
 }
 
-sw buf_inspect_u64_octal_size (const u64 *u)
+sw buf_inspect_u64_octal_size (s_pretty *pretty, const u64 *u)
 {
-  return buf_inspect_u64_base_size(&g_kc3_base_octal,
+  return buf_inspect_u64_base_size(pretty, &g_kc3_base_octal,
                                        u);
 }
diff --git a/libkc3/buf_inspect_u8.c b/libkc3/buf_inspect_u8.c
index e4b1d6e..79c69b2 100644
--- a/libkc3/buf_inspect_u8.c
+++ b/libkc3/buf_inspect_u8.c
@@ -21,26 +21,26 @@
 #include "str.h"
 #include "sym.h"
 
-sw buf_inspect_u8 (s_buf *buf, const u8 *u)
+sw buf_inspect_u8 (s_pretty *pretty, s_buf *buf, const u8 *u)
 {
   sw r;
   sw result = 0;
   if (g_buf_inspect_type != &g_sym_U8 &&
       cast_needed_u8(*u)) {
-    if ((r = buf_inspect_paren_sym(buf, &g_sym_U8)) < 0)
+    if ((r = buf_inspect_paren_sym(pretty, buf, &g_sym_U8)) < 0)
       return r;
     result += r;
     if ((r = buf_write_1(buf, " ")) < 0)
       return r;
     result += r;
   }
-  if ((r = buf_inspect_u8_base(buf, &g_kc3_base_decimal, u)) < 0)
+  if ((r = buf_inspect_u8_base(pretty, buf, &g_kc3_base_decimal, u)) < 0)
     return r;
   result += r;
   return result;
 }
 
-sw buf_inspect_u8_base (s_buf *buf,
+sw buf_inspect_u8_base (s_pretty *pretty, s_buf *buf,
                              const s_str *base,
                              const u8 *u)
 {
@@ -60,7 +60,7 @@ sw buf_inspect_u8_base (s_buf *buf,
       return -1;
     return buf_write_character_utf8(buf, zero);
   }
-  size = buf_inspect_u8_base_digits(base, u);
+  size = buf_inspect_u8_base_digits(pretty, base, u);
   c = alloc(size * sizeof(character));
   buf_save_init(buf, &save);
   radix = base->size;
@@ -89,7 +89,7 @@ sw buf_inspect_u8_base (s_buf *buf,
   return r;
 }
 
-sw buf_inspect_u8_base_digits (const s_str *base,
+sw buf_inspect_u8_base_digits (s_pretty *pretty, const s_str *base,
                                     const u8 *u)
 {
   uw radix;
@@ -106,7 +106,7 @@ sw buf_inspect_u8_base_digits (const s_str *base,
   return size;
 }
 
-sw buf_inspect_u8_base_size (const s_str *base,
+sw buf_inspect_u8_base_size (s_pretty *pretty, const s_str *base,
                                   const u8 *u)
 {
   character c;
@@ -123,23 +123,23 @@ sw buf_inspect_u8_base_size (const s_str *base,
     u_ /= radix;
     if (str_character(base, digit, &c) < 0)
       return -1;
-    result += buf_inspect_str_character_size(&c);
+    result += buf_inspect_str_character_size(pretty, &c);
   }
   return result;
 }
 
-sw buf_inspect_u8_size (const u8 *u)
+sw buf_inspect_u8_size (s_pretty *pretty, const u8 *u)
 {
   sw r;
   sw result = 0;
   if (g_buf_inspect_type != &g_sym_U8 &&
       cast_needed_u8(*u)) {
-    if ((r = buf_inspect_paren_sym_size(&g_sym_U8)) < 0)
+    if ((r = buf_inspect_paren_sym_size(pretty, &g_sym_U8)) < 0)
       return r;
     result += r;
     result += strlen(" ");
   }
-  if ((r = buf_inspect_u8_base_size(&g_kc3_base_decimal, u)) < 0)
+  if ((r = buf_inspect_u8_base_size(pretty, &g_kc3_base_decimal, u)) < 0)
     return r;
   result += r;
   return result;
diff --git a/libkc3/buf_inspect_u8_binary.c b/libkc3/buf_inspect_u8_binary.c
index 5eb04c8..dbb2e25 100644
--- a/libkc3/buf_inspect_u8_binary.c
+++ b/libkc3/buf_inspect_u8_binary.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_u8_binary (s_buf *buf, const u8 *u)
+sw buf_inspect_u8_binary (s_pretty *pretty, s_buf *buf, const u8 *u)
 {
-  return buf_inspect_u8_base(buf,
+  return buf_inspect_u8_base(pretty, buf,
                                   &g_kc3_base_binary,
                                   u);
 }
 
-sw buf_inspect_u8_binary_size (const u8 *u)
+sw buf_inspect_u8_binary_size (s_pretty *pretty, const u8 *u)
 {
-  return buf_inspect_u8_base_size(&g_kc3_base_binary,
+  return buf_inspect_u8_base_size(pretty, &g_kc3_base_binary,
                                        u);
 }
diff --git a/libkc3/buf_inspect_u8_decimal.c b/libkc3/buf_inspect_u8_decimal.c
index 7b812dc..c7fe7f6 100644
--- a/libkc3/buf_inspect_u8_decimal.c
+++ b/libkc3/buf_inspect_u8_decimal.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_u8_decimal (s_buf *buf, const u8 *u)
+sw buf_inspect_u8_decimal (s_pretty *pretty, s_buf *buf, const u8 *u)
 {
-  return buf_inspect_u8_base(buf,
+  return buf_inspect_u8_base(pretty, buf,
                                   &g_kc3_base_decimal,
                                   u);
 }
 
-sw buf_inspect_u8_decimal_size (const u8 *u)
+sw buf_inspect_u8_decimal_size (s_pretty *pretty, const u8 *u)
 {
-  return buf_inspect_u8_base_size(&g_kc3_base_decimal,
+  return buf_inspect_u8_base_size(pretty, &g_kc3_base_decimal,
                                        u);
 }
diff --git a/libkc3/buf_inspect_u8_hexadecimal.c b/libkc3/buf_inspect_u8_hexadecimal.c
index 42a2062..34dc3f9 100644
--- a/libkc3/buf_inspect_u8_hexadecimal.c
+++ b/libkc3/buf_inspect_u8_hexadecimal.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_u8_hexadecimal (s_buf *buf, const u8 *u)
+sw buf_inspect_u8_hexadecimal (s_pretty *pretty, s_buf *buf, const u8 *u)
 {
-  return buf_inspect_u8_base(buf,
+  return buf_inspect_u8_base(pretty, buf,
                                   &g_kc3_base_hexadecimal,
                                   u);
 }
 
-sw buf_inspect_u8_hexadecimal_size (const u8 *u)
+sw buf_inspect_u8_hexadecimal_size (s_pretty *pretty, const u8 *u)
 {
-  return buf_inspect_u8_base_size(&g_kc3_base_hexadecimal,
+  return buf_inspect_u8_base_size(pretty, &g_kc3_base_hexadecimal,
                                        u);
 }
diff --git a/libkc3/buf_inspect_u8_octal.c b/libkc3/buf_inspect_u8_octal.c
index 6bcbcc7..d44ee4f 100644
--- a/libkc3/buf_inspect_u8_octal.c
+++ b/libkc3/buf_inspect_u8_octal.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_u8_octal (s_buf *buf, const u8 *u)
+sw buf_inspect_u8_octal (s_pretty *pretty, s_buf *buf, const u8 *u)
 {
-  return buf_inspect_u8_base(buf,
+  return buf_inspect_u8_base(pretty, buf,
                                   &g_kc3_base_octal,
                                   u);
 }
 
-sw buf_inspect_u8_octal_size (const u8 *u)
+sw buf_inspect_u8_octal_size (s_pretty *pretty, const u8 *u)
 {
-  return buf_inspect_u8_base_size(&g_kc3_base_octal,
+  return buf_inspect_u8_base_size(pretty, &g_kc3_base_octal,
                                        u);
 }
diff --git a/libkc3/buf_inspect_u_base.c.in b/libkc3/buf_inspect_u_base.c.in
index 158e46f..363084e 100644
--- a/libkc3/buf_inspect_u_base.c.in
+++ b/libkc3/buf_inspect_u_base.c.in
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_u_bits$__BASE$ (s_buf *buf, const u_bits$ *u)
+sw buf_inspect_u_bits$__BASE$ (s_pretty *pretty, s_buf *buf, const u_bits$ *u)
 {
-  return buf_inspect_u_bits$_base(buf,
+  return buf_inspect_u_bits$_base(pretty, buf,
                                   &g_kc3_base__BASE$,
                                   u);
 }
 
-sw buf_inspect_u_bits$__BASE$_size (const u_bits$ *u)
+sw buf_inspect_u_bits$__BASE$_size (s_pretty *pretty, const u_bits$ *u)
 {
-  return buf_inspect_u_bits$_base_size(&g_kc3_base__BASE$,
+  return buf_inspect_u_bits$_base_size(pretty, &g_kc3_base__BASE$,
                                        u);
 }
diff --git a/libkc3/buf_inspect_uw.c b/libkc3/buf_inspect_uw.c
index b0ca264..4339bb2 100644
--- a/libkc3/buf_inspect_uw.c
+++ b/libkc3/buf_inspect_uw.c
@@ -21,26 +21,26 @@
 #include "str.h"
 #include "sym.h"
 
-sw buf_inspect_uw (s_buf *buf, const uw *u)
+sw buf_inspect_uw (s_pretty *pretty, s_buf *buf, const uw *u)
 {
   sw r;
   sw result = 0;
   if (g_buf_inspect_type != &g_sym_Uw &&
       cast_needed_uw(*u)) {
-    if ((r = buf_inspect_paren_sym(buf, &g_sym_Uw)) < 0)
+    if ((r = buf_inspect_paren_sym(pretty, buf, &g_sym_Uw)) < 0)
       return r;
     result += r;
     if ((r = buf_write_1(buf, " ")) < 0)
       return r;
     result += r;
   }
-  if ((r = buf_inspect_uw_base(buf, &g_kc3_base_decimal, u)) < 0)
+  if ((r = buf_inspect_uw_base(pretty, buf, &g_kc3_base_decimal, u)) < 0)
     return r;
   result += r;
   return result;
 }
 
-sw buf_inspect_uw_base (s_buf *buf,
+sw buf_inspect_uw_base (s_pretty *pretty, s_buf *buf,
                              const s_str *base,
                              const uw *u)
 {
@@ -60,7 +60,7 @@ sw buf_inspect_uw_base (s_buf *buf,
       return -1;
     return buf_write_character_utf8(buf, zero);
   }
-  size = buf_inspect_uw_base_digits(base, u);
+  size = buf_inspect_uw_base_digits(pretty, base, u);
   c = alloc(size * sizeof(character));
   buf_save_init(buf, &save);
   radix = base->size;
@@ -89,7 +89,7 @@ sw buf_inspect_uw_base (s_buf *buf,
   return r;
 }
 
-sw buf_inspect_uw_base_digits (const s_str *base,
+sw buf_inspect_uw_base_digits (s_pretty *pretty, const s_str *base,
                                     const uw *u)
 {
   uw radix;
@@ -106,7 +106,7 @@ sw buf_inspect_uw_base_digits (const s_str *base,
   return size;
 }
 
-sw buf_inspect_uw_base_size (const s_str *base,
+sw buf_inspect_uw_base_size (s_pretty *pretty, const s_str *base,
                                   const uw *u)
 {
   character c;
@@ -123,23 +123,23 @@ sw buf_inspect_uw_base_size (const s_str *base,
     u_ /= radix;
     if (str_character(base, digit, &c) < 0)
       return -1;
-    result += buf_inspect_str_character_size(&c);
+    result += buf_inspect_str_character_size(pretty, &c);
   }
   return result;
 }
 
-sw buf_inspect_uw_size (const uw *u)
+sw buf_inspect_uw_size (s_pretty *pretty, const uw *u)
 {
   sw r;
   sw result = 0;
   if (g_buf_inspect_type != &g_sym_Uw &&
       cast_needed_uw(*u)) {
-    if ((r = buf_inspect_paren_sym_size(&g_sym_Uw)) < 0)
+    if ((r = buf_inspect_paren_sym_size(pretty, &g_sym_Uw)) < 0)
       return r;
     result += r;
     result += strlen(" ");
   }
-  if ((r = buf_inspect_uw_base_size(&g_kc3_base_decimal, u)) < 0)
+  if ((r = buf_inspect_uw_base_size(pretty, &g_kc3_base_decimal, u)) < 0)
     return r;
   result += r;
   return result;
diff --git a/libkc3/buf_inspect_uw_binary.c b/libkc3/buf_inspect_uw_binary.c
index af649bf..30c05cc 100644
--- a/libkc3/buf_inspect_uw_binary.c
+++ b/libkc3/buf_inspect_uw_binary.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_uw_binary (s_buf *buf, const uw *u)
+sw buf_inspect_uw_binary (s_pretty *pretty, s_buf *buf, const uw *u)
 {
-  return buf_inspect_uw_base(buf,
+  return buf_inspect_uw_base(pretty, buf,
                                   &g_kc3_base_binary,
                                   u);
 }
 
-sw buf_inspect_uw_binary_size (const uw *u)
+sw buf_inspect_uw_binary_size (s_pretty *pretty, const uw *u)
 {
-  return buf_inspect_uw_base_size(&g_kc3_base_binary,
+  return buf_inspect_uw_base_size(pretty, &g_kc3_base_binary,
                                        u);
 }
diff --git a/libkc3/buf_inspect_uw_decimal.c b/libkc3/buf_inspect_uw_decimal.c
index eaca546..593e005 100644
--- a/libkc3/buf_inspect_uw_decimal.c
+++ b/libkc3/buf_inspect_uw_decimal.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_uw_decimal (s_buf *buf, const uw *u)
+sw buf_inspect_uw_decimal (s_pretty *pretty, s_buf *buf, const uw *u)
 {
-  return buf_inspect_uw_base(buf,
+  return buf_inspect_uw_base(pretty, buf,
                                   &g_kc3_base_decimal,
                                   u);
 }
 
-sw buf_inspect_uw_decimal_size (const uw *u)
+sw buf_inspect_uw_decimal_size (s_pretty *pretty, const uw *u)
 {
-  return buf_inspect_uw_base_size(&g_kc3_base_decimal,
+  return buf_inspect_uw_base_size(pretty, &g_kc3_base_decimal,
                                        u);
 }
diff --git a/libkc3/buf_inspect_uw_hexadecimal.c b/libkc3/buf_inspect_uw_hexadecimal.c
index 6644397..23bbbe4 100644
--- a/libkc3/buf_inspect_uw_hexadecimal.c
+++ b/libkc3/buf_inspect_uw_hexadecimal.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_uw_hexadecimal (s_buf *buf, const uw *u)
+sw buf_inspect_uw_hexadecimal (s_pretty *pretty, s_buf *buf, const uw *u)
 {
-  return buf_inspect_uw_base(buf,
+  return buf_inspect_uw_base(pretty, buf,
                                   &g_kc3_base_hexadecimal,
                                   u);
 }
 
-sw buf_inspect_uw_hexadecimal_size (const uw *u)
+sw buf_inspect_uw_hexadecimal_size (s_pretty *pretty, const uw *u)
 {
-  return buf_inspect_uw_base_size(&g_kc3_base_hexadecimal,
+  return buf_inspect_uw_base_size(pretty, &g_kc3_base_hexadecimal,
                                        u);
 }
diff --git a/libkc3/buf_inspect_uw_octal.c b/libkc3/buf_inspect_uw_octal.c
index c87243a..488348c 100644
--- a/libkc3/buf_inspect_uw_octal.c
+++ b/libkc3/buf_inspect_uw_octal.c
@@ -14,15 +14,15 @@
 #include "buf_inspect.h"
 #include "kc3_main.h"
 
-sw buf_inspect_uw_octal (s_buf *buf, const uw *u)
+sw buf_inspect_uw_octal (s_pretty *pretty, s_buf *buf, const uw *u)
 {
-  return buf_inspect_uw_base(buf,
+  return buf_inspect_uw_base(pretty, buf,
                                   &g_kc3_base_octal,
                                   u);
 }
 
-sw buf_inspect_uw_octal_size (const uw *u)
+sw buf_inspect_uw_octal_size (s_pretty *pretty, const uw *u)
 {
-  return buf_inspect_uw_base_size(&g_kc3_base_octal,
+  return buf_inspect_uw_base_size(pretty, &g_kc3_base_octal,
                                        u);
 }