summarylogtreecommitdiffstats
path: root/freetype-tools-1.3.1.patch
blob: fce0396d799e233fc2f5be80ff35c82b1e991961 (plain)
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
diff -ru freetype-1.3.1.orig/contrib/ttf2bdf/Makefile.in freetype-1.3.1/contrib/ttf2bdf/Makefile.in
--- freetype-1.3.1.orig/contrib/ttf2bdf/Makefile.in	1998-12-06 19:50:22.000000000 +0100
+++ freetype-1.3.1/contrib/ttf2bdf/Makefile.in	2007-05-16 11:55:22.000000000 +0200
@@ -71,4 +71,6 @@
 	@$(RM) -f $(bindir)/ttf2bdf
 	@$(RM) -f $(mandir)/man1/ttf2bdf.1
 
+.PHONY: all clean realclean distclean install uninstall
+
 # end of Makefile
diff -ru freetype-1.3.1.orig/contrib/ttf2pfb/t1asm.c freetype-1.3.1/contrib/ttf2pfb/t1asm.c
--- freetype-1.3.1.orig/contrib/ttf2pfb/t1asm.c	1998-07-31 07:05:09.000000000 +0200
+++ freetype-1.3.1/contrib/ttf2pfb/t1asm.c	2007-05-16 11:55:22.000000000 +0200
@@ -49,8 +49,8 @@
 
 typedef unsigned char byte;
 
-static FILE *ifp = stdin;
-static FILE *ofp = stdout;
+static FILE *ifp;
+static FILE *ofp;
 
 /* flags */
 static int pfb = 0;
@@ -430,13 +430,16 @@
 
 int main(int argc, char **argv)
 {
-  char *p, *q, *r;
-  int c;
-
   extern char *optarg;
   extern int optind;
   extern int getopt(int argc, char **argv, char *optstring);
 
+  char *p, *q, *r;
+  int c;
+
+  ifp = stdin;
+  ofp = stdout;
+
   fprintf(stderr, "%s", BANNER);
 
   /* interpret command line arguments using getopt */
diff -ru freetype-1.3.1.orig/contrib/ttf2pfb/ttf2pfb.c freetype-1.3.1/contrib/ttf2pfb/ttf2pfb.c
--- freetype-1.3.1.orig/contrib/ttf2pfb/ttf2pfb.c	1999-08-20 15:14:26.000000000 +0200
+++ freetype-1.3.1/contrib/ttf2pfb/ttf2pfb.c	2007-05-16 11:55:22.000000000 +0200
@@ -364,7 +364,7 @@
   int       i, j;
 
   va_start(vp, dummy);
-  numCR = va_arg(vp, UShort);
+  numCR = (UShort)va_arg(vp, int);
 
   encVec = re_alloc(encVec, 1 * sizeof (EncVec), "Alloc_EncVec");
   encVec->numCodeRanges = numCR;
@@ -372,15 +372,15 @@
   cRange = re_alloc(cRange, numCR * sizeof (EVcRange), "Alloc_EncVec");
   for (i = 0; i < numCR; i++)
   {
-    (cRange + i)->high.start   = va_arg(vp, UShort);
-    (cRange + i)->high.end     = va_arg(vp, UShort);
-    (cRange + i)->numLowRanges = numLows = va_arg(vp, UShort);
+    (cRange + i)->high.start   = (UShort) va_arg(vp, int);
+    (cRange + i)->high.end     = (UShort) va_arg(vp, int);
+    (cRange + i)->numLowRanges = numLows = (UShort) va_arg(vp, int);
     evLow = NULL;
     evLow = re_alloc(evLow, numLows * sizeof (EVLow), "Alloc_EncVec");
     for (j = 0; j < numLows; j++)
     {
-      (evLow + j)->start = va_arg(vp, UChar);
-      (evLow + j)->end   = va_arg(vp, UChar);
+      (evLow + j)->start = (UChar) va_arg(vp, int);
+      (evLow + j)->end   = (UChar) va_arg(vp, int);
     }
     (cRange + i)->low = evLow;
   }
diff -ru freetype-1.3.1.orig/contrib/ttf2pk/Makefile.in freetype-1.3.1/contrib/ttf2pk/Makefile.in
--- freetype-1.3.1.orig/contrib/ttf2pk/Makefile.in	1998-09-03 07:12:57.000000000 +0200
+++ freetype-1.3.1/contrib/ttf2pk/Makefile.in	2007-05-16 11:55:22.000000000 +0200
@@ -113,4 +113,6 @@
                 line = line " " $$2 } \
               END { print line }' >> Makefile
 
+.PHONY: default all install uninstall clean distclean do_clean depend
+
 # Dependencies generated by make depend: PUT NO STUFF BELOW
diff -ru freetype-1.3.1.orig/contrib/ttf2pk/data/UBig5.sfd freetype-1.3.1/contrib/ttf2pk/data/UBig5.sfd
--- freetype-1.3.1.orig/contrib/ttf2pk/data/UBig5.sfd	1998-12-10 15:40:10.000000000 +0100
+++ freetype-1.3.1/contrib/ttf2pk/data/UBig5.sfd	2007-05-16 11:55:22.000000000 +0200
@@ -4,11 +4,20 @@
 # to be used with the CJK package for LaTeX.
 #
 # The input encoding is Unicode.
+#
+# 1999-12-11: This table has been adapted to the _current_ Arphic PL fonts
+#             (bkai00mp.ttf and bsmi00lp.ttf) so that the popular ETen
+#             3.10+ Big5 documents are displayed properly.  Note that this
+#             table needs further revisions when new versions of Arphic PL
+#             fonts and Unicode are released.
+#             
+#             Reference: Unicode 3.0 (Unihan.txt, UnicodeData.txt),
+#                        CMEX Big5+ standard (big5p-s1.atb)
 
-01 0x3000 0xFF0C 0x3001 0x3002 0xFF0E 0x2022 0xFF1B 0xFF1A \
-   0xFF1F 0xFF01 0xFE30 0x2026 0x2025 0xFE50 0xFF64 0xFE52 \
+01 0x3000 0xFF0C 0x3001 0x3002 0xFF0E 0x2027 0xFF1B 0xFF1A \
+   0xFF1F 0xFF01 0xFE30 0x2026 0x2025 0xFE50 0xFE51 0xFE52 \
    0x00B7 0xFE54 0xFE55 0xFE56 0xFE57 0xFF5C 0x2013 0xFE31 \
-   0x2014 0xFE33 0xFFFD 0xFE34 0xFE4F 0xFF08 0xFF09 0xFE35 \
+   0x2014 0xFE33 0x2574 0xFE34 0xFE4F 0xFF08 0xFF09 0xFE35 \
    0xFE36 0xFF5B 0xFF5D 0xFE37 0xFE38 0x3014 0x3015 0xFE39 \
    0xFE3A 0x3010 0x3011 0xFE3B 0xFE3C 0x300A 0x300B 0xFE3D \
    0xFE3E 0x3008 0x3009 0xFE3F 0xFE40 0x300C 0x300D 0xFE41 \
@@ -17,15 +26,15 @@
    0x301E 0x2035 0x2032 0xFF03 0xFF06 0xFF0A 0x203B 0x00A7 \
    0x3003 0x25CB 0x25CF 0x25B3 0x25B2 0x25CE 0x2606 0x2605 \
    0x25C7 0x25C6 0x25A1 0x25A0 0x25BD 0x25BC 0x32A3 0x2105 \
-   0x203E 0xFFFD 0xFF3F 0xFFFD 0xFE49 0xFE4A 0xFE4D 0xFE4E \
+   0x203E 0xFFE3 0xFF3F 0x02CD 0xFE49 0xFE4A 0xFE4D 0xFE4E \
    0xFE4B 0xFE4C 0xFE5F 0xFE60 0xFE61 0xFF0B 0xFF0D 0x00D7 \
    0x00F7 0x00B1 0x221A 0xFF1C 0xFF1E 0xFF1D 0x2266 0x2267 \
    0x2260 0x221E 0x2252 0x2261 0xFE62 0xFE63 0xFE64 0xFE65 \
-   0xFE66 0x223C 0x2229 0x222A 0x22A5 0x2220 0x221F 0x22BF \
+   0xFE66 0xFF5E 0x2229 0x222A 0x22A5 0x2220 0x221F 0x22BF \
    0x33D2 0x33D1 0x222B 0x222E 0x2235 0x2234 0x2640 0x2642 \
-   0x2641 0x2609 0x2191 0x2193 0x2190 0x2192 0x2196 0x2197 \
-   0x2199 0x2198 0x2225 0x2223 0xFFFD 0xFFFD 0xFF0F 0xFF3C \
-   0xFF04 0x00A5 0x3012 0x00A2 0x00A3 0xFF05 0xFF20 0x2103 \
+   0x2295 0x2299 0x2191 0x2193 0x2190 0x2192 0x2196 0x2197 \
+   0x2199 0x2198 0x2225 0x2223 0xFF0F 0xFF3C 0x2215 0xFE68 \
+   0xFF04 0xFFE5 0x3012 0xFFE0 0xFFE1 0xFF05 0xFF20 0x2103 \
    0x2109 0xFE69 0xFE6A 0xFE6B 0x33D5 0x339C 0x339D 0x339E \
    0x33CE 0x33A1 0x338E 0x338F 0x33C4 0x00B0 0x5159 0x515B \
    0x515E 0x515D 0x5161 0x5163 0x55E7 0x74E9 0x7CCE 0x2581 \
