no more lucida
diff --git a/font/lucsans/boldtypeunicode.7.font b/font/lucsans/boldtypeunicode.7.font
index 0547082..2855d67 100644
--- a/font/lucsans/boldtypeunicode.7.font
+++ b/font/lucsans/boldtypeunicode.7.font
@@ -1,17 +1,17 @@
13 10
0x0000 0x00ff lsbtr.12
-0x0100 0x01f0 ../lucida/EuroLatin.6.0
-0x0250 0x02e9 ../lucida/Phonetic.6.0
-0x0300 0x03f2 ../lucida/GenDiacrit.6.0
-0x0401 0x04cc ../lucida/cyrillic.6.0
-0x05b0 0x05f4 ../lucida/Hebrew.6.0
-0x2000 0x20aa ../lucida/GenPunct.6.0
-0x2100 0x21ea ../lucida/Letterlike.6.0
-0x2200 0x22f1 ../lucida/MathOps1.6.0
-0x2400 0x2424 ../lucida/control.6.0
-0x2591 0x2593 ../lucida/Altshades.6.0
-0x2500 0x25ee ../lucida/FormBlock.6.0
-0xfb1e 0xfb1e ../lucida/Althebrew.6.0
+0x0100 0x01f0 ../luc/EuroLatin.6.0
+0x0250 0x02e9 ../luc/Phonetic.6.0
+0x0300 0x03f2 ../luc/GenDiacrit.6.0
+0x0401 0x04cc ../luc/cyrillic.6.0
+0x05b0 0x05f4 ../luc/Hebrew.6.0
+0x2000 0x20aa ../luc/GenPunct.6.0
+0x2100 0x21ea ../luc/Letterlike.6.0
+0x2200 0x22f1 ../luc/MathOps1.6.0
+0x2400 0x2424 ../luc/control.6.0
+0x2591 0x2593 ../luc/Altshades.6.0
+0x2500 0x25ee ../luc/FormBlock.6.0
+0xfb1e 0xfb1e ../luc/Althebrew.6.0
0x3000 0x30fe ../shinonome/k12b.3000
0x4e00 0x4ffe ../shinonome/k12b.4e00
0x5005 0x51fe ../shinonome/k12b.5005
diff --git a/font/lucsans/boldunicode.10.font b/font/lucsans/boldunicode.10.font
index ffe167f..30e9349 100644
--- a/font/lucsans/boldunicode.10.font
+++ b/font/lucsans/boldunicode.10.font
@@ -1,8 +1,8 @@
19 16
0x0000 0x00FF lsb.18
-0x0100 0x01f0 ../lucida/EuroLatin.9.0
-0x2000 0x20aa ../lucida/GenPunct.9.0
-0x2200 0x22f1 ../lucida/MathOps1.9.0
+0x0100 0x01f0 ../luc/EuroLatin.9.0
+0x2000 0x20aa ../luc/GenPunct.9.0
+0x2200 0x22f1 ../luc/MathOps1.9.0
0x3000 0x30fe ../shinonome/k16b.3000
0x4e00 0x4ffe ../shinonome/k16b.4e00
0x5005 0x51fe ../shinonome/k16b.5005
diff --git a/font/lucsans/boldunicode.13.font b/font/lucsans/boldunicode.13.font
index 7b85bdb..c3a3337 100644
--- a/font/lucsans/boldunicode.13.font
+++ b/font/lucsans/boldunicode.13.font
@@ -1,5 +1,5 @@
26 21
0x0000 0x00FF lsb.24
-0x0100 0x01f0 ../lucida/EuroLatin.12.0
-0x2000 0x20aa ../lucida/GenPunct.12.0
-0x2200 0x22f1 ../lucida/MathOps1.12.0
+0x0100 0x01f0 ../luc/EuroLatin.12.0
+0x2000 0x20aa ../luc/GenPunct.12.0
+0x2200 0x22f1 ../luc/MathOps1.12.0
diff --git a/font/lucsans/boldunicode.6.font b/font/lucsans/boldunicode.6.font
index 0b86770..c792dfb 100644
--- a/font/lucsans/boldunicode.6.font
+++ b/font/lucsans/boldunicode.6.font
@@ -1,8 +1,8 @@
11 9
0x0000 0x00FF lsb.10
-0x0100 0x01f0 ../lucida/EuroLatin.5.0
-0x2000 0x20aa ../lucida/GenPunct.5.0
-0x2200 0x22f1 ../lucida/MathOps1.5.0
+0x0100 0x01f0 ../luc/EuroLatin.5.0
+0x2000 0x20aa ../luc/GenPunct.5.0
+0x2200 0x22f1 ../luc/MathOps1.5.0
0x3000 0x30fe ../naga10/knj10B.3000
0x4e00 0x4ffe ../naga10/knj10B.4e00
0x5005 0x51fe ../naga10/knj10B.5005
diff --git a/font/lucsans/boldunicode.7.font b/font/lucsans/boldunicode.7.font
index 58d9e75..bfb1caa 100644
--- a/font/lucsans/boldunicode.7.font
+++ b/font/lucsans/boldunicode.7.font
@@ -1,16 +1,16 @@
13 11
0x0000 0x00FF lsb.12
-0x0100 0x01f0 ../lucida/EuroLatin.6.0
-0x0250 0x02e9 ../lucida/Phonetic.6.0
-0x0300 0x03f2 ../lucida/GenDiacrit.6.0
-0x0401 0x04cc ../lucida/cyrillic.6.0
-0x05b0 0x05f4 ../lucida/Hebrew.6.0
-0x2000 0x20aa ../lucida/GenPunct.6.0
-0x2100 0x21ea ../lucida/Letterlike.6.0
-0x2200 0x22f1 ../lucida/MathOps1.6.0
-0x2400 0x2424 ../lucida/control.6.0
-0x2591 0x2593 ../lucida/Altshades.6.0
-0x2500 0x25ee ../lucida/FormBlock.6.0
+0x0100 0x01f0 ../luc/EuroLatin.6.0
+0x0250 0x02e9 ../luc/Phonetic.6.0
+0x0300 0x03f2 ../luc/GenDiacrit.6.0
+0x0401 0x04cc ../luc/cyrillic.6.0
+0x05b0 0x05f4 ../luc/Hebrew.6.0
+0x2000 0x20aa ../luc/GenPunct.6.0
+0x2100 0x21ea ../luc/Letterlike.6.0
+0x2200 0x22f1 ../luc/MathOps1.6.0
+0x2400 0x2424 ../luc/control.6.0
+0x2591 0x2593 ../luc/Altshades.6.0
+0x2500 0x25ee ../luc/FormBlock.6.0
0x3000 0x30fe ../shinonome/k12b.3000
0x4e00 0x4ffe ../shinonome/k12b.4e00
0x5005 0x51fe ../shinonome/k12b.5005
diff --git a/font/lucsans/boldunicode.8.font b/font/lucsans/boldunicode.8.font
index 56dbcde..2c95380 100644
--- a/font/lucsans/boldunicode.8.font
+++ b/font/lucsans/boldunicode.8.font
@@ -1,8 +1,8 @@
15 13
0x0000 0x00FF lsb.14
-0x0100 0x01f0 ../lucida/EuroLatin.7.0
-0x2000 0x20aa ../lucida/GenPunct.7.0
-0x2200 0x22f1 ../lucida/MathOps1.7.0
+0x0100 0x01f0 ../luc/EuroLatin.7.0
+0x2000 0x20aa ../luc/GenPunct.7.0
+0x2200 0x22f1 ../luc/MathOps1.7.0
0x3000 0x30fe ../shinonome/k14b.3000
0x4e00 0x4ffe ../shinonome/k14b.4e00
0x5005 0x51fe ../shinonome/k14b.5005
diff --git a/font/lucsans/italicunicode.10.font b/font/lucsans/italicunicode.10.font
index 874b0d8..7d982cd 100644
--- a/font/lucsans/italicunicode.10.font
+++ b/font/lucsans/italicunicode.10.font
@@ -1,8 +1,8 @@
19 16
0x0000 0x00FF lsi.18
-0x0100 0x01f0 ../lucida/EuroLatin.9.0
-0x2000 0x20aa ../lucida/GenPunct.9.0
-0x2200 0x22f1 ../lucida/MathOps1.9.0
+0x0100 0x01f0 ../luc/EuroLatin.9.0
+0x2000 0x20aa ../luc/GenPunct.9.0
+0x2200 0x22f1 ../luc/MathOps1.9.0
0x3000 0x30fe ../shinonome/k16i.3000
0x4e00 0x4ffe ../shinonome/k16i.4e00
0x5005 0x51fe ../shinonome/k16i.5005
diff --git a/font/lucsans/italicunicode.13.font b/font/lucsans/italicunicode.13.font
index eb9b2ec..5c61d6f 100644
--- a/font/lucsans/italicunicode.13.font
+++ b/font/lucsans/italicunicode.13.font
@@ -1,5 +1,5 @@
26 21
0x0000 0x00FF lsi.24
-0x0100 0x01f0 ../lucida/EuroLatin.12.0
-0x2000 0x20aa ../lucida/GenPunct.12.0
-0x2200 0x22f1 ../lucida/MathOps1.12.0
+0x0100 0x01f0 ../luc/EuroLatin.12.0
+0x2000 0x20aa ../luc/GenPunct.12.0
+0x2200 0x22f1 ../luc/MathOps1.12.0
diff --git a/font/lucsans/italicunicode.6.font b/font/lucsans/italicunicode.6.font
index 80d1465..134bce5 100644
--- a/font/lucsans/italicunicode.6.font
+++ b/font/lucsans/italicunicode.6.font
@@ -1,5 +1,5 @@
11 9
0x0000 0x00FF lsi.10
-0x0100 0x01f0 ../lucida/EuroLatin.5.0
-0x2000 0x20aa ../lucida/GenPunct.5.0
-0x2200 0x22f1 ../lucida/MathOps1.5.0
+0x0100 0x01f0 ../luc/EuroLatin.5.0
+0x2000 0x20aa ../luc/GenPunct.5.0
+0x2200 0x22f1 ../luc/MathOps1.5.0
diff --git a/font/lucsans/italicunicode.7.font b/font/lucsans/italicunicode.7.font
index fa1a2ba..b11a9d8 100644
--- a/font/lucsans/italicunicode.7.font
+++ b/font/lucsans/italicunicode.7.font
@@ -1,8 +1,8 @@
13 11
0x0000 0x00FF lsi.12
-0x0100 0x01f0 ../lucida/EuroLatin.6.0
-0x2000 0x20aa ../lucida/GenPunct.6.0
-0x2200 0x22f1 ../lucida/MathOps1.6.0
+0x0100 0x01f0 ../luc/EuroLatin.6.0
+0x2000 0x20aa ../luc/GenPunct.6.0
+0x2200 0x22f1 ../luc/MathOps1.6.0
0x3000 0x30fe ../shinonome/k12i.3000
0x4e00 0x4ffe ../shinonome/k12i.4e00
0x5005 0x51fe ../shinonome/k12i.5005
diff --git a/font/lucsans/italicunicode.8.font b/font/lucsans/italicunicode.8.font
index dc8d577..8a94bfe 100644
--- a/font/lucsans/italicunicode.8.font
+++ b/font/lucsans/italicunicode.8.font
@@ -1,8 +1,8 @@
15 13
0x0000 0x00FF lsi.14
-0x0100 0x01f0 ../lucida/EuroLatin.7.0
-0x2000 0x20aa ../lucida/GenPunct.7.0
-0x2200 0x22f1 ../lucida/MathOps1.7.0
+0x0100 0x01f0 ../luc/EuroLatin.7.0
+0x2000 0x20aa ../luc/GenPunct.7.0
+0x2200 0x22f1 ../luc/MathOps1.7.0
0x3000 0x30fe ../shinonome/k14i.3000
0x4e00 0x4ffe ../shinonome/k14i.4e00
0x5005 0x51fe ../shinonome/k14i.5005
diff --git a/font/lucsans/typeunicode.12.font b/font/lucsans/typeunicode.12.font
index fe70bae..7b531ec 100644
--- a/font/lucsans/typeunicode.12.font
+++ b/font/lucsans/typeunicode.12.font
@@ -1,5 +1,5 @@
22 18
0x0000 0x007F ../pelm/ascii.12
-0x0100 0x01f0 ../lucida/EuroLatin.10.0
-0x2000 0x20aa ../lucida/GenPunct.10.0
-0x2200 0x22f1 ../lucida/MathOps1.10.0
+0x0100 0x01f0 ../luc/EuroLatin.10.0
+0x2000 0x20aa ../luc/GenPunct.10.0
+0x2200 0x22f1 ../luc/MathOps1.10.0
diff --git a/font/lucsans/typeunicode.16.font b/font/lucsans/typeunicode.16.font
index 05f16b3..19a73f8 100644
--- a/font/lucsans/typeunicode.16.font
+++ b/font/lucsans/typeunicode.16.font
@@ -1,5 +1,5 @@
30 23
0x0000 0x007F ../pelm/ascii.16
-0x0100 0x01f0 ../lucida/EuroLatin.14.0
-0x2000 0x20aa ../lucida/GenPunct.14.0
-0x2200 0x22f1 ../lucida/MathOps1.14.0
+0x0100 0x01f0 ../luc/EuroLatin.14.0
+0x2000 0x20aa ../luc/GenPunct.14.0
+0x2200 0x22f1 ../luc/MathOps1.14.0
diff --git a/font/lucsans/typeunicode.6.font b/font/lucsans/typeunicode.6.font
index a8b846f..76a349a 100644
--- a/font/lucsans/typeunicode.6.font
+++ b/font/lucsans/typeunicode.6.font
@@ -1,8 +1,8 @@
11 9
0x0000 0x00ff lstr.10
-0x0100 0x01f0 ../lucida/EuroLatin.5.0
-0x2000 0x20aa ../lucida/GenPunct.5.0
-0x2200 0x22f1 ../lucida/MathOps1.5.0
+0x0100 0x01f0 ../luc/EuroLatin.5.0
+0x2000 0x20aa ../luc/GenPunct.5.0
+0x2200 0x22f1 ../luc/MathOps1.5.0
0x3000 0x30fe ../naga10/knj10.3000
0x4e00 0x4ffe ../naga10/knj10.4e00
0x5005 0x51fe ../naga10/knj10.5005
diff --git a/font/lucsans/typeunicode.7.font b/font/lucsans/typeunicode.7.font
index bad4799..6e09f4c 100644
--- a/font/lucsans/typeunicode.7.font
+++ b/font/lucsans/typeunicode.7.font
@@ -1,17 +1,17 @@
13 11
0x0000 0x00FF lstr.12
-0x0100 0x01f0 ../lucida/EuroLatin.6.0
-0x0250 0x02e9 ../lucida/Phonetic.6.0
-0x0300 0x03f2 ../lucida/GenDiacrit.6.0
-0x0401 0x04cc ../lucida/cyrillic.6.0
-0x05b0 0x05f4 ../lucida/Hebrew.6.0
-0x2000 0x20aa ../lucida/GenPunct.6.0
-0x2100 0x21ea ../lucida/Letterlike.6.0
-0x2200 0x22f1 ../lucida/MathOps1.6.0
-0x2400 0x2424 ../lucida/control.6.0
-0x2591 0x2593 ../lucida/Altshades.6.0
-0x2500 0x25ee ../lucida/FormBlock.6.0
-0xfb1e 0xfb1e ../lucida/Althebrew.6.0
+0x0100 0x01f0 ../luc/EuroLatin.6.0
+0x0250 0x02e9 ../luc/Phonetic.6.0
+0x0300 0x03f2 ../luc/GenDiacrit.6.0
+0x0401 0x04cc ../luc/cyrillic.6.0
+0x05b0 0x05f4 ../luc/Hebrew.6.0
+0x2000 0x20aa ../luc/GenPunct.6.0
+0x2100 0x21ea ../luc/Letterlike.6.0
+0x2200 0x22f1 ../luc/MathOps1.6.0
+0x2400 0x2424 ../luc/control.6.0
+0x2591 0x2593 ../luc/Altshades.6.0
+0x2500 0x25ee ../luc/FormBlock.6.0
+0xfb1e 0xfb1e ../luc/Althebrew.6.0
0x3000 0x30fe ../shinonome/k12.3000
0x4e00 0x4ffe ../shinonome/k12.4e00
0x5005 0x51fe ../shinonome/k12.5005
diff --git a/font/lucsans/unicode.10.font b/font/lucsans/unicode.10.font
index fdc840e..7a69ed8 100644
--- a/font/lucsans/unicode.10.font
+++ b/font/lucsans/unicode.10.font
@@ -1,16 +1,16 @@
19 16
0x0000 0x00FF lsr.18
-0x0100 0x01f0 ../lucida/EuroLatin.9.0
-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
-0x2591 0x2593 ../lucida/Altshades.9.0
-0x2500 0x25ee ../lucida/FormBlock.9.0
+0x0100 0x01f0 ../luc/EuroLatin.9.0
+0x0250 0x02e9 ../luc/Phonetic.9.0
+0x0300 0x03f2 ../luc/GenDiacrit.9.0
+0x0401 0x04cc ../luc/cyrillic.9.0
+0x05b0 0x05f4 ../luc/Hebrew.9.0
+0x2000 0x20aa ../luc/GenPunct.9.0
+0x2100 0x21ea ../luc/Letterlike.9.0
+0x2200 0x22f1 ../luc/MathOps1.9.0
+0x2400 0x2424 ../luc/control.9.0
+0x2591 0x2593 ../luc/Altshades.9.0
+0x2500 0x25ee ../luc/FormBlock.9.0
0x2600 0x266F ../misc/ding
0x2700 0x27BF ../misc/zapf
0x3000 0x30fe ../shinonome/k16.3000
@@ -55,4 +55,4 @@
0x9a01 0x9bf5 ../shinonome/k16.9a01
0x9c04 0x9dfd ../shinonome/k16.9c04
0x9e1a 0x9fa0 ../shinonome/k16.9e1a
-0xfb1e 0xfb1e ../lucida/Althebrew.9.0
+0xfb1e 0xfb1e ../luc/Althebrew.9.0
diff --git a/font/lucsans/unicode.13.font b/font/lucsans/unicode.13.font
index 765399d..801c95f 100644
--- a/font/lucsans/unicode.13.font
+++ b/font/lucsans/unicode.13.font
@@ -1,14 +1,14 @@
26 21
0x0000 0x00FF lsr.24
-0x0100 0x01f0 ../lucida/EuroLatin.12.0
-0x0250 0x02e9 ../lucida/Phonetic.12.0
-0x0300 0x03f2 ../lucida/GenDiacrit.12.0
-0x0401 0x04cc ../lucida/cyrillic.12.0
-0x05b0 0x05f4 ../lucida/Hebrew.12.0
-0x2000 0x20aa ../lucida/GenPunct.12.0
-0x2100 0x21ea ../lucida/Letterlike.12.0
-0x2200 0x22f1 ../lucida/MathOps1.12.0
-0x2400 0x2424 ../lucida/control.12.0
-0x2591 0x2593 ../lucida/Altshades.12.0
-0x2500 0x25ee ../lucida/FormBlock.12.0
-0xfb1e 0xfb1e ../lucida/Althebrew.12.0
+0x0100 0x01f0 ../luc/EuroLatin.12.0
+0x0250 0x02e9 ../luc/Phonetic.12.0
+0x0300 0x03f2 ../luc/GenDiacrit.12.0
+0x0401 0x04cc ../luc/cyrillic.12.0
+0x05b0 0x05f4 ../luc/Hebrew.12.0
+0x2000 0x20aa ../luc/GenPunct.12.0
+0x2100 0x21ea ../luc/Letterlike.12.0
+0x2200 0x22f1 ../luc/MathOps1.12.0
+0x2400 0x2424 ../luc/control.12.0
+0x2591 0x2593 ../luc/Altshades.12.0
+0x2500 0x25ee ../luc/FormBlock.12.0
+0xfb1e 0xfb1e ../luc/Althebrew.12.0
diff --git a/font/lucsans/unicode.6.font b/font/lucsans/unicode.6.font
index d581a0b..4ee6f3e 100644
--- a/font/lucsans/unicode.6.font
+++ b/font/lucsans/unicode.6.font
@@ -1,16 +1,16 @@
11 9
0x0000 0x00FF lsr.10
-0x0100 0x01f0 ../lucida/EuroLatin.5.0
-0x0250 0x02e9 ../lucida/Phonetic.5.0
-0x0300 0x03f2 ../lucida/GenDiacrit.5.0
-0x0401 0x04cc ../lucida/cyrillic.5.0
-0x05b0 0x05f4 ../lucida/Hebrew.5.0
-0x2000 0x20aa ../lucida/GenPunct.5.0
-0x2100 0x21ea ../lucida/Letterlike.5.0
-0x2200 0x22f1 ../lucida/MathOps1.5.0
-0x2400 0x2424 ../lucida/control.5.0
-0x2591 0x2593 ../lucida/Altshades.5.0
-0x2500 0x25ee ../lucida/FormBlock.5.0
+0x0100 0x01f0 ../luc/EuroLatin.5.0
+0x0250 0x02e9 ../luc/Phonetic.5.0
+0x0300 0x03f2 ../luc/GenDiacrit.5.0
+0x0401 0x04cc ../luc/cyrillic.5.0
+0x05b0 0x05f4 ../luc/Hebrew.5.0
+0x2000 0x20aa ../luc/GenPunct.5.0
+0x2100 0x21ea ../luc/Letterlike.5.0
+0x2200 0x22f1 ../luc/MathOps1.5.0
+0x2400 0x2424 ../luc/control.5.0
+0x2591 0x2593 ../luc/Altshades.5.0
+0x2500 0x25ee ../luc/FormBlock.5.0
0x3000 0x30fe ../naga10/knj10.3000
0x4e00 0x4ffe ../naga10/knj10.4e00
0x5005 0x51fe ../naga10/knj10.5005
@@ -53,4 +53,4 @@
0x9a01 0x9bf5 ../naga10/knj10.9a01
0x9c04 0x9dfd ../naga10/knj10.9c04
0x9e1a 0x9fa0 ../naga10/knj10.9e1a
-0xfb1e 0xfb1e ../lucida/Althebrew.5.0
+0xfb1e 0xfb1e ../luc/Althebrew.5.0
diff --git a/font/lucsans/unicode.7.font b/font/lucsans/unicode.7.font
index 7931dd2..8a977ca 100644
--- a/font/lucsans/unicode.7.font
+++ b/font/lucsans/unicode.7.font
@@ -1,16 +1,16 @@
13 11
0x0000 0x00FF lsr.12
-0x0100 0x01f0 ../lucida/EuroLatin.6.0
-0x0250 0x02e9 ../lucida/Phonetic.6.0
-0x0300 0x03f2 ../lucida/GenDiacrit.6.0
-0x0401 0x04cc ../lucida/cyrillic.6.0
-0x05b0 0x05f4 ../lucida/Hebrew.6.0
-0x2000 0x20aa ../lucida/GenPunct.6.0
-0x2100 0x21ea ../lucida/Letterlike.6.0
-0x2200 0x22f1 ../lucida/MathOps1.6.0
-0x2400 0x2424 ../lucida/control.6.0
-0x2591 0x2593 ../lucida/Altshades.6.0
-0x2500 0x25ee ../lucida/FormBlock.6.0
+0x0100 0x01f0 ../luc/EuroLatin.6.0
+0x0250 0x02e9 ../luc/Phonetic.6.0
+0x0300 0x03f2 ../luc/GenDiacrit.6.0
+0x0401 0x04cc ../luc/cyrillic.6.0
+0x05b0 0x05f4 ../luc/Hebrew.6.0
+0x2000 0x20aa ../luc/GenPunct.6.0
+0x2100 0x21ea ../luc/Letterlike.6.0
+0x2200 0x22f1 ../luc/MathOps1.6.0
+0x2400 0x2424 ../luc/control.6.0
+0x2591 0x2593 ../luc/Altshades.6.0
+0x2500 0x25ee ../luc/FormBlock.6.0
0x3000 0x30fe ../shinonome/k12.3000
0x4e00 0x4ffe ../shinonome/k12.4e00
0x5005 0x51fe ../shinonome/k12.5005
@@ -53,4 +53,4 @@
0x9a01 0x9bf5 ../shinonome/k12.9a01
0x9c04 0x9dfd ../shinonome/k12.9c04
0x9e1a 0x9fa0 ../shinonome/k12.9e1a
-0xfb1e 0xfb1e ../lucida/Althebrew.6.0
+0xfb1e 0xfb1e ../luc/Althebrew.6.0
diff --git a/font/lucsans/unicode.8.font b/font/lucsans/unicode.8.font
index 2ad86b8..063e5fc 100644
--- a/font/lucsans/unicode.8.font
+++ b/font/lucsans/unicode.8.font
@@ -1,17 +1,17 @@
15 13
0x0000 0x00FF lsr.14
-0x0100 0x01f0 ../lucida/EuroLatin.7.0
-0x0250 0x02e9 ../lucida/Phonetic.7.0
-0x0300 0x03f2 ../lucida/GenDiacrit.7.0
-0x0401 0x04cc ../lucida/cyrillic.7.0
-0x05b0 0x05f4 ../lucida/Hebrew.7.0
-0x2000 0x20aa ../lucida/GenPunct.7.0
-0x2100 0x21ea ../lucida/Letterlike.7.0
-0x2200 0x22f1 ../lucida/MathOps1.7.0
+0x0100 0x01f0 ../luc/EuroLatin.7.0
+0x0250 0x02e9 ../luc/Phonetic.7.0
+0x0300 0x03f2 ../luc/GenDiacrit.7.0
+0x0401 0x04cc ../luc/cyrillic.7.0
+0x05b0 0x05f4 ../luc/Hebrew.7.0
+0x2000 0x20aa ../luc/GenPunct.7.0
+0x2100 0x21ea ../luc/Letterlike.7.0
+0x2200 0x22f1 ../luc/MathOps1.7.0
0x2300 0x232C ../misc/tech
-0x2400 0x2424 ../lucida/control.7.0
-0x2591 0x2593 ../lucida/Altshades.7.0
-0x2500 0x25ee ../lucida/FormBlock.7.0
+0x2400 0x2424 ../luc/control.7.0
+0x2591 0x2593 ../luc/Altshades.7.0
+0x2500 0x25ee ../luc/FormBlock.7.0
0x2600 0x266F ../misc/ding
0x2700 0x27BF ../misc/zapf
0x3000 0x30fe ../shinonome/k14.3000
@@ -56,5 +56,5 @@
0x9a01 0x9bf5 ../shinonome/k14.9a01
0x9c04 0x9dfd ../shinonome/k14.9c04
0x9e1a 0x9fa0 ../shinonome/k14.9e1a
-0xfb1e 0xfb1e ../lucida/Althebrew.7.0
+0xfb1e 0xfb1e ../luc/Althebrew.7.0
0xFFFD 0xFFFD 0x80 lsr.14
diff --git a/font/shinonome/goth.12.font b/font/shinonome/goth.12.font
index 17f3957..d2d3b1f 100644
--- a/font/shinonome/goth.12.font
+++ b/font/shinonome/goth.12.font
@@ -1,5 +1,5 @@
12 10
-0x0000 0x0000 ../lucidasans/lsr.10
+0x0000 0x0000 ../lucsans/lsr.10
0x0001 0x00ff 6x12a.0001
0x005c 0x00f7 k12.005c
0x0391 0x03c9 k12.0391
diff --git a/font/shinonome/goth.14.font b/font/shinonome/goth.14.font
index 12bbe84..ea3f8b6 100644
--- a/font/shinonome/goth.14.font
+++ b/font/shinonome/goth.14.font
@@ -1,5 +1,5 @@
14 12
-0x0000 0x0000 ../lucidasans/lsr.12
+0x0000 0x0000 ../lucsans/lsr.12
0x0001 0x00ff 7x14a.0001
0x005c 0x00f7 k14.005c
0x0391 0x03c9 k14.0391
diff --git a/font/shinonome/goth.16.font b/font/shinonome/goth.16.font
index 02aa9c0..5d22b2c 100644
--- a/font/shinonome/goth.16.font
+++ b/font/shinonome/goth.16.font
@@ -1,5 +1,5 @@
16 14
-0x0000 0x0000 ../lucidasans/lsr.14
+0x0000 0x0000 ../lucsans/lsr.14
0x0001 0x00ff 8x16a.0001
0x005c 0x00f7 k16.005c
0x0391 0x03c9 k16.0391
diff --git a/font/shinonome/maru.12.font b/font/shinonome/maru.12.font
index 57fdb28..40ab490 100644
--- a/font/shinonome/maru.12.font
+++ b/font/shinonome/maru.12.font
@@ -1,5 +1,5 @@
12 10
-0x0000 0x0000 ../lucidasans/lsr.10
+0x0000 0x0000 ../lucsans/lsr.10
0x0001 0x00ff 6x12a.0001
0x005c 0x00f7 k12maru.005c
0x0391 0x03c9 k12maru.0391
diff --git a/font/shinonome/min.12.font b/font/shinonome/min.12.font
index 95fbe4b..fa0b1bf 100644
--- a/font/shinonome/min.12.font
+++ b/font/shinonome/min.12.font
@@ -1,5 +1,5 @@
12 10
-0x0000 0x0000 ../lucidasans/lsr.10
+0x0000 0x0000 ../lucsans/lsr.10
0x0001 0x00ff 6x12a.0001
0x005c 0x00f7 k12min.005c
0x0391 0x03c9 k12min.0391
diff --git a/font/shinonome/min.14.font b/font/shinonome/min.14.font
index 97fd876..a5fe6ec 100644
--- a/font/shinonome/min.14.font
+++ b/font/shinonome/min.14.font
@@ -1,5 +1,5 @@
14 12
-0x0000 0x0000 ../lucidasans/lsr.12
+0x0000 0x0000 ../lucsans/lsr.12
0x0001 0x00ff 7x14a.0001
0x005c 0x00f7 k14min.005c
0x0391 0x03c9 k14min.0391
diff --git a/font/shinonome/min.16.font b/font/shinonome/min.16.font
index 29acefe..5805b0c 100644
--- a/font/shinonome/min.16.font
+++ b/font/shinonome/min.16.font
@@ -1,5 +1,5 @@
16 14
-0x0000 0x0000 ../lucidasans/lsr.14
+0x0000 0x0000 ../lucsans/lsr.14
0x0001 0x00ff 8x16a.0001
0x005c 0x00f7 k16min.005c
0x0391 0x03c9 k16min.0391
diff --git a/man/man1/acme.1 b/man/man1/acme.1
index a162458..78fe155 100644
--- a/man/man1/acme.1
+++ b/man/man1/acme.1
@@ -71,7 +71,7 @@
.RB ( -F )
option sets the main font, usually variable-pitch (alternate, usually fixed-pitch);
the default is
-.B \*9/font/lucidasans/euro.8.font
+.B \*9/font/lucsans/euro.8.font
.RB ( \&.../lucm/unicode.9.font ).
Tab intervals are set to the width of 4 (or the value of
.BR $tabstop )
diff --git a/man/man7/ms.7 b/man/man7/ms.7
index 83b9369..931dad1 100644
--- a/man/man7/ms.7
+++ b/man/man7/ms.7
@@ -168,7 +168,7 @@
\fL\&.FE\fP - yes End footnote.
.ti0
\fL\&.FP\fP \fIx\fR - no Set font positions for a family, e.g.,
-.L .FP lucidasans
+.L .FP luxisans
.ti0
\fL\&.FS\fP no no Start footnote.
The note will be moved to the bottom of the page.
diff --git a/src/cmd/postscript/text2post/text2post.c b/src/cmd/postscript/text2post/text2post.c
index cf6b109..54b638a 100644
--- a/src/cmd/postscript/text2post/text2post.c
+++ b/src/cmd/postscript/text2post/text2post.c
@@ -105,15 +105,14 @@
{4, "\\374"}, {4, "\\375"}, {4, "\\376"}, {4, "\\377"}
};
-#define FONTABSIZE 0x27
-
+#define FONTABSIZE 0x2D
struct strtab fontname[FONTABSIZE] = {
- {19, "LucidaSansUnicode00", 0},
- {19, "LucidaSansUnicode01", 0},
- {19, "LucidaSansUnicode02", 0},
- {19, "LucidaSansUnicode03", 0},
- {19, "LucidaSansUnicode04", 0},
- {19, "LucidaSansUnicode05", 0},
+ {12, "DejaVuSans00", 0},
+ {12, "DejaVuSans01", 0},
+ {12, "DejaVuSans02", 0},
+ {12, "DejaVuSans03", 0},
+ {12, "DejaVuSans04", 0},
+ {12, "DejaVuSans05", 0},
{0, "", 0},
{0, "", 0},
{0, "", 0},
@@ -137,18 +136,66 @@
{0, "", 0},
{0, "", 0},
{0, "", 0},
- {0, "", 0},
- {0, "", 0},
- {0, "", 0},
- {19, "LucidaSansUnicode20", 0},
- {19, "LucidaSansUnicode21", 0},
- {19, "LucidaSansUnicode22", 0},
- {0, "", 0},
- {19, "LucidaSansUnicode24", 0},
- {19, "LucidaSansUnicode25", 0},
+ {12, "DejaVuSans1D", 0},
+ {12, "DejaVuSans1E", 0},
+ {12, "DejaVuSans1F", 0},
+ {12, "DejaVuSans20", 0},
+ {12, "DejaVuSans21", 0},
+ {12, "DejaVuSans22", 0},
+ {12, "DejaVuSans23", 0},
+ {12, "DejaVuSans24", 0},
+ {12, "DejaVuSans25", 0},
+ {12, "DejaVuSans26", 0},
+ {12, "DejaVuSans27", 0},
+ {12, "DejaVuSans28", 0},
+ {12, "DejaVuSans29", 0},
+ {12, "DejaVuSans2A", 0},
+ {12, "DejaVuSans2B", 0},
{7, "Courier", 0}
};
+/*
+#define FONTABSIZE 0x24
+struct strtab fontname[FONTABSIZE] = {
+ {10, "LuxiSans00", 0},
+ {10, "LuxiSans01", 0},
+ {10, "LuxiSans02", 0},
+ {10, "LuxiSans03", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {0, "", 0},
+ {10, "LuxiSans20", 0},
+ {10, "LuxiSans21", 0},
+ {10, "LuxiSans22", 0},
+ {7, "Courier", 0}
+};
+*/
+
/* This was taken from postprint */
int
@@ -157,6 +204,7 @@
int n;
static char buf[Bsize];
+ filename = unsharp(filename);
bstdin = Bopen(filename, 0);
if (bstdin == 0) {
return(1);
@@ -411,10 +459,11 @@
pagelist(char *list) {
char c;
int n, m;
- int state, start, end;
+ int state, start;
if (list == 0) return;
state = 1;
+ start = 0;
while ((c=*list) != '\0') {
n = 0;
while (isdigit(c)) {
@@ -468,10 +517,10 @@
}
+int
main(int argc, char *argv[]) {
int i;
char *t;
- Biobuf *input;
if ((bstderr = (Biobuf *)malloc(sizeof(Biobuf))) < (Biobuf *)0)
exits("malloc");
@@ -561,4 +610,5 @@
}
finish();
exits("");
+ return 0;
}
diff --git a/src/cmd/postscript/tr2post/chartab.c b/src/cmd/postscript/tr2post/chartab.c
index 8b831d3..e2e78b7 100644
--- a/src/cmd/postscript/tr2post/chartab.c
+++ b/src/cmd/postscript/tr2post/chartab.c
@@ -1,6 +1,6 @@
/* Unicode | PostScript
* start end | offset font name
- * 0x0000 0x00ff 0x00 LucidaSansUnicode00
+ * 0x0000 0x00ff 0x00 LuxiSans00
*/
#include <u.h>
#include <libc.h>
@@ -10,7 +10,7 @@
#include "comments.h"
#include "path.h"
-/* Postscript font names, e.g., `LucidaSansUnicode00'
+/* Postscript font names, e.g., `LuxiSans00'
* names may only be added because reference to the
* names is made by indexing into this table.
*/
