dejavu: use filler subfonts that are closer to font height

4 files changed, 186 insertions, 96 deletions

diff --git a/lib/font/bit/dejavusansit/unicode.12.font b/lib/font/bit/dejavusansit/unicode.12.font
index bb6ab1d4a..e6bd36883 100644
--- a/lib/font/bit/dejavusansit/unicode.12.font
+++ b/lib/font/bit/dejavusansit/unicode.12.font
@@ -1,6 +1,6 @@
-15	12
+15 12
 0xfff9	0xffff	dejavusansit.12.fff9
-0xff00	0xfff8	../fixed/10x20.FF00
+0xff00	0xfff8	../fixed/6x12.FF00
 0xfe00	0xff00	dejavusansit.12.fe00
 0xfb00	0xfc00	dejavusansit.12.fb00
 0xf6c5	0xf7c5	dejavusansit.12.f6c5
@@ -56,13 +56,8 @@
 0x2c60	0x2d60	dejavusansit.12.2c60
 0x2a7d	0x2b7d	dejavusansit.12.2a7d
 0x2940	0x2a40	dejavusansit.12.2940
-0x2826	0x2926	dejavusansit.12.2826
-0x2725	0x2825	dejavusansit.12.2725
-0x2624	0x2724	dejavusansit.12.2624
 0x2523	0x2623	dejavusansit.12.2523
 0x2422	0x2522	dejavusansit.12.2422
-0x2306	0x2406	dejavusansit.12.2306
-0x2205	0x2305	dejavusansit.12.2205
 0x21eb	0x2204	dejavusansit.12.2104
 0x2190	0x21ea	../misc/arrows
 0x2104	0x2189	dejavusansit.12.2104
@@ -72,22 +67,51 @@
 0x1d00	0x1e00	dejavusansit.12.1d00
 0x1700	0x1746	dejavusansit.12.1646
 0x1600	0x16ff	../fixed/10x20.1600
-0x14ff	0x15ff	dejavusansit.12.14ff
 0x1401	0x14fe	dejavusansit.12.1401
 0x1300	0x13ff	../fixed/10x20.1300
 0x1200	0x12ff	../fixed/10x20.1200
 0x10a0	0x11a0	dejavusansit.12.10a0
 0x0e3f	0x0f3f	dejavusansit.12.0e3f
-0x0505	0x0605	dejavusansit.12.0505
-0x0404	0x0504	dejavusansit.12.0404
 0x03c0	0x03c0	dejavusansit.12.03c0
 0x03a9	0x03a9	dejavusansit.12.03a9
-0x0303	0x0403	dejavusansit.12.0303
-0x0202	0x0302	dejavusansit.12.0202
 0x0101	0x0201	dejavusansit.12.0101