@@ -37,8 +46,8 @@
    0x2572 0x2573 0xFF10 0xFF11 0xFF12 0xFF13 0xFF14 0xFF15 \
    0xFF16 0xFF17 0xFF18 0xFF19 0x2160 0x2161 0x2162 0x2163 \
    0x2164 0x2165 0x2166 0x2167 0x2168 0x2169 0x3021 0x3022
-02 0x3023 0x3024 0x3025 0x3026 0x3027 0x3028 0x3029 0xFFFD \
-   0x5344 0xFFFD 0xFF21 0xFF22 0xFF23 0xFF24 0xFF25 0xFF26 \
+02 0x3023 0x3024 0x3025 0x3026 0x3027 0x3028 0x3029 0x5341 \
+   0x5344 0x5345 0xFF21 0xFF22 0xFF23 0xFF24 0xFF25 0xFF26 \
    0xFF27 0xFF28 0xFF29 0xFF2A 0xFF2B 0xFF2C 0xFF2D 0xFF2E \
    0xFF2F 0xFF30 0xFF31 0xFF32 0xFF33 0xFF34 0xFF35 0xFF36 \
    0xFF37 0xFF38 0xFF39 0xFF3A 0xFF41 0xFF42 0xFF43 0xFF44 \
@@ -739,57 +748,57 @@
    0x8B9A 0x9477 0x97C9 0x9A62 0x9A65 0x7E9C 0x8B9C 0x8EAA \
    0x91C5 0x947D 0x947E 0x947C 0x9C77 0x9C78 0x9EF7 0x8C54 \
    0x947F 0x9E1A 0x7228 0x9A6A 0x9B31 0x9E1B 0x9E1E 0x7C72 \
-   0x30FE 0x309D 0x309E 0x3005 0x3041 0x3042 0x3043 0x3044 \
-   0x3045 0x3046 0x3047 0x3048 0x3049 0x304A 0x304B 0x304C
-24 0x304D 0x304E 0x304F 0x3050 0x3051 0x3052 0x3053 0x3054 \
-   0x3055 0x3056 0x3057 0x3058 0x3059 0x305A 0x305B 0x305C \
-   0x305D 0x305E 0x305F 0x3060 0x3061 0x3062 0x3063 0x3064 \
-   0x3065 0x3066 0x3067 0x3068 0x3069 0x306A 0x306B 0x306C \
-   0x306D 0x306E 0x306F 0x3070 0x3071 0x3072 0x3073 0x3074 \
-   0x3075 0x3076 0x3077 0x3078 0x3079 0x307A 0x307B 0x307C \
-   0x307D 0x307E 0x307F 0x3080 0x3081 0x3082 0x3083 0x3084 \
-   0x3085 0x3086 0x3087 0x3088 0x3089 0x308A 0x308B 0x308C \
-   0x308D 0x308E 0x308F 0x3090 0x3091 0x3092 0x3093 0x30A1 \
-   0x30A2 0x30A3 0x30A4 0x30A5 0x30A6 0x30A7 0x30A8 0x30A9 \
-   0x30AA 0x30AB 0x30AC 0x30AD 0x30AE 0x30AF 0x30B0 0x30B1 \
-   0x30B2 0x30B3 0x30B4 0x30B5 0x30B6 0x30B7 0x30B8 0x30B9 \
-   0x30BA 0x30BB 0x30BC 0x30BD 0x30BE 0x30BF 0x30C0 0x30C1 \
-   0x30C2 0x30C3 0x30C4 0x30C5 0x30C6 0x30C7 0x30C8 0x30C9 \
-   0x30CA 0x30CB 0x30CC 0x30CD 0x30CE 0x30CF 0x30D0 0x30D1 \
-   0x30D2 0x30D3 0x30D4 0x30D5 0x30D6 0x30D7 0x30D8 0x30D9 \
-   0x30DA 0x30DB 0x30DC 0x30DD 0x30DE 0x30DF 0x30E0 0x30E1 \
-   0x30E2 0x30E3 0x30E4 0x30E5 0x30E6 0x30E7 0x30E8 0x30E9 \
-   0x30EA 0x30EB 0x30EC 0x30ED 0x30EE 0x30EF 0x30F0 0x30F1 \
-   0x30F2 0x30F3 0x30F4 0x30F5 0x30F6 0x0414 0x0415 0x0401 \
-   0x0416 0x0417 0x0418 0x0419 0x041A 0x041B 0x041C 0x0423 \
-   0x0424 0x0425 0x0426 0x0427 0x0428 0x0429 0x042A 0x042B \
-   0x042C 0x042D 0x042E 0x042F 0x0430 0x0431 0x0432 0x0433 \
-   0x0434 0x0435 0x0451 0x0436 0x0437 0x0438 0x0439 0x043A \
-   0x043B 0x043C 0x043D 0x043E 0x043F 0x0440 0x0441 0x0442 \
-   0x0443 0x0444 0x0445 0x0446 0x0447 0x0448 0x0449 0x044A \
-   0x044B 0x044C 0x044D 0x044E 0x044F 0x2460 0x2461 0x2462 \
-   0x2463 0x2464 0x2465 0x2466 0x2467 0x2468 0x2469 0x2474 \
-   0x2475 0x2476 0x2477 0x2478 0x2479 0x247A 0x247B 0x247C \
-   0x247D 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE
-25 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
+   0xF6B1 0xF6B2 0xF6B3 0xF6B4 0xF6B5 0xF6B6 0xF6B7 0xF6B8 \
+   0xF6B9 0xF6BA 0xF6BB 0xF6BC 0xF6BD 0xF6BE 0xF6BF 0xF6C0
+24 0xF6C1 0xF6C2 0xF6C3 0xF6C4 0xF6C5 0xF6C6 0xF6C7 0xF6C8 \
+   0xF6C9 0xF6CA 0xF6CB 0xF6CC 0xF6CD 0xF6CE 0xF6CF 0xF6D0 \
+   0xF6D1 0xF6D2 0xF6D3 0xF6D4 0xF6D5 0xF6D6 0xF6D7 0xF6D8 \
+   0xF6D9 0xF6DA 0xF6DB 0xF6DC 0xF6DD 0xF6DE 0xF6DF 0xF6E0 \
+   0xF6E1 0xF6E2 0xF6E3 0xF6E4 0xF6E5 0xF6E6 0xF6E7 0xF6E8 \
+   0xF6E9 0xF6EA 0xF6EB 0xF6EC 0xF6ED 0xF6EE 0xF6EF 0xF6F0 \
+   0xF6F1 0xF6F2 0xF6F3 0xF6F4 0xF6F5 0xF6F6 0xF6F7 0xF6F8 \
+   0xF6F9 0xF6FA 0xF6FB 0xF6FC 0xF6FD 0xF6FE 0xF6FF 0xF700 \
+   0xF701 0xF702 0xF703 0xF704 0xF705 0xF706 0xF707 0xF708 \
+   0xF709 0xF70A 0xF70B 0xF70C 0xF70D 0xF70E 0xF70F 0xF710 \
+   0xF711 0xF712 0xF713 0xF714 0xF715 0xF716 0xF717 0xF718 \
+   0xF719 0xF71A 0xF71B 0xF71C 0xF71D 0xF71E 0xF71F 0xF720 \
+   0xF721 0xF722 0xF723 0xF724 0xF725 0xF726 0xF727 0xF728 \
+   0xF729 0xF72A 0xF72B 0xF72C 0xF72D 0xF72E 0xF72F 0xF730 \
+   0xF731 0xF732 0xF733 0xF734 0xF735 0xF736 0xF737 0xF738 \
+   0xF739 0xF73A 0xF73B 0xF73C 0xF73D 0xF73E 0xF73F 0xF740 \
+   0xF741 0xF742 0xF743 0xF744 0xF745 0xF746 0xF747 0xF748 \
+   0xF749 0xF74A 0xF74B 0xF74C 0xF74D 0xF74E 0xF74F 0xF750 \
+   0xF751 0xF752 0xF753 0xF754 0xF755 0xF756 0xF757 0xF758 \
+   0xF759 0xF75A 0xF75B 0xF75C 0xF75D 0xF75E 0xF75F 0xF760 \
+   0xF761 0xF762 0xF763 0xF764 0xF765 0xF766 0xF767 0xF768 \
+   0xF769 0xF76A 0xF76B 0xF76C 0xF76D 0xF76E 0xF76F 0xF770 \
+   0xF771 0xF772 0xF773 0xF774 0xF775 0xF776 0xF777 0xF778 \
+   0xF779 0xF77A 0xF77B 0xF77C 0xF77D 0xF77E 0xF77F 0xF780 \
+   0xF781 0xF782 0xF783 0xF784 0xF785 0xF786 0xF787 0xF788 \
+   0xF789 0xF78A 0xF78B 0xF78C 0xF78D 0xF78E 0xF78F 0xF790 \
+   0xF791 0xF792 0xF793 0xF794 0xF795 0xF796 0xF797 0xF798 \
+   0xF799 0xF79A 0xF79B 0xF79C 0xF79D 0xF79E 0xF79F 0xF7A0 \
+   0xF7A1 0xF7A2 0xF7A3 0xF7A4 0xF7A5 0xF7A6 0xF7A7 0xF7A8 \
+   0xF7A9 0xF7AA 0xF7AB 0xF7AC 0xF7AD 0xF7AE 0xF7AF 0xF7B0 \
+   0xF7B1 0xF7B2 0xF7B3 0xF7B4 0xF7B5 0xF7B6 0xF7B7 0xF7B8 \
+   0xF7B9 0xF7BA 0xF7BB 0xF7BC 0xF7BD 0xF7BE 0xF7BF 0xF7C0
+25 0xF7C1 0xF7C2 0xF7C3 0xF7C4 0xF7C5 0xF7C6 0xF7C7 0xF7C8 \
+   0xF7C9 0xF7CA 0xF7CB 0xF7CC 0xF7CD 0xF7CE 0xF7CF 0xF7D0 \
+   0xF7D1 0xF7D2 0xF7D3 0xF7D4 0xF7D5 0xF7D6 0xF7D7 0xF7D8 \
+   0xF7D9 0xF7DA 0xF7DB 0xF7DC 0xF7DD 0xF7DE 0xF7DF 0xF7E0 \
+   0xF7E1 0xF7E2 0xF7E3 0xF7E4 0xF7E5 0xF7E6 0xF7E7 0xF7E8 \
+   0xF7E9 0xF7EA 0xF7EB 0xF7EC 0xF7ED 0xF7EE 0xF7EF 0xF7F0 \
+   0xF7F1 0xF7F2 0xF7F3 0xF7F4 0xF7F5 0xF7F6 0xF7F7 0xF7F8 \
+   0xF7F9 0xF7FA 0xF7FB 0xF7FC 0xF7FD 0xF7FE 0xF7FF 0xF800 \
+   0xF801 0xF802 0xF803 0xF804 0xF805 0xF806 0xF807 0xF808 \
+   0xF809 0xF80A 0xF80B 0xF80C 0xF80D 0xF80E 0xF80F 0xF810 \
+   0xF811 0xF812 0xF813 0xF814 0xF815 0xF816 0xF817 0xF818 \
+   0xF819 0xF81A 0xF81B 0xF81C 0xF81D 0xF81E 0xF81F 0xF820 \
+   0xF821 0xF822 0xF823 0xF824 0xF825 0xF826 0xF827 0xF828 \
+   0xF829 0xF82A 0xF82B 0xF82C 0xF82D 0xF82E 0xF82F 0xF830 \
+   0xF831 0xF832 0xF833 0xF834 0xF835 0xF836 0xF837 0xF838 \
+   0xF839 0xF83A 0xF83B 0xF83C 0xF83D 0xF83E 0xF83F 0xF840 \
+   0xF841 0xF842 0xF843 0xF844 0xF845 0xF846 0xF847 0xF848 \
    0x4E42 0x4E5C 0x51F5 0x531A 0x5382 0x4E07 0x4E0C 0x4E47 \
    0x4E8D 0x56D7 0xFA0C 0x5C6E 0x5F73 0x4E0F 0x5187 0x4E0E \
    0x4E2E 0x4E93 0x4EC2 0x4EC9 0x4EC8 0x5198 0x52FC 0x536C \
