From a293d2e034e51d473b2ba0d0f7e460aeca48b7bb Mon Sep 17 00:00:00 2001
From: Přemysl Janouch <p.janouch@gmail.com>
Date: Sun, 21 Jul 2013 12:13:42 +0200
Subject: Fixes
---
README | 2 +-
nokia-generate-bdf.c | 4 ++--
nokia-menu.bdf | 52 ++++++++++++++++++++++++++--------------------------
nokia-menu.txt | 14 +++++++-------
4 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/README b/README
index 7ee1f95..5ab3b19 100644
--- a/README
+++ b/README
@@ -8,7 +8,7 @@ information you shouldn't need to care about.
Accented characters not included. Some of them are over here, should you wish
to add them yourself: http://www.dafont.com/nokia-cellphone.font
-Use the nokia-fonts.c, as the textual representation doesn't specify the real
+Use nokia-fonts.c, as the textual representation doesn't specify the real
horizontal advance for the characters (some of them don't have a 1px space to
the right of them). I've fixed this manually.
diff --git a/nokia-generate-bdf.c b/nokia-generate-bdf.c
index aa14ab7..a096554 100644
--- a/nokia-generate-bdf.c
+++ b/nokia-generate-bdf.c
@@ -177,8 +177,8 @@ generate_menu_font (void)
{
struct nokia_menu_char *ch = &nokia_menu_data[i];
- printf ("STARTCHAR U+%04X\n", '/' + i);
- printf ("ENCODING %d\n", '/' + i);
+ printf ("STARTCHAR U+%04X\n", '-' + i);
+ printf ("ENCODING %d\n", '-' + i);
printf ("SWIDTH %d 0\n", (int) (.5 + 1000. * ch->advance / 6.));
printf ("DWIDTH %d\n", ch->advance);
printf ("BBX %d 6 0 0\n", ch->width);
diff --git a/nokia-menu.bdf b/nokia-menu.bdf
index bd1a348..6264c1c 100644
--- a/nokia-menu.bdf
+++ b/nokia-menu.bdf
@@ -7,8 +7,8 @@ FONT_ASCENT 6
FONT_DESCENT 0
ENDPROPERTIES
CHARS 13
-STARTCHAR U+002F
-ENCODING 47
+STARTCHAR U+002D
+ENCODING 45
SWIDTH 500 0
DWIDTH 3
BBX 2 6 0 0
@@ -20,8 +20,8 @@ C0
00
00
ENDCHAR
-STARTCHAR U+0030
-ENCODING 48
+STARTCHAR U+002E
+ENCODING 46
SWIDTH 333 0
DWIDTH 2
BBX 1 6 0 0
@@ -33,8 +33,8 @@ BITMAP
00
80
ENDCHAR
-STARTCHAR U+0031
-ENCODING 49
+STARTCHAR U+002F
+ENCODING 47
SWIDTH 667 0
DWIDTH 4
BBX 3 6 0 0
@@ -46,8 +46,8 @@ BITMAP
80
80
ENDCHAR
-STARTCHAR U+0032
-ENCODING 50
+STARTCHAR U+0030
+ENCODING 48
SWIDTH 1000 0
DWIDTH 6
BBX 5 6 0 0
@@ -59,8 +59,8 @@ D8
D8
70
ENDCHAR
-STARTCHAR U+0033
-ENCODING 51
+STARTCHAR U+0031
+ENCODING 49
SWIDTH 1000 0
DWIDTH 6
BBX 5 6 0 0
@@ -72,8 +72,8 @@ BITMAP
30
30
ENDCHAR
-STARTCHAR U+0034
-ENCODING 52
+STARTCHAR U+0032
+ENCODING 50
SWIDTH 1000 0
DWIDTH 6
BBX 5 6 0 0
@@ -85,8 +85,8 @@ F0
C0
F8
ENDCHAR
-STARTCHAR U+0035
-ENCODING 53
+STARTCHAR U+0033
+ENCODING 51
SWIDTH 1000 0
DWIDTH 6
BBX 5 6 0 0
@@ -98,8 +98,8 @@ F0
18
F0
ENDCHAR
-STARTCHAR U+0036
-ENCODING 54
+STARTCHAR U+0034
+ENCODING 52
SWIDTH 1000 0
DWIDTH 6
BBX 5 6 0 0
@@ -111,8 +111,8 @@ F8
18
18
ENDCHAR
-STARTCHAR U+0037
-ENCODING 55
+STARTCHAR U+0035
+ENCODING 53
SWIDTH 1000 0
DWIDTH 6
BBX 5 6 0 0
@@ -124,8 +124,8 @@ F0
18
F0
ENDCHAR
-STARTCHAR U+0038
-ENCODING 56
+STARTCHAR U+0036
+ENCODING 54
SWIDTH 1000 0
DWIDTH 6
BBX 5 6 0 0
@@ -137,8 +137,8 @@ D8
D8
70
ENDCHAR
-STARTCHAR U+0039
-ENCODING 57
+STARTCHAR U+0037
+ENCODING 55
SWIDTH 1000 0
DWIDTH 6
BBX 5 6 0 0
@@ -150,8 +150,8 @@ F8
60
60
ENDCHAR
-STARTCHAR U+003A
-ENCODING 58
+STARTCHAR U+0038
+ENCODING 56
SWIDTH 1000 0
DWIDTH 6
BBX 5 6 0 0
@@ -163,8 +163,8 @@ D8
D8
70
ENDCHAR
-STARTCHAR U+003B
-ENCODING 59
+STARTCHAR U+0039
+ENCODING 57
SWIDTH 1000 0
DWIDTH 6
BBX 5 6 0 0
diff --git a/nokia-menu.txt b/nokia-menu.txt
index 0ddc1a3..29a275d 100644
--- a/nokia-menu.txt
+++ b/nokia-menu.txt
@@ -1,13 +1,6 @@
# The very small font for locations in menu (6px high, up to 5px wide)
# You can run this through xform.c
-110
-110
-101
-101
-011
-011
-
11
11
11
@@ -22,6 +15,13 @@
1
0
+110
+110
+101
+101
+011
+011
+
10001
00100
00100
--
cgit v1.2.3-70-g09d2