dejavu: use filler subfonts that are closer to font height

1 files changed, 127 insertions, 62 deletions

diff --git a/lib/font/bit/dejavubi/unicode.18.font b/lib/font/bit/dejavubi/unicode.18.font
index ab6f30bc3..901b39724 100644
--- a/lib/font/bit/dejavubi/unicode.18.font
+++ b/lib/font/bit/dejavubi/unicode.18.font
@@ -1,78 +1,143 @@
-23	18
+23 18
 0xfff9	0xffff	dejavubi.18.fff9
-0xff00	0xfff8	../fixed/10x20.FF00
 0xfb00	0xfc00	dejavubi.18.fb00
 0xf6c4	0xf7c4	dejavubi.18.f6c4
 0xf400	0xf500	dejavubi.18.f400
 0xa746	0xa846	dejavubi.18.a746
 0xa644	0xa744	dejavubi.18.a644
-0x9e00	0x9fff	../jis/jis9e00.24
-0x9c00	0x9dff	../jis/jis9c00.24
-0x9a00	0x9bff	../jis/jis9a00.24
-0x9800	0x99ff	../jis/jis9800.24
-0x9600	0x97ff	../jis/jis9600.24
-0x9400	0x95ff	../jis/jis9400.24
-0x9200	0x93ff	../jis/jis9200.24
-0x9000	0x91ff	../jis/jis9000.24
-0x8e00	0x8fff	../jis/jis8e00.24
-0x8c00	0x8dff	../jis/jis8c00.24
-0x8a00	0x8bff	../jis/jis8a00.24
-0x8800	0x89ff	../jis/jis8800.24
-0x8600	0x87ff	../jis/jis8600.24
-0x8400	0x85ff	../jis/jis8400.24
-0x8200	0x83ff	../jis/jis8200.24
-0x8000	0x81ff	../jis/jis8000.24
-0x7e00	0x7fff	../jis/jis7e00.24
-0x7c00	0x7dff	../jis/jis7c00.24
-0x7a00	0x7bff	../jis/jis7a00.24
-0x7800	0x79ff	../jis/jis7800.24
-0x7600	0x77ff	../jis/jis7600.24
-0x7400	0x75ff	../jis/jis7400.24
-0x7200	0x73ff	../jis/jis7200.24
-0x7000	0x71ff	../jis/jis7000.24
-0x6e00	0x6fff	../jis/jis6e00.24
-0x6c00	0x6dff	../jis/jis6c00.24
-0x6a00	0x6bff	../jis/jis6a00.24
-0x6800	0x69ff	../jis/jis6800.24
-0x6600	0x67ff	../jis/jis6600.24
-0x6400	0x65ff	../jis/jis6400.24
-0x6200	0x63ff	../jis/jis6200.24
-0x6000	0x61ff	../jis/jis6000.24
-0x5e00	0x5fff	../jis/jis5e00.24
-0x5c00	0x5dff	../jis/jis5c00.24
-0x5a00	0x5bff	../jis/jis5a00.24
-0x5800	0x59ff	../jis/jis5800.24
-0x5600	0x57ff	../jis/jis5600.24
-0x5400	0x55ff	../jis/jis5400.24
-0x5200	0x53ff	../jis/jis5200.24
-0x5000	0x51ff	../jis/jis5000.24
-0x4ec1	0x4fff	../jis/jis4e00.24
-0x3041	0x309e	../jis/hiragana.24
-0x30a1	0x30fe	../jis/katakana.24
-0x3000	0x303f	../jis/jis3000.24
 0x2e18	0x2f18	dejavubi.18.2e18
 0x2c60	0x2d60	dejavubi.18.2c60
 0x2b00	0x2c00	dejavubi.18.2b00
-0x29eb	0x2aeb	dejavubi.18.29eb
 0x28a2	0x29a2	dejavubi.18.28a2
 0x27a1	0x28a1	dejavubi.18.27a1
 0x2580	0x2680	dejavubi.18.2580
-0x2423	0x2523	dejavubi.18.2423
-0x2308	0x2408	dejavubi.18.2308
-0x2204	0x2304	dejavubi.18.2204
-0x21eb	0x2203	dejavubi.18.2103
-0x2190	0x21ea	../misc/arrows
-0x1ff6	0x20f6	dejavubi.18.1ff6
-0x1ef4	0x1ff4	dejavubi.18.1ef4
 0x1e01	0x1ef3	dejavubi.18.1e01
 0x1d00	0x1e00	dejavubi.18.1d00
 0x10a0	0x11a0	dejavubi.18.10a0