@@ -1746,109 +1755,109 @@
    0x6207 0x6B1E 0x7227 0x864C 0x8EA8 0x9482 0x9480 0x9481 \
    0x9A69 0x9A68 0x9B2E 0x9E19 0x7229 0x864B 0x8B9F 0x9483 \
    0x9C79 0x9EB7 0x7675 0x9A6B 0x9C7A 0x9E1D 0x7069 0x706A \
-   0x9EA4 0x9F7E 0x9F49 0x9F98 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE
-56 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE
-57 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE
-58 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE
+   0x9EA4 0x9F7E 0x9F49 0x9F98 0x7881 0x92B9 0x88CF 0x58BB \
+   0x6052 0x7CA7 0x5AFA 0x2554 0x2566 0x2557 0x2560 0x256C \
+   0x2563 0x255A 0x2569 0x255D 0x2552 0x2564 0x2555 0x255E \
+   0x256A 0x2561 0x2558 0x2567 0x255B 0x2553 0x2565 0x2556 \
+   0x255F 0x256B 0x2562 0x2559 0x2568 0x255C 0x2551 0x2550 \
+   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xE000 0xE001 0xE002 \
+   0xE003 0xE004 0xE005 0xE006 0xE007 0xE008 0xE009 0xE00A \
+   0xE00B 0xE00C 0xE00D 0xE00E 0xE00F 0xE010 0xE011 0xE012 \
+   0xE013 0xE014 0xE015 0xE016 0xE017 0xE018 0xE019 0xE01A \
+   0xE01B 0xE01C 0xE01D 0xE01E 0xE01F 0xE020 0xE021 0xE022 \
+   0xE023 0xE024 0xE025 0xE026 0xE027 0xE028 0xE029 0xE02A \
+   0xE02B 0xE02C 0xE02D 0xE02E 0xE02F 0xE030 0xE031 0xE032 \
+   0xE033 0xE034 0xE035 0xE036 0xE037 0xE038 0xE039 0xE03A \
+   0xE03B 0xE03C 0xE03D 0xE03E 0xE03F 0xE040 0xE041 0xE042 \
+   0xE043 0xE044 0xE045 0xE046 0xE047 0xE048 0xE049 0xE04A \
+   0xE04B 0xE04C 0xE04D 0xE04E 0xE04F 0xE050 0xE051 0xE052 \
+   0xE053 0xE054 0xE055 0xE056 0xE057 0xE058 0xE059 0xE05A \
+   0xE05B 0xE05C 0xE05D 0xE05E 0xE05F 0xE060 0xE061 0xE062 \
+   0xE063 0xE064 0xE065 0xE066 0xE067 0xE068 0xE069 0xE06A
+56 0xE06B 0xE06C 0xE06D 0xE06E 0xE06F 0xE070 0xE071 0xE072 \
+   0xE073 0xE074 0xE075 0xE076 0xE077 0xE078 0xE079 0xE07A \
+   0xE07B 0xE07C 0xE07D 0xE07E 0xE07F 0xE080 0xE081 0xE082 \
+   0xE083 0xE084 0xE085 0xE086 0xE087 0xE088 0xE089 0xE08A \
+   0xE08B 0xE08C 0xE08D 0xE08E 0xE08F 0xE090 0xE091 0xE092 \
+   0xE093 0xE094 0xE095 0xE096 0xE097 0xE098 0xE099 0xE09A \
+   0xE09B 0xE09C 0xE09D 0xE09E 0xE09F 0xE0A0 0xE0A1 0xE0A2 \
+   0xE0A3 0xE0A4 0xE0A5 0xE0A6 0xE0A7 0xE0A8 0xE0A9 0xE0AA \
+   0xE0AB 0xE0AC 0xE0AD 0xE0AE 0xE0AF 0xE0B0 0xE0B1 0xE0B2 \
+   0xE0B3 0xE0B4 0xE0B5 0xE0B6 0xE0B7 0xE0B8 0xE0B9 0xE0BA \
+   0xE0BB 0xE0BC 0xE0BD 0xE0BE 0xE0BF 0xE0C0 0xE0C1 0xE0C2 \
+   0xE0C3 0xE0C4 0xE0C5 0xE0C6 0xE0C7 0xE0C8 0xE0C9 0xE0CA \
+   0xE0CB 0xE0CC 0xE0CD 0xE0CE 0xE0CF 0xE0D0 0xE0D1 0xE0D2 \
+   0xE0D3 0xE0D4 0xE0D5 0xE0D6 0xE0D7 0xE0D8 0xE0D9 0xE0DA \
+   0xE0DB 0xE0DC 0xE0DD 0xE0DE 0xE0DF 0xE0E0 0xE0E1 0xE0E2 \
+   0xE0E3 0xE0E4 0xE0E5 0xE0E6 0xE0E7 0xE0E8 0xE0E9 0xE0EA \
+   0xE0EB 0xE0EC 0xE0ED 0xE0EE 0xE0EF 0xE0F0 0xE0F1 0xE0F2 \
+   0xE0F3 0xE0F4 0xE0F5 0xE0F6 0xE0F7 0xE0F8 0xE0F9 0xE0FA \
+   0xE0FB 0xE0FC 0xE0FD 0xE0FE 0xE0FF 0xE100 0xE101 0xE102 \
+   0xE103 0xE104 0xE105 0xE106 0xE107 0xE108 0xE109 0xE10A \
+   0xE10B 0xE10C 0xE10D 0xE10E 0xE10F 0xE110 0xE111 0xE112 \
+   0xE113 0xE114 0xE115 0xE116 0xE117 0xE118 0xE119 0xE11A \
+   0xE11B 0xE11C 0xE11D 0xE11E 0xE11F 0xE120 0xE121 0xE122 \
+   0xE123 0xE124 0xE125 0xE126 0xE127 0xE128 0xE129 0xE12A \
+   0xE12B 0xE12C 0xE12D 0xE12E 0xE12F 0xE130 0xE131 0xE132 \
+   0xE133 0xE134 0xE135 0xE136 0xE137 0xE138 0xE139 0xE13A \
+   0xE13B 0xE13C 0xE13D 0xE13E 0xE13F 0xE140 0xE141 0xE142 \
+   0xE143 0xE144 0xE145 0xE146 0xE147 0xE148 0xE149 0xE14A \
+   0xE14B 0xE14C 0xE14D 0xE14E 0xE14F 0xE150 0xE151 0xE152 \
+   0xE153 0xE154 0xE155 0xE156 0xE157 0xE158 0xE159 0xE15A \
+   0xE15B 0xE15C 0xE15D 0xE15E 0xE15F 0xE160 0xE161 0xE162 \
+   0xE163 0xE164 0xE165 0xE166 0xE167 0xE168 0xE169 0xE16A
+57 0xE16B 0xE16C 0xE16D 0xE16E 0xE16F 0xE170 0xE171 0xE172 \
+   0xE173 0xE174 0xE175 0xE176 0xE177 0xE178 0xE179 0xE17A \
+   0xE17B 0xE17C 0xE17D 0xE17E 0xE17F 0xE180 0xE181 0xE182 \
+   0xE183 0xE184 0xE185 0xE186 0xE187 0xE188 0xE189 0xE18A \
+   0xE18B 0xE18C 0xE18D 0xE18E 0xE18F 0xE190 0xE191 0xE192 \
+   0xE193 0xE194 0xE195 0xE196 0xE197 0xE198 0xE199 0xE19A \
+   0xE19B 0xE19C 0xE19D 0xE19E 0xE19F 0xE1A0 0xE1A1 0xE1A2 \
+   0xE1A3 0xE1A4 0xE1A5 0xE1A6 0xE1A7 0xE1A8 0xE1A9 0xE1AA \
+   0xE1AB 0xE1AC 0xE1AD 0xE1AE 0xE1AF 0xE1B0 0xE1B1 0xE1B2 \
+   0xE1B3 0xE1B4 0xE1B5 0xE1B6 0xE1B7 0xE1B8 0xE1B9 0xE1BA \
+   0xE1BB 0xE1BC 0xE1BD 0xE1BE 0xE1BF 0xE1C0 0xE1C1 0xE1C2 \
+   0xE1C3 0xE1C4 0xE1C5 0xE1C6 0xE1C7 0xE1C8 0xE1C9 0xE1CA \
+   0xE1CB 0xE1CC 0xE1CD 0xE1CE 0xE1CF 0xE1D0 0xE1D1 0xE1D2 \
+   0xE1D3 0xE1D4 0xE1D5 0xE1D6 0xE1D7 0xE1D8 0xE1D9 0xE1DA \
+   0xE1DB 0xE1DC 0xE1DD 0xE1DE 0xE1DF 0xE1E0 0xE1E1 0xE1E2 \
+   0xE1E3 0xE1E4 0xE1E5 0xE1E6 0xE1E7 0xE1E8 0xE1E9 0xE1EA \
+   0xE1EB 0xE1EC 0xE1ED 0xE1EE 0xE1EF 0xE1F0 0xE1F1 0xE1F2 \
+   0xE1F3 0xE1F4 0xE1F5 0xE1F6 0xE1F7 0xE1F8 0xE1F9 0xE1FA \
+   0xE1FB 0xE1FC 0xE1FD 0xE1FE 0xE1FF 0xE200 0xE201 0xE202 \
+   0xE203 0xE204 0xE205 0xE206 0xE207 0xE208 0xE209 0xE20A \
+   0xE20B 0xE20C 0xE20D 0xE20E 0xE20F 0xE210 0xE211 0xE212 \
+   0xE213 0xE214 0xE215 0xE216 0xE217 0xE218 0xE219 0xE21A \
+   0xE21B 0xE21C 0xE21D 0xE21E 0xE21F 0xE220 0xE221 0xE222 \
+   0xE223 0xE224 0xE225 0xE226 0xE227 0xE228 0xE229 0xE22A \
+   0xE22B 0xE22C 0xE22D 0xE22E 0xE22F 0xE230 0xE231 0xE232 \
+   0xE233 0xE234 0xE235 0xE236 0xE237 0xE238 0xE239 0xE23A \
+   0xE23B 0xE23C 0xE23D 0xE23E 0xE23F 0xE240 0xE241 0xE242 \
+   0xE243 0xE244 0xE245 0xE246 0xE247 0xE248 0xE249 0xE24A \
+   0xE24B 0xE24C 0xE24D 0xE24E 0xE24F 0xE250 0xE251 0xE252 \
+   0xE253 0xE254 0xE255 0xE256 0xE257 0xE258 0xE259 0xE25A \
+   0xE25B 0xE25C 0xE25D 0xE25E 0xE25F 0xE260 0xE261 0xE262 \
+   0xE263 0xE264 0xE265 0xE266 0xE267 0xE268 0xE269 0xE26A
+58 0xE26B 0xE26C 0xE26D 0xE26E 0xE26F 0xE270 0xE271 0xE272 \
+   0xE273 0xE274 0xE275 0xE276 0xE277 0xE278 0xE279 0xE27A \
+   0xE27B 0xE27C 0xE27D 0xE27E 0xE27F 0xE280 0xE281 0xE282 \
+   0xE283 0xE284 0xE285 0xE286 0xE287 0xE288 0xE289 0xE28A \
+   0xE28B 0xE28C 0xE28D 0xE28E 0xE28F 0xE290 0xE291 0xE292 \
+   0xE293 0xE294 0xE295 0xE296 0xE297 0xE298 0xE299 0xE29A \
+   0xE29B 0xE29C 0xE29D 0xE29E 0xE29F 0xE2A0 0xE2A1 0xE2A2 \
+   0xE2A3 0xE2A4 0xE2A5 0xE2A6 0xE2A7 0xE2A8 0xE2A9 0xE2AA \
+   0xE2AB 0xE2AC 0xE2AD 0xE2AE 0xE2AF 0xE2B0 0xE2B1 0xE2B2 \
+   0xE2B3 0xE2B4 0xE2B5 0xE2B6 0xE2B7 0xE2B8 0xE2B9 0xE2BA \
+   0xE2BB 0xE2BC 0xE2BD 0xE2BE 0xE2BF 0xE2C0 0xE2C1 0xE2C2 \
+   0xE2C3 0xE2C4 0xE2C5 0xE2C6 0xE2C7 0xE2C8 0xE2C9 0xE2CA \
+   0xE2CB 0xE2CC 0xE2CD 0xE2CE 0xE2CF 0xE2D0 0xE2D1 0xE2D2 \
+   0xE2D3 0xE2D4 0xE2D5 0xE2D6 0xE2D7 0xE2D8 0xE2D9 0xE2DA \
+   0xE2DB 0xE2DC 0xE2DD 0xE2DE 0xE2DF 0xE2E0 0xE2E1 0xE2E2 \
+   0xE2E3 0xE2E4 0xE2E5 0xE2E6 0xE2E7 0xE2E8 0xE2E9 0xE2EA \
+   0xE2EB 0xE2EC 0xE2ED 0xE2EE 0xE2EF 0xE2F0 0xE2F1 0xE2F2 \
+   0xE2F3 0xE2F4 0xE2F5 0xE2F6 0xE2F7 0xE2F8 0xE2F9 0xE2FA \
+   0xE2FB 0xE2FC 0xE2FD 0xE2FE 0xE2FF 0xE300 0xE301 0xE302 \
+   0xE303 0xE304 0xE305 0xE306 0xE307 0xE308 0xE309 0xE30A \
+   0xE30B 0xE30C 0xE30D 0xE30E 0xE30F 0xE310
 
 # eof