-0x00a0	0x0100	dejavusansit.12.00a0
-0x007f	0x007f	../palatino/R.6.1
-0x0020	0x009f	dejavusansit.12.0020
-0x0000	0x000f	../palatino/R.6.1
-0x0000	0x001f	dejavusansit.12.0000
-
+0x00a0	0x00ff	dejavusansit.12.00a0
+0x0020	0x007e	dejavusansit.12.0020
+0x0000	0x0100	dejavusansit.12.0000
+0xf400	0xf500	../dejavu/dejavu.12.f400
+0x2b00	0x2c00	../dejavu/dejavu.12.2b00
+0x29eb	0x2aeb	../dejavu/dejavu.12.29eb
+0x28a2	0x29a2	../dejavu/dejavu.12.28a2
+0x27a1	0x28a1	../dejavu/dejavu.12.27a1
+0x2638	0x2738	../dejavu/dejavu.12.2638
+0x2524	0x2624	../dejavu/dejavu.12.2524
+0x2310	0x2410	../dejavu/dejavu.12.2310
+0x220b	0x230b	../dejavu/dejavu.12.220b
+0x2109	0x2209	../dejavu/dejavu.12.2109
+0x0510	0x0610	../dejavu/dejavu.12.0510
+0x0404	0x0504	../dejavu/dejavu.12.0404
+0x0303	0x0403	../dejavu/dejavu.12.0303
+0x0202	0x0302	../dejavu/dejavu.12.0202
+0xf001	0xf101	../dejavusans/dejavusans.12.f001
+0x2d61	0x2e61	../dejavusans/dejavusans.12.2d61
+0x2713	0x2813	../dejavusans/dejavusans.12.2713
+0x2612	0x2712	../dejavusans/dejavusans.12.2612
+0x22f8	0x23f8	../dejavusans/dejavusans.12.22f8
+0x21fc	0x22f7	../dejavusans/dejavusans.12.21fc
+0x1502	0x15ff	../dejavusans/dejavusans.12.1502
+0x1401	0x1501	../dejavusans/dejavusans.12.1401
+0x07c0	0x08c0	../dejavusans/dejavusans.12.07c0
+0x0606	0x0706	../dejavusans/dejavusans.12.0606
+0x0505	0x0605	../dejavusans/dejavusans.12.0505
+0x3000	0x30fe	../shinonome/k12.3000
+0x0e00	0x0eff	../fixed/7x14.0E00
+0x2100	0x21ff	../fixed/7x14.2100
+0x2400	0x24ff	../fixed/7x14.2400
+0x1000	0x10ff	../fixed/9x15.1000
+0xe000	0xe0ff	../fixed/9x15.E000
+0xe700	0xe7ff	../fixed/9x15.E700
+0x1400	0x14ff	../fixed/9x18.1400
+0xfc00	0xfcff	../fixed/10x20.FC00
+0xfd00	0xfdff	../fixed/10x20.FD00
+0x1100	0x11ff	../fixed/6x13.1100
+0x4d00	0x4dff	../fixed/10x20.4D00
diff --git a/lib/font/bit/dejavusansit/unicode.14.font b/lib/font/bit/dejavusansit/unicode.14.font
index 6243318f0..77ee47147 100644
--- a/lib/font/bit/dejavusansit/unicode.14.font
+++ b/lib/font/bit/dejavusansit/unicode.14.font
@@ -1,6 +1,6 @@
-18	14
+18 14
 0xfff9	0xffff	dejavusansit.14.fff9
-0xff00	0xfff8	../fixed/10x20.FF00
+0xff00	0xfff8	../fixed/6x12.FF00
 0xfe00	0xff00	dejavusansit.14.fe00
 0xfb00	0xfc00	dejavusansit.14.fb00
 0xf6c5	0xf7c5	dejavusansit.14.f6c5
@@ -54,40 +54,66 @@
 0x3000	0x303f	../jis/jis3000.24
 0x2e18	0x2f18	dejavusansit.14.2e18
 0x2c60	0x2d60	dejavusansit.14.2c60
-0x2a7d	0x2b7d	dejavusansit.14.2a7d
-0x2940	0x2a40	dejavusansit.14.2940
-0x2826	0x2926	dejavusansit.14.2826
-0x2725	0x2825	dejavusansit.14.2725
-0x2624	0x2724	dejavusansit.14.2624
-0x2523	0x2623	dejavusansit.14.2523
-0x2422	0x2522	dejavusansit.14.2422
-0x2306	0x2406	dejavusansit.14.2306
-0x2205	0x2305	dejavusansit.14.2205
-0x21eb	0x2204	dejavusansit.14.2104
 0x2190	0x21ea	../misc/arrows
-0x2104	0x2189	dejavusansit.14.2104
-0x2003	0x2103	dejavusansit.14.2003
-0x1f02	0x2002	dejavusansit.14.1f02
 0x1e01	0x1f01	dejavusansit.14.1e01
 0x1d00	0x1e00	dejavusansit.14.1d00
-0x1700	0x1746	dejavusansit.14.1646
 0x1600	0x16ff	../fixed/10x20.1600
-0x14ff	0x15ff	dejavusansit.14.14ff
 0x1401	0x14fe	dejavusansit.14.1401
 0x1300	0x13ff	../fixed/10x20.1300
 0x1200	0x12ff	../fixed/10x20.1200
 0x10a0	0x11a0	dejavusansit.14.10a0
 0x0e3f	0x0f3f	dejavusansit.14.0e3f
-0x0505	0x0605	dejavusansit.14.0505
-0x0404	0x0504	dejavusansit.14.0404
 0x03c0	0x03c0	dejavusansit.14.03c0
 0x03a9	0x03a9	dejavusansit.14.03a9
-0x0303	0x0403	dejavusansit.14.0303
-0x0202	0x0302	dejavusansit.14.0202
 0x0101	0x0201	dejavusansit.14.0101