-0x0510	0x0610	dejavubi.18.0510
-0x0401	0x0501	dejavubi.18.0401
-0x0300	0x0400	dejavubi.18.0300
-0x01f4	0x02f4	dejavubi.18.01f4
-0x0101	0x01f3	dejavubi.18.0101
-0x007f	0x007f	../palatino/R.6.1
-0x0000	0x000f	../palatino/R.6.1
 0x0000	0x0100	dejavubi.18.0000
-
+0xf6c5	0xf7c5	../dejavu/dejavu.18.f6c5
+0x1e01	0x1f01	../dejavu/dejavu.18.1e01
+0x0101	0x0201	../dejavu/dejavu.18.0101
+0xfe00	0xfeff	../dejavusans/dejavusans.18.fe00
+0xf001	0xf101	../dejavusans/dejavusans.18.f001
+0xef00	0xf000	../dejavusans/dejavusans.18.ef00
+0x4dc0	0x4ec0	../dejavusans/dejavusans.18.4dc0
+0x2d61	0x2e61	../dejavusans/dejavusans.18.2d61
+0x1401	0x1501	../dejavusans/dejavusans.18.1401
+0x0f00	0x0f3f	../dejavusans/dejavusans.18.0e3f
+0x07c0	0x08c0	../dejavusans/dejavusans.18.07c0
+0x03c0	0x03c0	../dejavusans/dejavusans.18.03c0
+0x03a9	0x03a9	../dejavusans/dejavusans.18.03a9
+0x3000	0x30fe	../shinonome/k16.3000
+0x4e00	0x4ffe	../shinonome/k16.4e00
+0x5005	0x51fe	../shinonome/k16.5005
+0x5200	0x53fa	../shinonome/k16.5200
+0x5401	0x55fe	../shinonome/k16.5401
+0x5606	0x57fc	../shinonome/k16.5606
+0x5800	0x59ff	../shinonome/k16.5800
+0x5a01	0x5bff	../shinonome/k16.5a01
+0x5c01	0x5dfe	../shinonome/k16.5c01
+0x5e02	0x5fff	../shinonome/k16.5e02
+0x600e	0x61ff	../shinonome/k16.600e
+0x6200	0x63fa	../shinonome/k16.6200
+0x6406	0x65fb	../shinonome/k16.6406
+0x6602	0x67ff	../shinonome/k16.6602
+0x6802	0x69ff	../shinonome/k16.6802
+0x6a02	0x6bf3	../shinonome/k16.6a02
+0x6c08	0x6dfb	../shinonome/k16.6c08
+0x6e05	0x6ffe	../shinonome/k16.6e05
+0x7001	0x71ff	../shinonome/k16.7001
+0x7206	0x73fe	../shinonome/k16.7206
+0x7403	0x75ff	../shinonome/k16.7403
+0x7601	0x77fc	../shinonome/k16.7601
+0x7802	0x79fb	../shinonome/k16.7802
+0x7a00	0x7bf7	../shinonome/k16.7a00
+0x7c00	0x7dfb	../shinonome/k16.7c00
+0x7e01	0x7ffc	../shinonome/k16.7e01
+0x8000	0x81fe	../shinonome/k16.8000
+0x8201	0x83fd	../shinonome/k16.8201
+0x8403	0x85fe	../shinonome/k16.8403
+0x8602	0x87fe	../shinonome/k16.8602
+0x8805	0x89f8	../shinonome/k16.8805
+0x8a00	0x8b9a	../shinonome/k16.8a00
+0x8c37	0x8dff	../shinonome/k16.8c37
+0x8e08	0x8ffd	../shinonome/k16.8e08
+0x9000	0x91ff	../shinonome/k16.9000
+0x920d	0x93e8	../shinonome/k16.920d
+0x9403	0x95e5	../shinonome/k16.9403
+0x961c	0x97ff	../shinonome/k16.961c
+0x9801	0x99ff	../shinonome/k16.9801
+0x9a01	0x9bf5	../shinonome/k16.9a01
+0x9c04	0x9dfd	../shinonome/k16.9c04
+0x9e1a	0x9fa0	../shinonome/k16.9e1a
+0x4e00	0x4fff	../jis/jis4e00.24
+0x5000	0x51ff	../jis/jis5000.24
+0x5200	0x53ff	../jis/jis5200.24
+0x5400	0x55ff	../jis/jis5400.24
+0x5600	0x57ff	../jis/jis5600.24
+0x5a00	0x5bff	../jis/jis5a00.24
+0x5c00	0x5dff	../jis/jis5c00.24
+0x5e00	0x5fff	../jis/jis5e00.24
+0x6000	0x61ff	../jis/jis6000.24
+0x6200	0x63ff	../jis/jis6200.24
+0x6400	0x65ff	../jis/jis6400.24
+0x6600	0x67ff	../jis/jis6600.24
+0x6800	0x69ff	../jis/jis6800.24
+0x6a00	0x6bff	../jis/jis6a00.24
+0x6c00	0x6dff	../jis/jis6c00.24
+0x6e00	0x6fff	../jis/jis6e00.24
+0x7000	0x71ff	../jis/jis7000.24
+0x7200	0x73ff	../jis/jis7200.24
+0x7400	0x75ff	../jis/jis7400.24
+0x7600	0x77ff	../jis/jis7600.24
+0x7800	0x79ff	../jis/jis7800.24
+0x7a00	0x7bff	../jis/jis7a00.24
+0x7c00	0x7dff	../jis/jis7c00.24
+0x7e00	0x7fff	../jis/jis7e00.24
+0x8000	0x81ff	../jis/jis8000.24
+0x8200	0x83ff	../jis/jis8200.24
+0x8400	0x85ff	../jis/jis8400.24
+0x8600	0x87ff	../jis/jis8600.24
+0x8800	0x89ff	../jis/jis8800.24
+0x8a00	0x8bff	../jis/jis8a00.24
+0x8c00	0x8dff	../jis/jis8c00.24
+0x8e00	0x8fff	../jis/jis8e00.24
+0x9200	0x93ff	../jis/jis9200.24
+0x9400	0x95ff	../jis/jis9400.24
+0x9600	0x97ff	../jis/jis9600.24
+0x9800	0x99ff	../jis/jis9800.24
+0x9a00	0x9bff	../jis/jis9a00.24
+0x9c00	0x9dff	../jis/jis9c00.24
+0x9e00	0x9fff	../jis/jis9e00.24
+0x0200	0x02ff	../fixed/6x10.0200
+0x0300	0x03ff	../fixed/6x10.0300
+0x0400	0x04ff	../fixed/6x10.0400
+0x0500	0x05ff	../fixed/6x10.0500
+0x1600	0x16ff	../fixed/6x10.1600
+0x1f00	0x1fff	../fixed/6x10.1F00
+0x2000	0x20ff	../fixed/6x10.2000
+0x2100	0x21ff	../fixed/6x10.2100
+0x2200	0x22ff	../fixed/6x10.2200
+0x2300	0x23ff	../fixed/6x10.2300
+0x2400	0x24ff	../fixed/6x10.2400
+0x2500	0x25ff	../fixed/6x10.2500
+0x2600	0x26ff	../fixed/6x10.2600
+0xff00	0xffff	../fixed/6x10.FF00
+0x2700	0x27bf	../misc/zapf
+0x0600	0x06ff	../fixed/10x20.0600
+0x0e00	0x0eff	../fixed/10x20.0E00
+0x1000	0x10ff	../fixed/10x20.1000
+0x1200	0x12ff	../fixed/10x20.1200
+0x1300	0x13ff	../fixed/10x20.1300
+0x2a00	0x2aff	../fixed/10x20.2A00
+0x4d00	0x4dff	../fixed/10x20.4D00
+0xfc00	0xfcff	../fixed/10x20.FC00
+0xfd00	0xfdff	../fixed/10x20.FD00
+0x29eb	0x2aeb	../dejavu/dejavu.14.29eb
+0x1400	0x14ff	../fixed/9x18.1400
+0x1500	0x15ff	../fixed/9x18.1500
+0x2940	0x2a40	../dejavusans/dejavusans.12.2940
+0x0606	0x0706	../dejavusans/dejavusans.12.0606
+0xe000	0xe0ff	../fixed/9x15.E000
+0xe700	0xe7ff	../fixed/9x15.E700
+0x1100	0x11ff	../fixed/6x13.1100