ref: 47af19f6ed883e0ab8aeb6b144755f46c460d5cb
parent: 8745e29e15ac31945c5711637879b8422ee774ee
author: cinap_lenrek <[email protected]>
date: Wed Mar 21 13:59:46 EDT 2012
vga: fix type in vga.font, make vga/unicode.font file
--- /dev/null
+++ b/lib/font/bit/vga/unicode.font
@@ -1,0 +1,81 @@
+16 8
+0x0100 0x01ff vga01
+0x0200 0x02ff vga02
+0x0300 0x03ff vga03
+0x0400 0x04ff vga04
+0x0500 0x05ff vga05
+0x0600 0x06ff vga06
+0x0000 0x00ff vga00
+0xfb00 0xfbff vgafb
+0xfc00 0xfcff vgafc
+0xfd00 0xfdff vgafd
+0xfe00 0xfeff vgafe
+0xff00 0xffff vgaff
+0x1000 0x10ff vga10
+0x1e00 0x1eff vga1e
+0x1f00 0x1fff vga1f
+0x2000 0x20ff vga20
+0x2100 0x21ff vga21
+0x2200 0x22ff vga22
+0x2300 0x23ff vga23
+0x2400 0x24ff vga24
+0x2500 0x25ff vga25
+0x2600 0x26ff vga26
+0x1600 0x16ff ../fixed/6x10.1600
+0x2800 0x28ff ../fixed/6x10.2800
+0x3000 0x30fe ../naga10/knj10.3000
+0x4e00 0x4ffe ../naga10/knj10.4e00
+0x5005 0x51fe ../naga10/knj10.5005
+0x5200 0x53fa ../naga10/knj10.5200
+0x5401 0x55fe ../naga10/knj10.5401
+0x5606 0x57fc ../naga10/knj10.5606
+0x5800 0x59ff ../naga10/knj10.5800
+0x5a01 0x5bff ../naga10/knj10.5a01
+0x5c01 0x5dfe ../naga10/knj10.5c01
+0x5e02 0x5fff ../naga10/knj10.5e02
+0x600e 0x61ff ../naga10/knj10.600e
+0x6200 0x63fa ../naga10/knj10.6200
+0x6406 0x65fb ../naga10/knj10.6406
+0x6602 0x67ff ../naga10/knj10.6602
+0x6802 0x69ff ../naga10/knj10.6802
+0x6a02 0x6bf3 ../naga10/knj10.6a02
+0x6c08 0x6dfb ../naga10/knj10.6c08
+0x6e05 0x6ffe ../naga10/knj10.6e05
+0x7001 0x71ff ../naga10/knj10.7001
+0x7206 0x73fe ../naga10/knj10.7206
+0x7403 0x75ff ../naga10/knj10.7403
+0x7601 0x77fc ../naga10/knj10.7601
+0x7802 0x79fb ../naga10/knj10.7802
+0x7a00 0x7bf7 ../naga10/knj10.7a00
+0x7c00 0x7dfb ../naga10/knj10.7c00
+0x7e01 0x7ffc ../naga10/knj10.7e01
+0x8000 0x81fe ../naga10/knj10.8000
+0x8201 0x83fd ../naga10/knj10.8201
+0x8403 0x85fe ../naga10/knj10.8403
+0x8602 0x87fe ../naga10/knj10.8602
+0x8805 0x89f8 ../naga10/knj10.8805
+0x8a00 0x8b9a ../naga10/knj10.8a00
+0x8c37 0x8dff ../naga10/knj10.8c37
+0x8e08 0x8ffd ../naga10/knj10.8e08
+0x9000 0x91ff ../naga10/knj10.9000
+0x920d 0x93e8 ../naga10/knj10.920d
+0x9403 0x95e5 ../naga10/knj10.9403
+0x961c 0x97ff ../naga10/knj10.961c
+0x9801 0x99ff ../naga10/knj10.9801
+0x9a01 0x9bf5 ../naga10/knj10.9a01
+0x9c04 0x9dfd ../naga10/knj10.9c04
+0x9e1a 0x9fa0 ../naga10/knj10.9e1a
+0x0e00 0x0eff ../fixed/6x13.0E00
+0x1100 0x11ff ../fixed/6x13.1100
+0x2700 0x27ff ../fixed/6x13.2700
+0x2900 0x29ff ../fixed/6x13.2900
+0x2a00 0x2aff ../fixed/6x13.2A00
+0xe000 0xe0ff ../fixed/6x13.E000
+0x1200 0x12ff ../fixed/9x15.1200
+0x1300 0x13ff ../fixed/9x15.1300
+0xe700 0xe7ff ../fixed/9x15.E700
+0x1400 0x14ff ../fixed/9x18.1400
+0x1500 0x15ff ../fixed/9x18.1500
+0x1d00 0x1dff ../fixed/10x20.1D00
+0x2b00 0x2bff ../fixed/10x20.2B00
+0x4d00 0x4dff ../fixed/10x20.4D00
--- a/lib/font/bit/vga/vga.font
+++ b/lib/font/bit/vga/vga.font
@@ -5,19 +5,13 @@
0x0400 0x04ff vga04
0x0500 0x05ff vga05
0x0600 0x06ff vga06
-0x007f 0x007f ../palatino/R.6.1
0x0000 0x00ff vga00
-0x0E00 0x0EFF ../fixed/10x20.0E00
0xfb00 0xfbff vgafb
0xfc00 0xfcff vgafc
0xfd00 0xfdff vgafd
0xfe00 0xfeff vgafe
0xff00 0xffff vgaff
-0x1000 0x10ff vga1
-0x1200 0x12FF ../fixed/10x20.1200
-0x1300 0x13FF ../fixed/10x20.1300
-0x1600 0x16FF ../fixed/10x20.1600
-0x1D00 0x1DFF ../fixed/10x20.1D00
+0x1000 0x10ff vga10
0x1e00 0x1eff vga1e
0x1f00 0x1fff vga1f
0x2000 0x20ff vga20
@@ -27,52 +21,3 @@
0x2400 0x24ff vga24
0x2500 0x25ff vga25
0x2600 0x26ff vga26
-0x2700 0x27BF ../misc/zapf
-0x2800 0x28FF ../fixed/10x20.2800
-0x2A00 0x2AFF ../fixed/10x20.2A00
-0x2B00 0x2BFF ../fixed/10x20.2B00
-0x3000 0x303f ../jis/jis3000.16
-0x30a1 0x30fe ../jis/katakana.16
-0x3041 0x309e ../jis/hiragana.16
-0x4D00 0x4DFF ../fixed/10x20.4D00
-0x4e00 0x4fff ../jis/jis4e00.16
-0x5000 0x51ff ../jis/jis5000.16
-0x5200 0x53ff ../jis/jis5200.16
-0x5400 0x55ff ../jis/jis5400.16
-0x5600 0x57ff ../jis/jis5600.16
-0x5800 0x59ff ../jis/jis5800.16
-0x5a00 0x5bff ../jis/jis5a00.16
-0x5c00 0x5dff ../jis/jis5c00.16
-0x5e00 0x5fff ../jis/jis5e00.16
-0x6000 0x61ff ../jis/jis6000.16
-0x6200 0x63ff ../jis/jis6200.16
-0x6400 0x65ff ../jis/jis6400.16
-0x6600 0x67ff ../jis/jis6600.16
-0x6800 0x69ff ../jis/jis6800.16
-0x6a00 0x6bff ../jis/jis6a00.16
-0x6c00 0x6dff ../jis/jis6c00.16
-0x6e00 0x6fff ../jis/jis6e00.16
-0x7000 0x71ff ../jis/jis7000.16
-0x7200 0x73ff ../jis/jis7200.16
-0x7400 0x75ff ../jis/jis7400.16
-0x7600 0x77ff ../jis/jis7600.16
-0x7800 0x79ff ../jis/jis7800.16
-0x7a00 0x7bff ../jis/jis7a00.16
-0x7c00 0x7dff ../jis/jis7c00.16
-0x7e00 0x7fff ../jis/jis7e00.16
-0x8000 0x81ff ../jis/jis8000.16
-0x8200 0x83ff ../jis/jis8200.16
-0x8400 0x85ff ../jis/jis8400.16
-0x8600 0x87ff ../jis/jis8600.16
-0x8800 0x89ff ../jis/jis8800.16
-0x8a00 0x8bff ../jis/jis8a00.16
-0x8c00 0x8dff ../jis/jis8c00.16
-0x8e00 0x8fff ../jis/jis8e00.16
-0x9000 0x91ff ../jis/jis9000.16
-0x9200 0x93ff ../jis/jis9200.16
-0x9400 0x95ff ../jis/jis9400.16
-0x9600 0x97ff ../jis/jis9600.16
-0x9800 0x99ff ../jis/jis9800.16
-0x9a00 0x9bff ../jis/jis9a00.16
-0x9c00 0x9dff ../jis/jis9c00.16
-0x9e00 0x9fff ../jis/jis9e00.16
--- a/sys/lib/dist/usr/glenda/lib/profile
+++ b/sys/lib/dist/usr/glenda/lib/profile
@@ -5,7 +5,7 @@
bind -c $home/tmp /tmp
if(! syscall create /tmp/xxx 1 0666 >[2]/dev/null)
ramfs # in case we're running off a cd
-font=/lib/font/bit/vga/vga.font
+font=/lib/font/bit/vga/unicode.font
fn cd { builtin cd $* && awd } # for acme switch($service){case terminal
--- a/sys/src/cmd/acme/acme.c
+++ b/sys/src/cmd/acme/acme.c
@@ -104,7 +104,7 @@
if(fontnames[0] == nil)
fontnames[0] = getenv("font");if(fontnames[0] == nil)
- fontnames[0] = "/lib/font/bit/vga/vga.font";
+ fontnames[0] = "/lib/font/bit/vga/unicode.font";
if(access(fontnames[0], 0) < 0){fprint(2, "acme: can't access %s: %r\n", fontnames[0]);
exits("font open");--- a/sys/src/cmd/mothra/rdhtml.c
+++ b/sys/src/cmd/mothra/rdhtml.c
@@ -28,7 +28,7 @@
"dejavusansbd/unicode.14", 0, 0,
"dejavusansbd/unicode.16", 0, 0,
- "vga/vga", 0, 0,
+ "vga/unicode", 0, 0,
"terminus/unicode.14", 0, 0,
"terminus/unicode.16", 0, 0,
"terminus/unicode.18", 0, 0,