diff -ru freetype-1.3.1.orig/contrib/ttf2pk/data/ttfonts.map freetype-1.3.1/contrib/ttf2pk/data/ttfonts.map
--- freetype-1.3.1.orig/contrib/ttf2pk/data/ttfonts.map	1999-04-09 20:57:32.000000000 +0200
+++ freetype-1.3.1/contrib/ttf2pk/data/ttfonts.map	2007-05-16 11:55:42.000000000 +0200
@@ -1,3 +1,4 @@
+% -*- coding: utf-8 -*-
 % These entries are just examples!
 
 arials           arial.ttf     Slant=0.25
@@ -9,10 +10,463 @@
 times95          times95.ttf   Encoding=T1-WGL4.enc
 
 ntukai@Big5@     ntu_kai.ttf   Pid = 3 Eid = 4
-cyberb@Unicode@  cyberbit.ttf
 
 % the next entry maps the Unicode encoded font to Big 5 encoding; thus you
 % can say \begin{CJK}{Big5}{...} (this is an environment from the CJK
 % package for LaTeX).
 
 mingli@UBig5@    mingliu.ttc   Fontindex = 0
+
+% For the Bitstream Cyberbit font:
+
+cyberb@Unicode@   cyberbit.ttf
+cyberbs@Unicode@  cyberbit.ttf  Slant=0.167
+cyberbr@Unicode@  cyberbit.ttf  Rotate=Yes
+cyberbrs@Unicode@ cyberbit.ttf  Rotate=Yes	Slant=0.167
+
+% For Microsofts Japanese True Type fonts:
+% ms=Microsoft, mi=mincho, go=gothic
+
+msmi@UJIS@        msmincho.ttc
+msmis@UJIS@       msmincho.ttc  Slant=0.167
+msmir@UJIS@       msmincho.ttc  Rotate=Yes
+msmirs@UJIS@      msmincho.ttc  Slant=0.167 Rotate=Yes
+msgo@UJIS@        msgothic.ttc
+msgos@UJIS@       msgothic.ttc  Slant=0.167
+msgor@UJIS@       msgothic.ttc  Rotate=Yes
+msgors@UJIS@      msgothic.ttc  Slant=0.167 Rotate=Yes
+
+msmi-uni@Unicode@        msmincho.ttc
+msmis-uni@Unicode@       msmincho.ttc  Slant=0.167
+msmir-uni@Unicode@       msmincho.ttc  Rotate=Yes
+msmirs-uni@Unicode@      msmincho.ttc  Slant=0.167 Rotate=Yes
+msgo-uni@Unicode@        msgothic.ttc
+msgos-uni@Unicode@       msgothic.ttc  Slant=0.167
+msgor-uni@Unicode@       msgothic.ttc  Rotate=Yes
+msgors-uni@Unicode@      msgothic.ttc  Slant=0.167 Rotate=Yes
+
+% The following entries are added for Debian GNU/{Linux,Hurd}
+% Last updated: 1999-12-12  <foka@debian.org>
+
+% Arphic Public License fonts
+% {ttf,tfm}-arphic-{bsmi00lp,bkai00mp,gbsn00lp,gkai00mp}
+
+% AR PL Mingti2L Big5
+bsmi00lp-big5@UBig5@     bsmi00lp.ttf
+bsmi00lp-s-big5@UBig5@   bsmi00lp.ttf   Slant=0.167
+bsmi00lp-r-big5@UBig5@   bsmi00lp.ttf   Rotate=Yes
+bsmi00lp-rs-big5@UBig5@  bsmi00lp.ttf   Rotate=Yes Slant=0.167
+% AR PL KaitiM Big5
+bkai00mp-big5@UBig5@     bkai00mp.ttf
+bkai00mp-s-big5@UBig5@   bkai00mp.ttf   Slant=0.167
+bkai00mp-r-big5@UBig5@   bkai00mp.ttf   Rotate=Yes
+bkai00mp-rs-big5@UBig5@  bkai00mp.ttf   Rotate=Yes Slant=0.167
+% AR PL SungtiL GB
+gbsn00lp-gb@UGB@         gbsn00lp.ttf
+gbsn00lp-s-gb@UGB@       gbsn00lp.ttf Slant=0.167
+gbsn00lp-r-gb@UGB@       gbsn00lp.ttf Rotate=Yes
+gbsn00lp-rs-gb@UGB@      gbsn00lp.ttf Rotate=Yes Slant=0.167
+% AR PL KaitiM GB
+gkai00mp-gb@UGB@         gkai00mp.ttf
+gkai00mp-s-gb@UGB@       gkai00mp.ttf Slant=0.167
+gkai00mp-r-gb@UGB@       gkai00mp.ttf Rotate=Yes
+gkai00mp-rs-gb@UGB@      gkai00mp.ttf Rotate=Yes Slant=0.167
+
+% AR PL Mingti2L Big5
+bsmi00lp-uni@Unicode@    bsmi00lp.ttf
+bsmi00lp-s-uni@Unicode@  bsmi00lp.ttf Slant=0.167
+bsmi00lp-r-uni@Unicode@  bsmi00lp.ttf Rotate=Yes
+bsmi00lp-rs-uni@Unicode@ bsmi00lp.ttf Rotate=Yes Slant=0.167
+% AR PL KaitiM Big5
+bkai00mp-uni@Unicode@    bkai00mp.ttf
+bkai00mp-s-uni@Unicode@  bkai00mp.ttf Slant=0.167
+bkai00mp-r-uni@Unicode@  bkai00mp.ttf Rotate=Yes
+bkai00mp-rs-uni@Unicode@ bkai00mp.ttf Rotate=Yes Slant=0.167
+% AR PL SungtiL GB
+gbsn00lp-uni@Unicode@    gbsn00lp.ttf
+gbsn00lp-s-uni@Unicode@  gbsn00lp.ttf Slant=0.167
+gbsn00lp-r-uni@Unicode@  gbsn00lp.ttf Rotate=Yes
+gbsn00lp-rs-uni@Unicode@ gbsn00lp.ttf Rotate=Yes Slant=0.167
+% AR PL KaitiM GB
+gkai00mp-uni@Unicode@    gkai00mp.ttf
+gkai00mp-s-uni@Unicode@  gkai00mp.ttf Slant=0.167
+gkai00mp-r-uni@Unicode@  gkai00mp.ttf Rotate=Yes
+gkai00mp-rs-uni@Unicode@ gkai00mp.ttf Rotate=Yes Slant=0.167
+
+% Taiwan Ministry of Education Standard Fonts
+% {ttf,tfm}-twmoe-{sung,kai}
+
+moesng@Big5@	 moe_sung.ttf 	Pid=3	Eid=4
+moekai@Big5@	 moe_kai.ttf	Pid=3	Eid=4
+
+% For future {ttf,tfm}-twmoe-{sung,kai} packages
+% t=Taiwan, m=MoE, sn=sung, ka=kai
+tmsn@Big5@	 moe_sung.ttf 	Pid=3	Eid=4
+tmsns@Big5@	 moe_sung.ttf 	Pid=3	Eid=4	Slant=0.167
+tmsnr@Big5@	 moe_sung.ttf 	Pid=3	Eid=4	Rotate=Yes
+tmsnrs@Big5@	 moe_sung.ttf 	Pid=3	Eid=4	Rotate=Yes	Slant=0.167
+tmka@Big5@	 moe_kai.ttf 	Pid=3	Eid=4
+tmkas@Big5@	 moe_kai.ttf 	Pid=3	Eid=4	Slant=0.167
+tmkar@Big5@	 moe_kai.ttf 	Pid=3	Eid=4	Rotate=Yes
+tmkars@Big5@	 moe_kai.ttf 	Pid=3	Eid=4	Rotate=Yes	Slant=0.167
+
+% Baekmuk TrueType fonts (Korean):
+% added by Mike Fabian  <mfabian@suse.de>
+batang@UKS@      batang.ttf
+batangs@UKS@     batang.ttf  Slant=0.167
+dotum@UKS@       dotum.ttf
+dotums@UKS@      dotum.ttf  Slant=0.167
+gulim@UKS@       gulim.ttf
+gulims@UKS@      gulim.ttf  Slant=0.167
+hline@UKS@       hline.ttf
+hlines@UKS@      hline.ttf  Slant=0.167
+
+batang-uni@Unicode@      batang.ttf
+batangs-uni@Unicode@     batang.ttf  Slant=0.167
+dotum-uni@Unicode@       dotum.ttf
+dotums-uni@Unicode@      dotum.ttf  Slant=0.167
+gulim-uni@Unicode@       gulim.ttf
+gulims-uni@Unicode@      gulim.ttf  Slant=0.167
+hline-uni@Unicode@       hline.ttf
+hlines-uni@Unicode@      hline.ttf  Slant=0.167
+
+% For the free Japanese True Type fonts watanabe-mincho.ttf and wadalab-gothic.ttf
+% added by Mike Fabian  <mfabian@suse.de>
+
+watamin@SJIS@        watanabe-mincho.ttf  Pid=3   Eid=2   
+watamins@SJIS@       watanabe-mincho.ttf  Pid=3   Eid=2   Slant=0.167
+wataminr@SJIS@       watanabe-mincho.ttf  Pid=3   Eid=2   Rotate=Yes
+wataminrs@SJIS@      watanabe-mincho.ttf  Pid=3   Eid=2   Slant=0.167 Rotate=Yes
+wadago@SJIS@         wadalab-gothic.ttf   Pid=3   Eid=2   
+wadagos@SJIS@        wadalab-gothic.ttf   Pid=3   Eid=2   Slant=0.167
+wadagor@SJIS@        wadalab-gothic.ttf   Pid=3   Eid=2   Rotate=Yes
+wadagors@SJIS@       wadalab-gothic.ttf   Pid=3   Eid=2   Slant=0.167 Rotate=Yes
+
+% For the free Japanese True Type fonts kochi-mincho.ttf and kochi-gothic.ttf
+% added by Mike Fabian  <mfabian@suse.de>
+
+kochimin@UJIS@        kochi-mincho.ttf   
+kochimins@UJIS@       kochi-mincho.ttf   Slant=0.167
+kochiminr@UJIS@       kochi-mincho.ttf   Rotate=Yes
+kochiminrs@UJIS@      kochi-mincho.ttf   Slant=0.167 Rotate=Yes
+kochigo@UJIS@         kochi-gothic.ttf     
+kochigos@UJIS@        kochi-gothic.ttf   Slant=0.167
+kochigor@UJIS@        kochi-gothic.ttf   Rotate=Yes
+kochigors@UJIS@       kochi-gothic.ttf   Slant=0.167 Rotate=Yes
+
+kochimin-uni@Unicode@        kochi-mincho.ttf   
+kochimins-uni@Unicode@       kochi-mincho.ttf   Slant=0.167
+kochiminr-uni@Unicode@       kochi-mincho.ttf   Rotate=Yes
+kochiminrs-uni@Unicode@      kochi-mincho.ttf   Slant=0.167 Rotate=Yes
+kochigo-uni@Unicode@         kochi-gothic.ttf     
+kochigos-uni@Unicode@        kochi-gothic.ttf   Slant=0.167
+kochigor-uni@Unicode@        kochi-gothic.ttf   Rotate=Yes
+kochigors-uni@Unicode@       kochi-gothic.ttf   Slant=0.167 Rotate=Yes
+
+% For the free Japanese True Type fonts sazanami-mincho.ttf and sazanami-gothic.ttf
+% added by Mike Fabian  <mfabian@suse.de>
+
+sazanamimin@UJIS@        sazanami-mincho.ttf   
+sazanamimins@UJIS@       sazanami-mincho.ttf   Slant=0.167
+sazanamiminr@UJIS@       sazanami-mincho.ttf   Rotate=Yes
+sazanamiminrs@UJIS@      sazanami-mincho.ttf   Slant=0.167 Rotate=Yes
+sazanamigo@UJIS@         sazanami-gothic.ttf     
+sazanamigos@UJIS@        sazanami-gothic.ttf   Slant=0.167
+sazanamigor@UJIS@        sazanami-gothic.ttf   Rotate=Yes
+sazanamigors@UJIS@       sazanami-gothic.ttf   Slant=0.167 Rotate=Yes
+
+sazanamimin-uni@Unicode@        sazanami-mincho.ttf   
+sazanamimins-uni@Unicode@       sazanami-mincho.ttf   Slant=0.167
+sazanamiminr-uni@Unicode@       sazanami-mincho.ttf   Rotate=Yes
+sazanamiminrs-uni@Unicode@      sazanami-mincho.ttf   Slant=0.167 Rotate=Yes
+sazanamigo-uni@Unicode@         sazanami-gothic.ttf     
+sazanamigos-uni@Unicode@        sazanami-gothic.ttf   Slant=0.167
+sazanamigor-uni@Unicode@        sazanami-gothic.ttf   Rotate=Yes
+sazanamigors-uni@Unicode@       sazanami-gothic.ttf   Slant=0.167 Rotate=Yes
+
+% For the free Japanese "みかちゃん" True Type fonts (handwriting style)
+% added by Mike Fabian  <mfabian@suse.de>
+
+mikachan@UJIS@          みかちゃん.ttf
+mikachan-s@UJIS@         みかちゃん.ttf   Slant=0.167
+mikachan-r@UJIS@         みかちゃん.ttf   Rotate=Yes
+mikachan-rs@UJIS@        みかちゃん.ttf   Slant=0.167 Rotate=Yes
+mikachan-p@UJIS@         みかちゃん-p.ttf   
+mikachan-p-s@UJIS@        みかちゃん-p.ttf   Slant=0.167
+mikachan-p-r@UJIS@        みかちゃん-p.ttf   Rotate=Yes
+mikachan-p-rs@UJIS@       みかちゃん-p.ttf   Slant=0.167 Rotate=Yes
+mikachan-pb@UJIS@        みかちゃん-pb.ttf   
+mikachan-pb-s@UJIS@       みかちゃん-pb.ttf   Slant=0.167
+mikachan-pb-r@UJIS@       みかちゃん-pb.ttf   Rotate=Yes
+mikachan-pb-rs@UJIS@      みかちゃん-pb.ttf   Slant=0.167 Rotate=Yes
+mikachan-ps@UJIS@        みかちゃん-ps.ttf   
+mikachan-ps-s@UJIS@       みかちゃん-ps.ttf   Slant=0.167
+mikachan-ps-r@UJIS@       みかちゃん-ps.ttf   Rotate=Yes
+mikachan-ps-rs@UJIS@      みかちゃん-ps.ttf   Slant=0.167 Rotate=Yes
+
+mikachan-uni@Unicode@          みかちゃん.ttf
+mikachan-s-uni@Unicode@         みかちゃん.ttf   Slant=0.167
+mikachan-r-uni@Unicode@         みかちゃん.ttf   Rotate=Yes
+mikachan-rs-uni@Unicode@        みかちゃん.ttf   Slant=0.167 Rotate=Yes
+mikachan-p-uni@Unicode@         みかちゃん-p.ttf   
+mikachan-p-s-uni@Unicode@        みかちゃん-p.ttf   Slant=0.167
+mikachan-p-r-uni@Unicode@        みかちゃん-p.ttf   Rotate=Yes
+mikachan-p-rs-uni@Unicode@       みかちゃん-p.ttf   Slant=0.167 Rotate=Yes
+mikachan-pb-uni@Unicode@        みかちゃん-pb.ttf   
+mikachan-pb-s-uni@Unicode@       みかちゃん-pb.ttf   Slant=0.167
+mikachan-pb-r-uni@Unicode@       みかちゃん-pb.ttf   Rotate=Yes
+mikachan-pb-rs-uni@Unicode@      みかちゃん-pb.ttf   Slant=0.167 Rotate=Yes
+mikachan-ps-uni@Unicode@        みかちゃん-ps.ttf   
+mikachan-ps-s-uni@Unicode@       みかちゃん-ps.ttf   Slant=0.167
+mikachan-ps-r-uni@Unicode@       みかちゃん-ps.ttf   Rotate=Yes
+mikachan-ps-rs-uni@Unicode@      みかちゃん-ps.ttf   Slant=0.167 Rotate=Yes
+
+% IPA fonts (Japanese):
+% added by Mike Fabian <mfabian@suse.de>
+ipagothic@UJIS@             ipag.ttf
+ipagothic-s@UJIS@           ipag.ttf    Slant=0.167
+ipagothic-r@UJIS@           ipag.ttf    Rotate=Yes
+ipagothic-rs@UJIS@          ipag.ttf    Slant=0.167 Rotate=Yes
+ipapgothic@UJIS@            ipagp.ttf
+ipapgothic-s@UJIS@          ipagp.ttf   Slant=0.167
+ipapgothic-r@UJIS@          ipagp.ttf   Rotate=Yes
+ipapgothic-rs@UJIS@         ipagp.ttf   Slant=0.167 Rotate=Yes
+ipauigothic@UJIS@           ipagui.ttf
+ipauigothic-s@UJIS@         ipagui.ttf  Slant=0.167
+ipauigothic-r@UJIS@         ipagui.ttf  Rotate=Yes
+ipauigothic-rs@UJIS@        ipagui.ttf  Slant=0.167 Rotate=Yes
+ipamincho@UJIS@             ipam.ttf
+ipamincho-s@UJIS@           ipam.ttf    Slant=0.167
+ipamincho-r@UJIS@           ipam.ttf    Rotate=Yes
+ipamincho-rs@UJIS@          ipam.ttf    Slant=0.167 Rotate=Yes
+ipapmincho@UJIS@            ipamp.ttf
+ipapmincho-s@UJIS@          ipamp.ttf   Slant=0.167
+ipapmincho-r@UJIS@          ipamp.ttf   Rotate=Yes
+ipapmincho-rs@UJIS@         ipamp.ttf   Slant=0.167 Rotate=Yes
+
+ipagothic-uni@Unicode@             ipag.ttf
+ipagothic-s-uni@Unicode@           ipag.ttf    Slant=0.167
+ipagothic-r-uni@Unicode@           ipag.ttf    Rotate=Yes
+ipagothic-rs-uni@Unicode@          ipag.ttf    Slant=0.167 Rotate=Yes
+ipapgothic-uni@Unicode@            ipagp.ttf
+ipapgothic-s-uni@Unicode@          ipagp.ttf   Slant=0.167
+ipapgothic-r-uni@Unicode@          ipagp.ttf   Rotate=Yes
+ipapgothic-rs-uni@Unicode@         ipagp.ttf   Slant=0.167 Rotate=Yes
+ipauigothic-uni@Unicode@           ipagui.ttf
+ipauigothic-s-uni@Unicode@         ipagui.ttf  Slant=0.167
+ipauigothic-r-uni@Unicode@         ipagui.ttf  Rotate=Yes
+ipauigothic-rs-uni@Unicode@        ipagui.ttf  Slant=0.167 Rotate=Yes
+ipamincho-uni@Unicode@             ipam.ttf
+ipamincho-s-uni@Unicode@           ipam.ttf    Slant=0.167
+ipamincho-r-uni@Unicode@           ipam.ttf    Rotate=Yes
+ipamincho-rs-uni@Unicode@          ipam.ttf    Slant=0.167 Rotate=Yes
+ipapmincho-uni@Unicode@            ipamp.ttf
+ipapmincho-s-uni@Unicode@          ipamp.ttf   Slant=0.167
+ipapmincho-r-uni@Unicode@          ipamp.ttf   Rotate=Yes
+ipapmincho-rs-uni@Unicode@         ipamp.ttf   Slant=0.167 Rotate=Yes
+
+% Novell-ricoh-fonts (Japanese):
+% added by Mike Fabian <mfabian@suse.de>
+
+HGGothicB@UJIS@                 hgjgbbmp.ttc
+HGGothicB-s@UJIS@               hgjgbbmp.ttc   Slant=0.167
+HGGothicB-r@UJIS@               hgjgbbmp.ttc   Rotate=Yes
+HGGothicB-rs@UJIS@              hgjgbbmp.ttc   Slant=0.167 Rotate=Yes
+HGGothicE@UJIS@                 hgrge.ttc
+HGGothicE-s@UJIS@               hgrge.ttc      Slant=0.167
+HGGothicE-r@UJIS@               hgrge.ttc      Rotate=Yes
+HGGothicE-rs@UJIS@              hgrge.ttc      Slant=0.167 Rotate=Yes
+HGGothicM@UJIS@                 hgrgm.ttc
+HGGothicM-s@UJIS@               hgrgm.ttc      Slant=0.167
+HGGothicM-r@UJIS@               hgrgm.ttc      Rotate=Yes
+HGGothicM-rs@UJIS@              hgrgm.ttc      Slant=0.167 Rotate=Yes
+HGGyoshotai@UJIS@               hgrgy.ttc
+HGGyoshotai-s@UJIS@             hgrgy.ttc      Slant=0.167
+HGGyoshotai-r@UJIS@             hgrgy.ttc      Rotate=Yes
+HGGyoshotai-rs@UJIS@            hgrgy.ttc      Slant=0.167 Rotate=Yes
+HGKyokashotai@UJIS@             hgrkk.ttc
+HGKyokashotai-s@UJIS@           hgrkk.ttc      Slant=0.167
+HGKyokashotai-r@UJIS@           hgrkk.ttc      Rotate=Yes
+HGKyokashotai-rs@UJIS@          hgrkk.ttc      Slant=0.167 Rotate=Yes
+HGMaruGothicMPRO@UJIS@          hgrsmp.ttf
+HGMaruGothicMPRO-s@UJIS@        hgrsmp.ttf     Slant=0.167
+HGMaruGothicMPRO-r@UJIS@        hgrsmp.ttf     Rotate=Yes
+HGMaruGothicMPRO-rs@UJIS@       hgrsmp.ttf     Slant=0.167 Rotate=Yes
+HGMinchoB@UJIS@                 hgrmb.ttc
+HGMinchoB-s@UJIS@               hgrmb.ttc      Slant=0.167
+HGMinchoB-r@UJIS@               hgrmb.ttc      Rotate=Yes
+HGMinchoB-rs@UJIS@              hgrmb.ttc      Slant=0.167 Rotate=Yes
+HGMinchoE@UJIS@                 hgrme.ttc
+HGMinchoE-s@UJIS@               hgrme.ttc      Slant=0.167
+HGMinchoE-r@UJIS@               hgrme.ttc      Rotate=Yes
+HGMinchoE-rs@UJIS@              hgrme.ttc      Slant=0.167 Rotate=Yes
+HGMinchoL@UJIS@                 hgjmlbmp.ttc
+HGMinchoL-s@UJIS@               hgjmlbmp.ttc   Slant=0.167
+HGMinchoL-r@UJIS@               hgjmlbmp.ttc   Rotate=Yes
+HGMinchoL-rs@UJIS@              hgjmlbmp.ttc   Slant=0.167 Rotate=Yes
+HGSeikaishotaiPRO@UJIS@         hgrskp.ttf
+HGSeikaishotaiPRO-s@UJIS@       hgrskp.ttf     Slant=0.167
+HGSeikaishotaiPRO-r@UJIS@       hgrskp.ttf     Rotate=Yes
+HGSeikaishotaiPRO-rs@UJIS@      hgrskp.ttf     Slant=0.167 Rotate=Yes
+HGSoeiKakugothicUB@UJIS@        hgrsgu.ttc
+HGSoeiKakugothicUB-s@UJIS@      hgrsgu.ttc     Slant=0.167
+HGSoeiKakugothicUB-r@UJIS@      hgrsgu.ttc     Rotate=Yes
+HGSoeiKakugothicUB-rs@UJIS@     hgrsgu.ttc     Slant=0.167 Rotate=Yes
+HGSoeiKakupoptai@UJIS@          hgrpp1.ttc
+HGSoeiKakupoptai-s@UJIS@        hgrpp1.ttc     Slant=0.167
+HGSoeiKakupoptai-r@UJIS@        hgrpp1.ttc     Rotate=Yes
+HGSoeiKakupoptai-rs@UJIS@       hgrpp1.ttc     Slant=0.167 Rotate=Yes
+HGSoeiPresenceEB@UJIS@          hgrpre.ttc
+HGSoeiPresenceEB-s@UJIS@        hgrpre.ttc     Slant=0.167
+HGSoeiPresenceEB-r@UJIS@        hgrpre.ttc     Rotate=Yes
+HGSoeiPresenceEB-rs@UJIS@       hgrpre.ttc     Slant=0.167 Rotate=Yes
+
+HGGothicB-uni@Unicode@                 hgjgbbmp.ttc
+HGGothicB-s-uni@Unicode@               hgjgbbmp.ttc   Slant=0.167
+HGGothicB-r-uni@Unicode@               hgjgbbmp.ttc   Rotate=Yes
+HGGothicB-rs-uni@Unicode@              hgjgbbmp.ttc   Slant=0.167 Rotate=Yes
+HGGothicE-uni@Unicode@                 hgrge.ttc
+HGGothicE-s-uni@Unicode@               hgrge.ttc      Slant=0.167
+HGGothicE-r-uni@Unicode@               hgrge.ttc      Rotate=Yes
+HGGothicE-rs-uni@Unicode@              hgrge.ttc      Slant=0.167 Rotate=Yes
+HGGothicM-uni@Unicode@                 hgrgm.ttc
+HGGothicM-s-uni@Unicode@               hgrgm.ttc      Slant=0.167
+HGGothicM-r-uni@Unicode@               hgrgm.ttc      Rotate=Yes
+HGGothicM-rs-uni@Unicode@              hgrgm.ttc      Slant=0.167 Rotate=Yes
+HGGyoshotai-uni@Unicode@               hgrgy.ttc
+HGGyoshotai-s-uni@Unicode@             hgrgy.ttc      Slant=0.167
+HGGyoshotai-r-uni@Unicode@             hgrgy.ttc      Rotate=Yes
+HGGyoshotai-rs-uni@Unicode@            hgrgy.ttc      Slant=0.167 Rotate=Yes
+HGKyokashotai-uni@Unicode@             hgrkk.ttc
+HGKyokashotai-s-uni@Unicode@           hgrkk.ttc      Slant=0.167
+HGKyokashotai-r-uni@Unicode@           hgrkk.ttc      Rotate=Yes
+HGKyokashotai-rs-uni@Unicode@          hgrkk.ttc      Slant=0.167 Rotate=Yes
+HGMaruGothicMPRO-uni@Unicode@          hgrsmp.ttf
+HGMaruGothicMPRO-s-uni@Unicode@        hgrsmp.ttf     Slant=0.167
+HGMaruGothicMPRO-r-uni@Unicode@        hgrsmp.ttf     Rotate=Yes
+HGMaruGothicMPRO-rs-uni@Unicode@       hgrsmp.ttf     Slant=0.167 Rotate=Yes
+HGMinchoB-uni@Unicode@                 hgrmb.ttc
+HGMinchoB-s-uni@Unicode@               hgrmb.ttc      Slant=0.167
+HGMinchoB-r-uni@Unicode@               hgrmb.ttc      Rotate=Yes
+HGMinchoB-rs-uni@Unicode@              hgrmb.ttc      Slant=0.167 Rotate=Yes
+HGMinchoE-uni@Unicode@                 hgrme.ttc
+HGMinchoE-s-uni@Unicode@               hgrme.ttc      Slant=0.167
+HGMinchoE-r-uni@Unicode@               hgrme.ttc      Rotate=Yes
+HGMinchoE-rs-uni@Unicode@              hgrme.ttc      Slant=0.167 Rotate=Yes
+HGMinchoL-uni@Unicode@                 hgjmlbmp.ttc
+HGMinchoL-s-uni@Unicode@               hgjmlbmp.ttc   Slant=0.167
+HGMinchoL-r-uni@Unicode@               hgjmlbmp.ttc   Rotate=Yes
+HGMinchoL-rs-uni@Unicode@              hgjmlbmp.ttc   Slant=0.167 Rotate=Yes
+HGSeikaishotaiPRO-uni@Unicode@         hgrskp.ttf
+HGSeikaishotaiPRO-s-uni@Unicode@       hgrskp.ttf     Slant=0.167
+HGSeikaishotaiPRO-r-uni@Unicode@       hgrskp.ttf     Rotate=Yes
+HGSeikaishotaiPRO-rs-uni@Unicode@      hgrskp.ttf     Slant=0.167 Rotate=Yes
+HGSoeiKakugothicUB-uni@Unicode@        hgrsgu.ttc
+HGSoeiKakugothicUB-s-uni@Unicode@      hgrsgu.ttc     Slant=0.167
+HGSoeiKakugothicUB-r-uni@Unicode@      hgrsgu.ttc     Rotate=Yes
+HGSoeiKakugothicUB-rs-uni@Unicode@     hgrsgu.ttc     Slant=0.167 Rotate=Yes
+HGSoeiKakupoptai-uni@Unicode@          hgrpp1.ttc
+HGSoeiKakupoptai-s-uni@Unicode@        hgrpp1.ttc     Slant=0.167
+HGSoeiKakupoptai-r-uni@Unicode@        hgrpp1.ttc     Rotate=Yes
+HGSoeiKakupoptai-rs-uni@Unicode@       hgrpp1.ttc     Slant=0.167 Rotate=Yes
+HGSoeiPresenceEB-uni@Unicode@          hgrpre.ttc
+HGSoeiPresenceEB-s-uni@Unicode@        hgrpre.ttc     Slant=0.167
+HGSoeiPresenceEB-r-uni@Unicode@        hgrpre.ttc     Rotate=Yes
+HGSoeiPresenceEB-rs-uni@Unicode@       hgrpre.ttc     Slant=0.167 Rotate=Yes
+
+% Founder fonts (Chinese):
+% added by Mike Fabian <mfabian@suse.de>
+
+% simplified Chinese:
+
+FZFangSong-gb@UGB@              FZFangSong.ttf
+FZFangSong-s-gb@UGB@            FZFangSong.ttf  Slant=0.167
+FZFangSong-r-gb@UGB@            FZFangSong.ttf  Rotate=Yes
+FZFangSong-rs-gb@UGB@           FZFangSong.ttf  Rotate=Yes      Slant=0.167
+
+FZFangSong-gbk@UGBK@            FZFangSong.ttf
+FZFangSong-s-gbk@UGBK@          FZFangSong.ttf  Slant=0.167
+FZFangSong-r-gbk@UGBK@          FZFangSong.ttf  Rotate=Yes
+FZFangSong-rs-gbk@UGBK@         FZFangSong.ttf  Rotate=Yes      Slant=0.167
+
+FZFangSong-uni@Unicode@         FZFangSong.ttf
+FZFangSong-s-uni@Unicode@       FZFangSong.ttf  Slant=0.167
+FZFangSong-r-uni@Unicode@       FZFangSong.ttf  Rotate=Yes
+FZFangSong-rs-uni@Unicode@      FZFangSong.ttf  Rotate=Yes      Slant=0.167
+
+FZHeiTi-gb@UGB@                 FZHeiTi.ttf
+FZHeiTi-s-gb@UGB@               FZHeiTi.ttf     Slant=0.167
+FZHeiTi-r-gb@UGB@               FZHeiTi.ttf     Rotate=Yes
+FZHeiTi-rs-gb@UGB@              FZHeiTi.ttf     Rotate=Yes      Slant=0.167
+
+FZHeiTi-gbk@UGBK@               FZHeiTi.ttf
+FZHeiTi-s-gbk@UGBK@             FZHeiTi.ttf     Slant=0.167
+FZHeiTi-r-gbk@UGBK@             FZHeiTi.ttf     Rotate=Yes
+FZHeiTi-rs-gbk@UGBK@            FZHeiTi.ttf     Rotate=Yes      Slant=0.167
+
+FZHeiTi-uni@Unicode@            FZHeiTi.ttf
+FZHeiTi-s-uni@Unicode@          FZHeiTi.ttf     Slant=0.167
+FZHeiTi-r-uni@Unicode@          FZHeiTi.ttf     Rotate=Yes
+FZHeiTi-rs-uni@Unicode@         FZHeiTi.ttf     Rotate=Yes      Slant=0.167
+
+FZKaiTi-gb@UGB@                 FZKaiTi.ttf
+FZKaiTi-s-gb@UGB@               FZKaiTi.ttf     Slant=0.167
+FZKaiTi-r-gb@UGB@               FZKaiTi.ttf     Rotate=Yes
+FZKaiTi-rs-gb@UGB@              FZKaiTi.ttf     Rotate=Yes      Slant=0.167
+
+FZKaiTi-gbk@UGBK@               FZKaiTi.ttf
+FZKaiTi-s-gbk@UGBK@             FZKaiTi.ttf     Slant=0.167
+FZKaiTi-r-gbk@UGBK@             FZKaiTi.ttf     Rotate=Yes
+FZKaiTi-rs-gbk@UGBK@            FZKaiTi.ttf     Rotate=Yes      Slant=0.167
+
+FZKaiTi-uni@Unicode@            FZKaiTi.ttf
+FZKaiTi-s-uni@Unicode@          FZKaiTi.ttf     Slant=0.167
+FZKaiTi-r-uni@Unicode@          FZKaiTi.ttf     Rotate=Yes
+FZKaiTi-rs-uni@Unicode@         FZKaiTi.ttf     Rotate=Yes      Slant=0.167
+
+FZSongTi-gb@UGB@                FZSongTi.ttf
+FZSongTi-s-gb@UGB@              FZSongTi.ttf    Slant=0.167
+FZSongTi-r-gb@UGB@              FZSongTi.ttf    Rotate=Yes
+FZSongTi-rs-gb@UGB@             FZSongTi.ttf    Rotate=Yes      Slant=0.167
+
+FZSongTi-gbk@UGBK@              FZSongTi.ttf
+FZSongTi-s-gbk@UGBK@            FZSongTi.ttf    Slant=0.167
+FZSongTi-r-gbk@UGBK@            FZSongTi.ttf    Rotate=Yes
+FZSongTi-rs-gbk@UGBK@           FZSongTi.ttf    Rotate=Yes      Slant=0.167
+
+FZSongTi-uni@Unicode@           FZSongTi.ttf
+FZSongTi-s-uni@Unicode@         FZSongTi.ttf    Slant=0.167
+FZSongTi-r-uni@Unicode@         FZSongTi.ttf    Rotate=Yes
+FZSongTi-rs-uni@Unicode@        FZSongTi.ttf    Rotate=Yes      Slant=0.167
+
+% traditional Chinese:
+
+FZMingTiB-big5@UBig5@             FZMingTiB.ttf
+FZMingTiB-s-big5@UBig5@           FZMingTiB.ttf   Slant=0.167
+FZMingTiB-r-big5@UBig5@           FZMingTiB.ttf   Rotate=Yes
+FZMingTiB-rs-big5@UBig5@          FZMingTiB.ttf   Rotate=Yes      Slant=0.167
+
+FZMingTiB-big5plus@UBg5plus@         FZMingTiB.ttf
+FZMingTiB-s-big5plus@UBg5plus@       FZMingTiB.ttf   Slant=0.167
+FZMingTiB-r-big5plus@UBg5plus@       FZMingTiB.ttf   Rotate=Yes
+FZMingTiB-rs-big5plus@UBg5plus@      FZMingTiB.ttf   Rotate=Yes      Slant=0.167
+
+FZMingTiB-uni@Unicode@          FZMingTiB.ttf
+FZMingTiB-s-uni@Unicode@        FZMingTiB.ttf   Slant=0.167
+FZMingTiB-r-uni@Unicode@        FZMingTiB.ttf   Rotate=Yes
+FZMingTiB-rs-uni@Unicode@       FZMingTiB.ttf   Rotate=Yes      Slant=0.167
+
+FZKaiTiB-big5@UBig5@              FZKaiTiB.ttf
+FZKaiTiB-s-big5@UBig5@            FZKaiTiB.ttf    Slant=0.167
+FZKaiTiB-r-big5@UBig5@            FZKaiTiB.ttf    Rotate=Yes
+FZKaiTiB-rs-big5@UBig5@           FZKaiTiB.ttf    Rotate=Yes      Slant=0.167
+
+FZKaiTiB-big5plus@UBg5plus@          FZKaiTiB.ttf
+FZKaiTiB-s-big5plus@UBg5plus@        FZKaiTiB.ttf    Slant=0.167
+FZKaiTiB-r-big5plus@UBg5plus@        FZKaiTiB.ttf    Rotate=Yes
+FZKaiTiB-rs-big5plus@UBg5plus@       FZKaiTiB.ttf    Rotate=Yes      Slant=0.167
+
+FZKaiTiB-uni@Unicode@           FZKaiTiB.ttf
+FZKaiTiB-s-uni@Unicode@         FZKaiTiB.ttf    Slant=0.167
+FZKaiTiB-r-uni@Unicode@         FZKaiTiB.ttf    Rotate=Yes
+FZKaiTiB-rs-uni@Unicode@        FZKaiTiB.ttf    Rotate=Yes      Slant=0.167