-0x00a0	0x0100	dejavusansit.14.00a0
-0x007f	0x007f	../palatino/R.6.1
-0x0020	0x009f	dejavusansit.14.0020
-0x0000	0x000f	../palatino/R.6.1
-0x0000	0x001f	dejavusansit.14.0000
-
+0x00a0	0x00ff	dejavusansit.14.00a0
+0x0020	0x007e	dejavusansit.14.0020
+0x0000	0x0100	dejavusansit.14.0000
+0xf400	0xf500	../dejavu/dejavu.14.f400
+0x2b00	0x2c00	../dejavu/dejavu.14.2b00
+0x29eb	0x2aeb	../dejavu/dejavu.14.29eb
+0x28a2	0x29a2	../dejavu/dejavu.14.28a2
+0x27a1	0x28a1	../dejavu/dejavu.14.27a1
+0x2524	0x2624	../dejavu/dejavu.14.2524
+0x2423	0x2523	../dejavu/dejavu.14.2423
+0xf001	0xf101	../dejavusans/dejavusans.14.f001
+0x2d61	0x2e61	../dejavusans/dejavusans.14.2d61
+0x2104	0x21fb	../dejavusans/dejavusans.14.2104
+0x2100	0x2103	../dejavusans/dejavusans.14.2003
+0x1f02	0x2002	../dejavusans/dejavusans.14.1f02
+0x1401	0x1501	../dejavusans/dejavusans.14.1401
+0x0404	0x0504	../dejavusans/dejavusans.14.0404
+0x0303	0x0403	../dejavusans/dejavusans.14.0303
+0x0202	0x02ff	../dejavusans/dejavusans.14.0202
+0x3000	0x30fe	../shinonome/k14.3000
+0x0500	0x05ff	../fixed/10x20.0500
+0x0600	0x06ff	../fixed/10x20.0600
+0x0e00	0x0eff	../fixed/10x20.0E00
+0x1000	0x10ff	../fixed/10x20.1000
+0x2000	0x2044	../misc/genpunc.9
+0x2070	0x208e	../pelm/supsub.9
+0x20a0	0x20ac	../pelm/currency.9
+0x2200	0x227f	../misc/math1
+0x2280	0x22f1	../misc/math2
+0x2300	0x232c	../misc/tech
+0x2600	0x266f	../misc/ding
+0x2700	0x27bf	../misc/zapf
+0x2a00	0x2aff	../fixed/10x20.2A00
+0x4d00	0x4dff	../fixed/10x20.4D00
+0xfc00	0xfcff	../fixed/10x20.FC00
+0xfd00	0xfdff	../fixed/10x20.FD00
+0x0300	0x03ff	../fixed/10x20.0300
+0x2000	0x20ff	../fixed/10x20.2000
+0x2100	0x21ff	../fixed/10x20.2100
+0x2200	0x22ff	../fixed/10x20.2200
+0x2300	0x23ff	../fixed/10x20.2300
+0x2400	0x24ff	../fixed/10x20.2400
+0x2600	0x26ff	../fixed/10x20.2600
+0x1400	0x14ff	../fixed/9x18.1400
+0x1500	0x15ff	../fixed/9x18.1500
+0x2940	0x2a40	../dejavusans/dejavusans.12.2940
+0x07c0	0x08c0	../dejavusans/dejavusans.12.07c0
+0x0606	0x0706	../dejavusans/dejavusans.12.0606
+0xe000	0xe0ff	../fixed/9x15.E000
+0xe700	0xe7ff	../fixed/9x15.E700
+0x1100	0x11ff	../fixed/6x13.1100
diff --git a/lib/font/bit/dejavusansit/unicode.16.font b/lib/font/bit/dejavusansit/unicode.16.font
index 7bbab11c0..5b097c646 100644
--- a/lib/font/bit/dejavusansit/unicode.16.font
+++ b/lib/font/bit/dejavusansit/unicode.16.font
@@ -1,6 +1,6 @@
-20	16
+20 16
 0xfff9	0xffff	dejavusansit.16.fff9
-0xff00	0xfff8	../fixed/10x20.FF00
+0xff00	0xfff8	../fixed/6x12.FF00
 0xfe00	0xff00	dejavusansit.16.fe00
 0xfb00	0xfc00	dejavusansit.16.fb00
 0xf6c5	0xf7c5	dejavusansit.16.f6c5
@@ -54,40 +54,64 @@
 0x3000	0x303f	../jis/jis3000.24
 0x2e18	0x2f18	dejavusansit.16.2e18
 0x2c60	0x2d60	dejavusansit.16.2c60
-0x2a7d	0x2b7d	dejavusansit.16.2a7d
-0x2940	0x2a40	dejavusansit.16.2940
-0x2826	0x2926	dejavusansit.16.2826
-0x2725	0x2825	dejavusansit.16.2725
-0x2624	0x2724	dejavusansit.16.2624
 0x2523	0x2623	dejavusansit.16.2523
 0x2422	0x2522	dejavusansit.16.2422
-0x2306	0x2406	dejavusansit.16.2306
-0x2205	0x2305	dejavusansit.16.2205
-0x21eb	0x2204	dejavusansit.16.2104
 0x2190	0x21ea	../misc/arrows
-0x2104	0x2189	dejavusansit.16.2104
-0x2003	0x2103	dejavusansit.16.2003
-0x1f02	0x2002	dejavusansit.16.1f02
 0x1e01	0x1f01	dejavusansit.16.1e01
 0x1d00	0x1e00	dejavusansit.16.1d00
-0x1700	0x1746	dejavusansit.16.1646
 0x1600	0x16ff	../fixed/10x20.1600
-0x14ff	0x15ff	dejavusansit.16.14ff
 0x1401	0x14fe	dejavusansit.16.1401
 0x1300	0x13ff	../fixed/10x20.1300
 0x1200	0x12ff	../fixed/10x20.1200
 0x10a0	0x11a0	dejavusansit.16.10a0
 0x0e3f	0x0f3f	dejavusansit.16.0e3f
-0x0505	0x0605	dejavusansit.16.0505
-0x0404	0x0504	dejavusansit.16.0404
 0x03c0	0x03c0	dejavusansit.16.03c0
 0x03a9	0x03a9	dejavusansit.16.03a9
-0x0303	0x0403	dejavusansit.16.0303
-0x0202	0x0302	dejavusansit.16.0202
 0x0101	0x0201	dejavusansit.16.0101
-0x00a0	0x0100	dejavusansit.16.00a0
-0x007f	0x007f	../palatino/R.6.1
-0x0020	0x009f	dejavusansit.16.0020
-0x0000	0x000f	../palatino/R.6.1
-0x0000	0x001f	dejavusansit.16.0000
-
+0x00a0	0x00ff	dejavusansit.16.00a0
+0x0020	0x007e	dejavusansit.16.0020
+0x0000	0x0100	dejavusansit.16.0000
+0xf400	0xf500	../dejavu/dejavu.16.f400
+0x2b00	0x2c00	../dejavu/dejavu.16.2b00
+0x28a2	0x29a2	../dejavu/dejavu.16.28a2
+0x27a1	0x28a1	../dejavu/dejavu.16.27a1
+0xf001	0xf101	../dejavusans/dejavusans.16.f001
+0x2d61	0x2e61	../dejavusans/dejavusans.16.2d61
+0x1401	0x1501	../dejavusans/dejavusans.16.1401
+0x07c0	0x08c0	../dejavusans/dejavusans.16.07c0
+0x3000	0x30fe	../shinonome/k16.3000
+0x0250	0x02e9	../lucida/Phonetic.9.0
+0x0300	0x03f2	../lucida/GenDiacrit.9.0
+0x0401	0x04cc	../lucida/cyrillic.9.0
+0x05b0	0x05f4	../lucida/Hebrew.9.0
+0x2000	0x20aa	../lucida/GenPunct.9.0
+0x2100	0x21ea	../lucida/Letterlike.9.0
+0x2200	0x22f1	../lucida/MathOps1.9.0
+0x2400	0x2424	../lucida/control.9.0
+0x2600	0x266f	../misc/ding
+0x2700	0x27bf	../misc/zapf
+0x0200	0x02ff	../fixed/10x20.0200
+0x0300	0x03ff	../fixed/10x20.0300
+0x0400	0x04ff	../fixed/10x20.0400
+0x0500	0x05ff	../fixed/10x20.0500
+0x0600	0x06ff	../fixed/10x20.0600
+0x0e00	0x0eff	../fixed/10x20.0E00
+0x1000	0x10ff	../fixed/10x20.1000
+0x1f00	0x1fff	../fixed/10x20.1F00
+0x2000	0x20ff	../fixed/10x20.2000
+0x2100	0x21ff	../fixed/10x20.2100
+0x2200	0x22ff	../fixed/10x20.2200
+0x2300	0x23ff	../fixed/10x20.2300
+0x2600	0x26ff	../fixed/10x20.2600
+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
diff --git a/lib/font/bit/dejavusansit/unicode.18.font b/lib/font/bit/dejavusansit/unicode.18.font
index 69a17a771..43eb9f3ff 100644
--- a/lib/font/bit/dejavusansit/unicode.18.font
+++ b/lib/font/bit/dejavusansit/unicode.18.font
@@ -1,6 +1,6 @@
-23	18
+23 18
 0xfff9	0xffff	dejavusansit.18.fff9
-0xff00	0xfff8	../fixed/10x20.FF00
+0xff00	0xfff8	../fixed/6x12.FF00
 0xfe00	0xff00	dejavusansit.18.fe00
 0xfb00	0xfc00	dejavusansit.18.fb00
 0xf6c5	0xf7c5	dejavusansit.18.f6c5
@@ -54,40 +54,56 @@
 0x3000	0x303f	../jis/jis3000.24
 0x2e18	0x2f18	dejavusansit.18.2e18
 0x2c60	0x2d60	dejavusansit.18.2c60
-0x2a7d	0x2b7d	dejavusansit.18.2a7d
-0x2940	0x2a40	dejavusansit.18.2940
-0x2826	0x2926	dejavusansit.18.2826
-0x2725	0x2825	dejavusansit.18.2725
-0x2624	0x2724	dejavusansit.18.2624
-0x2523	0x2623	dejavusansit.18.2523
-0x2422	0x2522	dejavusansit.18.2422
-0x2306	0x2406	dejavusansit.18.2306
-0x2205	0x2305	dejavusansit.18.2205
-0x21eb	0x2204	dejavusansit.18.2104
 0x2190	0x21ea	../misc/arrows
-0x2104	0x2189	dejavusansit.18.2104
-0x2003	0x2103	dejavusansit.18.2003
-0x1f02	0x2002	dejavusansit.18.1f02
 0x1e01	0x1f01	dejavusansit.18.1e01
 0x1d00	0x1e00	dejavusansit.18.1d00
 0x1700	0x1746	dejavusansit.18.1646
 0x1600	0x16ff	../fixed/10x20.1600
-0x14ff	0x15ff	dejavusansit.18.14ff
 0x1401	0x14fe	dejavusansit.18.1401
 0x1300	0x13ff	../fixed/10x20.1300
 0x1200	0x12ff	../fixed/10x20.1200
 0x10a0	0x11a0	dejavusansit.18.10a0
 0x0e3f	0x0f3f	dejavusansit.18.0e3f
-0x0505	0x0605	dejavusansit.18.0505
-0x0404	0x0504	dejavusansit.18.0404
 0x03c0	0x03c0	dejavusansit.18.03c0
 0x03a9	0x03a9	dejavusansit.18.03a9
-0x0303	0x0403	dejavusansit.18.0303
-0x0202	0x0302	dejavusansit.18.0202
 0x0101	0x0201	dejavusansit.18.0101
-0x00a0	0x0100	dejavusansit.18.00a0
-0x007f	0x007f	../palatino/R.6.1
-0x0020	0x009f	dejavusansit.18.0020
-0x0000	0x000f	../palatino/R.6.1
-0x0000	0x001f	dejavusansit.18.0000
-
+0x00a0	0x00ff	dejavusansit.18.00a0
+0x0020	0x007e	dejavusansit.18.0020
+0x0000	0x0100	dejavusansit.18.0000
+0xf400	0xf500	../dejavu/dejavu.18.f400
+0x2b00	0x2c00	../dejavu/dejavu.18.2b00
+0x28a2	0x29a2	../dejavu/dejavu.18.28a2
+0x27a1	0x28a1	../dejavu/dejavu.18.27a1
+0xf001	0xf101	../dejavusans/dejavusans.18.f001
+0x2d61	0x2e61	../dejavusans/dejavusans.18.2d61
+0x1401	0x1501	../dejavusans/dejavusans.18.1401
+0x07c0	0x08c0	../dejavusans/dejavusans.18.07c0
+0x3000	0x30fe	../shinonome/k16.3000
+0x0200	0x02ff	../fixed/6x10.0200
+0x0300	0x03ff	../fixed/6x10.0300
+0x0400	0x04ff	../fixed/6x10.0400
+0x0500	0x05ff	../fixed/6x10.0500
+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
+0x2700	0x27bf	../misc/zapf
+0x0600	0x06ff	../fixed/10x20.0600
+0x0e00	0x0eff	../fixed/10x20.0E00
+0x1000	0x10ff	../fixed/10x20.1000
+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