From 1ff532e484eab99e53e7c9e178584846cfd25856 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 4 Jan 2017 10:22:44 -0600 Subject: [PATCH] Alternative way to encode font spacing for Tom Thumb font --- libnx/nxfonts/nxfonts_tom-thumb-3x6.h | 380 +++++++++++++------------- 1 file changed, 190 insertions(+), 190 deletions(-) diff --git a/libnx/nxfonts/nxfonts_tom-thumb-3x6.h b/libnx/nxfonts/nxfonts_tom-thumb-3x6.h index ccbc8a4df3..a6a2f28d4d 100644 --- a/libnx/nxfonts/nxfonts_tom-thumb-3x6.h +++ b/libnx/nxfonts/nxfonts_tom-thumb-3x6.h @@ -62,766 +62,766 @@ /* Maximum height and width of any glyph in the set */ #define NXFONT_MAXHEIGHT 6 -#define NXFONT_MAXWIDTH 3 +#define NXFONT_MAXWIDTH 4 /* The width of a space */ #define NXFONT_SPACEWIDTH 4 /* exclam (33) */ -#define NXFONT_METRICS_33 {1, 1, 5, 1, 0, 0} +#define NXFONT_METRICS_33 {1, 2, 5, 1, 0, 0} #define NXFONT_BITMAP_33 {0x80, 0x80, 0x80, 0x0, 0x80} /* quotedbl (34) */ -#define NXFONT_METRICS_34 {1, 3, 2, 1, 0, 0} +#define NXFONT_METRICS_34 {1, 4, 2, 0, 0, 0} #define NXFONT_BITMAP_34 {0xa0, 0xa0} /* numbersign (35) */ -#define NXFONT_METRICS_35 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_35 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_35 {0xa0, 0xe0, 0xa0, 0xe0, 0xa0} /* dollar (36) */ -#define NXFONT_METRICS_36 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_36 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_36 {0x60, 0xc0, 0x60, 0xc0, 0x40} /* percent (37) */ -#define NXFONT_METRICS_37 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_37 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_37 {0x80, 0x20, 0x40, 0x80, 0x20} /* ampersand (38) */ -#define NXFONT_METRICS_38 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_38 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_38 {0xc0, 0xc0, 0xe0, 0xa0, 0x60} /* quotesingle (39) */ -#define NXFONT_METRICS_39 {1, 1, 2, 1, 0, 0} +#define NXFONT_METRICS_39 {1, 2, 2, 1, 0, 0} #define NXFONT_BITMAP_39 {0x80, 0x80} /* parenleft (40) */ -#define NXFONT_METRICS_40 {1, 2, 5, 1, 0, 0} +#define NXFONT_METRICS_40 {1, 3, 5, 1, 0, 0} #define NXFONT_BITMAP_40 {0x40, 0x80, 0x80, 0x80, 0x40} /* parenright (41) */ -#define NXFONT_METRICS_41 {1, 2, 5, 1, 0, 0} +#define NXFONT_METRICS_41 {1, 3, 5, 0, 0, 0} #define NXFONT_BITMAP_41 {0x80, 0x40, 0x40, 0x40, 0x80} /* asterisk (42) */ -#define NXFONT_METRICS_42 {1, 3, 3, 1, 0, 0} +#define NXFONT_METRICS_42 {1, 4, 3, 0, 0, 0} #define NXFONT_BITMAP_42 {0xa0, 0x40, 0xa0} /* plus (43) */ -#define NXFONT_METRICS_43 {1, 3, 3, 1, 1, 0} +#define NXFONT_METRICS_43 {1, 4, 3, 0, 1, 0} #define NXFONT_BITMAP_43 {0x40, 0xe0, 0x40} /* comma (44) */ -#define NXFONT_METRICS_44 {1, 2, 2, 0, 3, 0} +#define NXFONT_METRICS_44 {1, 3, 2, 0, 3, 0} #define NXFONT_BITMAP_44 {0x40, 0x80} /* hyphen (45) */ -#define NXFONT_METRICS_45 {1, 3, 1, 0, 2, 0} +#define NXFONT_METRICS_45 {1, 4, 1, 0, 2, 0} #define NXFONT_BITMAP_45 {0xe0} /* period (46) */ -#define NXFONT_METRICS_46 {1, 1, 1, 1, 4, 0} +#define NXFONT_METRICS_46 {1, 2, 1, 1, 4, 0} #define NXFONT_BITMAP_46 {0x80} /* slash (47) */ -#define NXFONT_METRICS_47 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_47 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_47 {0x20, 0x20, 0x40, 0x80, 0x80} /* zero (48) */ -#define NXFONT_METRICS_48 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_48 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_48 {0x60, 0xa0, 0xa0, 0xa0, 0xc0} /* one (49) */ -#define NXFONT_METRICS_49 {1, 2, 5, 1, 0, 0} +#define NXFONT_METRICS_49 {1, 3, 5, 0, 0, 0} #define NXFONT_BITMAP_49 {0x40, 0xc0, 0x40, 0x40, 0x40} /* two (50) */ -#define NXFONT_METRICS_50 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_50 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_50 {0xc0, 0x20, 0x40, 0x80, 0xe0} /* three (51) */ -#define NXFONT_METRICS_51 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_51 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_51 {0xc0, 0x20, 0x40, 0x20, 0xc0} /* four (52) */ -#define NXFONT_METRICS_52 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_52 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_52 {0xa0, 0xa0, 0xe0, 0x20, 0x20} /* five (53) */ -#define NXFONT_METRICS_53 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_53 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_53 {0xe0, 0x80, 0xc0, 0x20, 0xc0} /* six (54) */ -#define NXFONT_METRICS_54 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_54 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_54 {0x60, 0x80, 0xe0, 0xa0, 0xe0} /* seven (55) */ -#define NXFONT_METRICS_55 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_55 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_55 {0xe0, 0x20, 0x40, 0x80, 0x80} /* eight (56) */ -#define NXFONT_METRICS_56 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_56 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_56 {0xe0, 0xa0, 0xe0, 0xa0, 0xe0} /* nine (57) */ -#define NXFONT_METRICS_57 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_57 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_57 {0xe0, 0xa0, 0xe0, 0x20, 0xc0} /* colon (58) */ -#define NXFONT_METRICS_58 {1, 1, 3, 1, 1, 0} +#define NXFONT_METRICS_58 {1, 2, 3, 1, 1, 0} #define NXFONT_BITMAP_58 {0x80, 0x0, 0x80} /* semicolon (59) */ -#define NXFONT_METRICS_59 {1, 2, 4, 1, 1, 0} +#define NXFONT_METRICS_59 {1, 3, 4, 0, 1, 0} #define NXFONT_BITMAP_59 {0x40, 0x0, 0x40, 0x80} /* less (60) */ -#define NXFONT_METRICS_60 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_60 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_60 {0x20, 0x40, 0x80, 0x40, 0x20} /* equal (61) */ -#define NXFONT_METRICS_61 {1, 3, 3, 1, 1, 0} +#define NXFONT_METRICS_61 {1, 4, 3, 0, 1, 0} #define NXFONT_BITMAP_61 {0xe0, 0x0, 0xe0} /* greater (62) */ -#define NXFONT_METRICS_62 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_62 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_62 {0x80, 0x40, 0x20, 0x40, 0x80} /* question (63) */ -#define NXFONT_METRICS_63 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_63 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_63 {0xe0, 0x20, 0x40, 0x0, 0x40} /* at (64) */ -#define NXFONT_METRICS_64 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_64 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_64 {0x40, 0xa0, 0xe0, 0x80, 0x60} /* A (65) */ -#define NXFONT_METRICS_65 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_65 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_65 {0x40, 0xa0, 0xe0, 0xa0, 0xa0} /* B (66) */ -#define NXFONT_METRICS_66 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_66 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_66 {0xc0, 0xa0, 0xc0, 0xa0, 0xc0} /* C (67) */ -#define NXFONT_METRICS_67 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_67 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_67 {0x60, 0x80, 0x80, 0x80, 0x60} /* D (68) */ -#define NXFONT_METRICS_68 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_68 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_68 {0xc0, 0xa0, 0xa0, 0xa0, 0xc0} /* E (69) */ -#define NXFONT_METRICS_69 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_69 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_69 {0xe0, 0x80, 0xe0, 0x80, 0xe0} /* F (70) */ -#define NXFONT_METRICS_70 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_70 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_70 {0xe0, 0x80, 0xe0, 0x80, 0x80} /* G (71) */ -#define NXFONT_METRICS_71 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_71 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_71 {0x60, 0x80, 0xe0, 0xa0, 0x60} /* H (72) */ -#define NXFONT_METRICS_72 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_72 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_72 {0xa0, 0xa0, 0xe0, 0xa0, 0xa0} /* I (73) */ -#define NXFONT_METRICS_73 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_73 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_73 {0xe0, 0x40, 0x40, 0x40, 0xe0} /* J (74) */ -#define NXFONT_METRICS_74 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_74 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_74 {0x20, 0x20, 0x20, 0xa0, 0x40} /* K (75) */ -#define NXFONT_METRICS_75 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_75 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_75 {0xa0, 0xa0, 0xc0, 0xa0, 0xa0} /* L (76) */ -#define NXFONT_METRICS_76 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_76 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_76 {0x80, 0x80, 0x80, 0x80, 0xe0} /* M (77) */ -#define NXFONT_METRICS_77 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_77 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_77 {0xa0, 0xe0, 0xe0, 0xa0, 0xa0} /* N (78) */ -#define NXFONT_METRICS_78 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_78 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_78 {0xa0, 0xe0, 0xe0, 0xe0, 0xa0} /* O (79) */ -#define NXFONT_METRICS_79 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_79 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_79 {0x40, 0xa0, 0xa0, 0xa0, 0x40} /* P (80) */ -#define NXFONT_METRICS_80 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_80 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_80 {0xc0, 0xa0, 0xc0, 0x80, 0x80} /* Q (81) */ -#define NXFONT_METRICS_81 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_81 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_81 {0x40, 0xa0, 0xa0, 0xe0, 0x60} /* R (82) */ -#define NXFONT_METRICS_82 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_82 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_82 {0xc0, 0xa0, 0xe0, 0xc0, 0xa0} /* S (83) */ -#define NXFONT_METRICS_83 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_83 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_83 {0x60, 0x80, 0x40, 0x20, 0xc0} /* T (84) */ -#define NXFONT_METRICS_84 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_84 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_84 {0xe0, 0x40, 0x40, 0x40, 0x40} /* U (85) */ -#define NXFONT_METRICS_85 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_85 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_85 {0xa0, 0xa0, 0xa0, 0xa0, 0x60} /* V (86) */ -#define NXFONT_METRICS_86 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_86 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_86 {0xa0, 0xa0, 0xa0, 0x40, 0x40} /* W (87) */ -#define NXFONT_METRICS_87 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_87 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_87 {0xa0, 0xa0, 0xe0, 0xe0, 0xa0} /* X (88) */ -#define NXFONT_METRICS_88 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_88 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_88 {0xa0, 0xa0, 0x40, 0xa0, 0xa0} /* Y (89) */ -#define NXFONT_METRICS_89 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_89 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_89 {0xa0, 0xa0, 0x40, 0x40, 0x40} /* Z (90) */ -#define NXFONT_METRICS_90 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_90 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_90 {0xe0, 0x20, 0x40, 0x80, 0xe0} /* bracketleft (91) */ -#define NXFONT_METRICS_91 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_91 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_91 {0xe0, 0x80, 0x80, 0x80, 0xe0} /* backslash (92) */ -#define NXFONT_METRICS_92 {1, 3, 3, 1, 1, 0} +#define NXFONT_METRICS_92 {1, 4, 3, 0, 1, 0} #define NXFONT_BITMAP_92 {0x80, 0x40, 0x20} /* bracketright (93) */ -#define NXFONT_METRICS_93 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_93 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_93 {0xe0, 0x20, 0x20, 0x20, 0xe0} /* asciicircum (94) */ -#define NXFONT_METRICS_94 {1, 3, 2, 1, 0, 0} +#define NXFONT_METRICS_94 {1, 4, 2, 0, 0, 0} #define NXFONT_BITMAP_94 {0x40, 0xa0} /* underscore (95) */ -#define NXFONT_METRICS_95 {1, 3, 1, 0, 4, 0} +#define NXFONT_METRICS_95 {1, 4, 1, 0, 4, 0} #define NXFONT_BITMAP_95 {0xe0} /* grave (96) */ -#define NXFONT_METRICS_96 {1, 2, 2, 1, 0, 0} +#define NXFONT_METRICS_96 {1, 3, 2, 0, 0, 0} #define NXFONT_BITMAP_96 {0x80, 0x40} /* a (97) */ -#define NXFONT_METRICS_97 {1, 3, 4, 1, 1, 0} +#define NXFONT_METRICS_97 {1, 4, 4, 0, 1, 0} #define NXFONT_BITMAP_97 {0xc0, 0x60, 0xa0, 0xe0} /* b (98) */ -#define NXFONT_METRICS_98 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_98 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_98 {0x80, 0xc0, 0xa0, 0xa0, 0xc0} /* c (99) */ -#define NXFONT_METRICS_99 {1, 3, 4, 1, 1, 0} +#define NXFONT_METRICS_99 {1, 4, 4, 0, 1, 0} #define NXFONT_BITMAP_99 {0x60, 0x80, 0x80, 0x60} /* d (100) */ -#define NXFONT_METRICS_100 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_100 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_100 {0x20, 0x60, 0xa0, 0xa0, 0x60} /* e (101) */ -#define NXFONT_METRICS_101 {1, 3, 4, 1, 1, 0} +#define NXFONT_METRICS_101 {1, 4, 4, 0, 1, 0} #define NXFONT_BITMAP_101 {0x60, 0xa0, 0xc0, 0x60} /* f (102) */ -#define NXFONT_METRICS_102 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_102 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_102 {0x20, 0x40, 0xe0, 0x40, 0x40} /* g (103) */ -#define NXFONT_METRICS_103 {1, 3, 5, 1, 1, 0} +#define NXFONT_METRICS_103 {1, 4, 5, 0, 1, 0} #define NXFONT_BITMAP_103 {0x60, 0xa0, 0xe0, 0x20, 0x40} /* h (104) */ -#define NXFONT_METRICS_104 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_104 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_104 {0x80, 0xc0, 0xa0, 0xa0, 0xa0} /* i (105) */ -#define NXFONT_METRICS_105 {1, 1, 5, 1, 0, 0} +#define NXFONT_METRICS_105 {1, 2, 5, 1, 0, 0} #define NXFONT_BITMAP_105 {0x80, 0x0, 0x80, 0x80, 0x80} /* j (106) */ -#define NXFONT_METRICS_106 {1, 3, 6, 1, 0, 0} +#define NXFONT_METRICS_106 {1, 4, 6, 0, 0, 0} #define NXFONT_BITMAP_106 {0x20, 0x0, 0x20, 0x20, 0xa0, 0x40} /* k (107) */ -#define NXFONT_METRICS_107 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_107 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_107 {0x80, 0xa0, 0xc0, 0xc0, 0xa0} /* l (108) */ -#define NXFONT_METRICS_108 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_108 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_108 {0xc0, 0x40, 0x40, 0x40, 0xe0} /* m (109) */ -#define NXFONT_METRICS_109 {1, 3, 4, 1, 1, 0} +#define NXFONT_METRICS_109 {1, 4, 4, 0, 1, 0} #define NXFONT_BITMAP_109 {0xe0, 0xe0, 0xe0, 0xa0} /* n (110) */ -#define NXFONT_METRICS_110 {1, 3, 4, 1, 1, 0} +#define NXFONT_METRICS_110 {1, 4, 4, 0, 1, 0} #define NXFONT_BITMAP_110 {0xc0, 0xa0, 0xa0, 0xa0} /* o (111) */ -#define NXFONT_METRICS_111 {1, 3, 4, 1, 1, 0} +#define NXFONT_METRICS_111 {1, 4, 4, 0, 1, 0} #define NXFONT_BITMAP_111 {0x40, 0xa0, 0xa0, 0x40} /* p (112) */ -#define NXFONT_METRICS_112 {1, 3, 5, 1, 1, 0} +#define NXFONT_METRICS_112 {1, 4, 5, 0, 1, 0} #define NXFONT_BITMAP_112 {0xc0, 0xa0, 0xa0, 0xc0, 0x80} /* q (113) */ -#define NXFONT_METRICS_113 {1, 3, 5, 1, 1, 0} +#define NXFONT_METRICS_113 {1, 4, 5, 0, 1, 0} #define NXFONT_BITMAP_113 {0x60, 0xa0, 0xa0, 0x60, 0x20} /* r (114) */ -#define NXFONT_METRICS_114 {1, 3, 4, 1, 1, 0} +#define NXFONT_METRICS_114 {1, 4, 4, 0, 1, 0} #define NXFONT_BITMAP_114 {0x60, 0x80, 0x80, 0x80} /* s (115) */ -#define NXFONT_METRICS_115 {1, 3, 4, 1, 1, 0} +#define NXFONT_METRICS_115 {1, 4, 4, 0, 1, 0} #define NXFONT_BITMAP_115 {0x60, 0xc0, 0x60, 0xc0} /* t (116) */ -#define NXFONT_METRICS_116 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_116 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_116 {0x40, 0xe0, 0x40, 0x40, 0x60} /* u (117) */ -#define NXFONT_METRICS_117 {1, 3, 4, 1, 1, 0} +#define NXFONT_METRICS_117 {1, 4, 4, 0, 1, 0} #define NXFONT_BITMAP_117 {0xa0, 0xa0, 0xa0, 0x60} /* v (118) */ -#define NXFONT_METRICS_118 {1, 3, 4, 1, 1, 0} +#define NXFONT_METRICS_118 {1, 4, 4, 0, 1, 0} #define NXFONT_BITMAP_118 {0xa0, 0xa0, 0xe0, 0x40} /* w (119) */ -#define NXFONT_METRICS_119 {1, 3, 4, 1, 1, 0} +#define NXFONT_METRICS_119 {1, 4, 4, 0, 1, 0} #define NXFONT_BITMAP_119 {0xa0, 0xe0, 0xe0, 0xe0} /* x (120) */ -#define NXFONT_METRICS_120 {1, 3, 4, 1, 1, 0} +#define NXFONT_METRICS_120 {1, 4, 4, 0, 1, 0} #define NXFONT_BITMAP_120 {0xa0, 0x40, 0x40, 0xa0} /* y (121) */ -#define NXFONT_METRICS_121 {1, 3, 5, 1, 1, 0} +#define NXFONT_METRICS_121 {1, 4, 5, 0, 1, 0} #define NXFONT_BITMAP_121 {0xa0, 0xa0, 0x60, 0x20, 0x40} /* z (122) */ -#define NXFONT_METRICS_122 {1, 3, 4, 1, 1, 0} +#define NXFONT_METRICS_122 {1, 4, 4, 0, 1, 0} #define NXFONT_BITMAP_122 {0xe0, 0x60, 0xc0, 0xe0} /* braceleft (123) */ -#define NXFONT_METRICS_123 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_123 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_123 {0x60, 0x40, 0x80, 0x40, 0x60} /* bar (124) */ -#define NXFONT_METRICS_124 {1, 1, 5, 1, 0, 0} +#define NXFONT_METRICS_124 {1, 2, 5, 1, 0, 0} #define NXFONT_BITMAP_124 {0x80, 0x80, 0x0, 0x80, 0x80} /* braceright (125) */ -#define NXFONT_METRICS_125 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_125 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_125 {0xc0, 0x40, 0x20, 0x40, 0xc0} /* asciitilde (126) */ -#define NXFONT_METRICS_126 {1, 3, 2, 1, 0, 0} +#define NXFONT_METRICS_126 {1, 4, 2, 0, 0, 0} #define NXFONT_BITMAP_126 {0x60, 0xc0} /* exclamdown (161) */ -#define NXFONT_METRICS_161 {1, 1, 5, 1, 0, 0} +#define NXFONT_METRICS_161 {1, 2, 5, 1, 0, 0} #define NXFONT_BITMAP_161 {0x80, 0x0, 0x80, 0x80, 0x80} /* cent (162) */ -#define NXFONT_METRICS_162 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_162 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_162 {0x40, 0xe0, 0x80, 0xe0, 0x40} /* sterling (163) */ -#define NXFONT_METRICS_163 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_163 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_163 {0x60, 0x40, 0xe0, 0x40, 0xe0} /* currency (164) */ -#define NXFONT_METRICS_164 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_164 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_164 {0xa0, 0x40, 0xe0, 0x40, 0xa0} /* yen (165) */ -#define NXFONT_METRICS_165 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_165 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_165 {0xa0, 0xa0, 0x40, 0xe0, 0x40} /* brokenbar (166) */ -#define NXFONT_METRICS_166 {1, 1, 5, 1, 0, 0} +#define NXFONT_METRICS_166 {1, 2, 5, 1, 0, 0} #define NXFONT_BITMAP_166 {0x80, 0x80, 0x0, 0x80, 0x80} /* section (167) */ -#define NXFONT_METRICS_167 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_167 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_167 {0x60, 0x40, 0xa0, 0x40, 0xc0} /* dieresis (168) */ -#define NXFONT_METRICS_168 {1, 3, 1, 1, 0, 0} +#define NXFONT_METRICS_168 {1, 4, 1, 0, 0, 0} #define NXFONT_BITMAP_168 {0xa0} /* copyright (169) */ -#define NXFONT_METRICS_169 {1, 3, 3, 1, 0, 0} +#define NXFONT_METRICS_169 {1, 4, 3, 0, 0, 0} #define NXFONT_BITMAP_169 {0x60, 0x80, 0x60} /* ordfeminine (170) */ -#define NXFONT_METRICS_170 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_170 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_170 {0x60, 0xa0, 0xe0, 0x0, 0xe0} /* guillemotleft (171) */ -#define NXFONT_METRICS_171 {1, 2, 3, 1, 0, 0} +#define NXFONT_METRICS_171 {1, 3, 3, 0, 0, 0} #define NXFONT_BITMAP_171 {0x40, 0x80, 0x40} /* logicalnot (172) */ -#define NXFONT_METRICS_172 {1, 3, 2, 1, 1, 0} +#define NXFONT_METRICS_172 {1, 4, 2, 0, 1, 0} #define NXFONT_BITMAP_172 {0xe0, 0x20} /* softhyphen (173) */ -#define NXFONT_METRICS_173 {1, 2, 1, 0, 2, 0} +#define NXFONT_METRICS_173 {1, 3, 1, 0, 2, 0} #define NXFONT_BITMAP_173 {0xc0} /* registered (174) */ -#define NXFONT_METRICS_174 {1, 3, 3, 1, 0, 0} +#define NXFONT_METRICS_174 {1, 4, 3, 0, 0, 0} #define NXFONT_BITMAP_174 {0xc0, 0xc0, 0xa0} /* macron (175) */ -#define NXFONT_METRICS_175 {1, 3, 1, 1, 0, 0} +#define NXFONT_METRICS_175 {1, 4, 1, 0, 0, 0} #define NXFONT_BITMAP_175 {0xe0} /* degree (176) */ -#define NXFONT_METRICS_176 {1, 3, 3, 1, 0, 0} +#define NXFONT_METRICS_176 {1, 4, 3, 0, 0, 0} #define NXFONT_BITMAP_176 {0x40, 0xa0, 0x40} /* plusminus (177) */ -#define NXFONT_METRICS_177 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_177 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_177 {0x40, 0xe0, 0x40, 0x0, 0xe0} /* twosuperior (178) */ -#define NXFONT_METRICS_178 {1, 3, 3, 1, 0, 0} +#define NXFONT_METRICS_178 {1, 4, 3, 0, 0, 0} #define NXFONT_BITMAP_178 {0xc0, 0x40, 0x60} /* threesuperior (179) */ -#define NXFONT_METRICS_179 {1, 3, 3, 1, 0, 0} +#define NXFONT_METRICS_179 {1, 4, 3, 0, 0, 0} #define NXFONT_BITMAP_179 {0xe0, 0x60, 0xe0} /* acute (180) */ -#define NXFONT_METRICS_180 {1, 2, 2, 1, 0, 0} +#define NXFONT_METRICS_180 {1, 3, 2, 1, 0, 0} #define NXFONT_BITMAP_180 {0x40, 0x80} /* mu (181) */ -#define NXFONT_METRICS_181 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_181 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_181 {0xa0, 0xa0, 0xa0, 0xc0, 0x80} /* paragraph (182) */ -#define NXFONT_METRICS_182 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_182 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_182 {0x60, 0xa0, 0x60, 0x60, 0x60} /* periodcentered (183) */ -#define NXFONT_METRICS_183 {1, 3, 3, 1, 1, 0} +#define NXFONT_METRICS_183 {1, 4, 3, 0, 1, 0} #define NXFONT_BITMAP_183 {0xe0, 0xe0, 0xe0} /* cedilla (184) */ -#define NXFONT_METRICS_184 {1, 3, 3, 0, 2, 0} +#define NXFONT_METRICS_184 {1, 4, 3, 0, 2, 0} #define NXFONT_BITMAP_184 {0x40, 0x20, 0xc0} /* onesuperior (185) */ -#define NXFONT_METRICS_185 {1, 1, 3, 1, 0, 0} +#define NXFONT_METRICS_185 {1, 2, 3, 1, 0, 0} #define NXFONT_BITMAP_185 {0x80, 0x80, 0x80} /* ordmasculine (186) */ -#define NXFONT_METRICS_186 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_186 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_186 {0x40, 0xa0, 0x40, 0x0, 0xe0} /* guillemotright (187) */ -#define NXFONT_METRICS_187 {1, 2, 3, 1, 0, 0} +#define NXFONT_METRICS_187 {1, 3, 3, 1, 0, 0} #define NXFONT_BITMAP_187 {0x80, 0x40, 0x80} /* onequarter (188) */ -#define NXFONT_METRICS_188 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_188 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_188 {0x80, 0x80, 0x0, 0x60, 0x20} /* onehalf (189) */ -#define NXFONT_METRICS_189 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_189 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_189 {0x80, 0x80, 0x0, 0xc0, 0x60} /* threequarters (190) */ -#define NXFONT_METRICS_190 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_190 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_190 {0xc0, 0xc0, 0x0, 0x60, 0x20} /* questiondown (191) */ -#define NXFONT_METRICS_191 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_191 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_191 {0x40, 0x0, 0x40, 0x80, 0xe0} /* Agrave (192) */ -#define NXFONT_METRICS_192 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_192 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_192 {0x40, 0x20, 0x40, 0xe0, 0xa0} /* Aacute (193) */ -#define NXFONT_METRICS_193 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_193 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_193 {0x40, 0x80, 0x40, 0xe0, 0xa0} /* Acircumflex (194) */ -#define NXFONT_METRICS_194 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_194 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_194 {0xe0, 0x0, 0x40, 0xe0, 0xa0} /* Atilde (195) */ -#define NXFONT_METRICS_195 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_195 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_195 {0x60, 0xc0, 0x40, 0xe0, 0xa0} /* Adieresis (196) */ -#define NXFONT_METRICS_196 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_196 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_196 {0xa0, 0x40, 0xa0, 0xe0, 0xa0} /* Aring (197) */ -#define NXFONT_METRICS_197 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_197 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_197 {0xc0, 0xc0, 0xa0, 0xe0, 0xa0} /* AE (198) */ -#define NXFONT_METRICS_198 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_198 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_198 {0x60, 0xc0, 0xe0, 0xc0, 0xe0} /* Ccedilla (199) */ -#define NXFONT_METRICS_199 {1, 3, 6, 1, 0, 0} +#define NXFONT_METRICS_199 {1, 4, 6, 0, 0, 0} #define NXFONT_BITMAP_199 {0x60, 0x80, 0x80, 0x60, 0x20, 0x40} /* Egrave (200) */ -#define NXFONT_METRICS_200 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_200 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_200 {0x40, 0x20, 0xe0, 0xc0, 0xe0} /* Eacute (201) */ -#define NXFONT_METRICS_201 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_201 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_201 {0x40, 0x80, 0xe0, 0xc0, 0xe0} /* Ecircumflex (202) */ -#define NXFONT_METRICS_202 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_202 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_202 {0xe0, 0x0, 0xe0, 0xc0, 0xe0} /* Edieresis (203) */ -#define NXFONT_METRICS_203 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_203 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_203 {0xa0, 0x0, 0xe0, 0xc0, 0xe0} /* Igrave (204) */ -#define NXFONT_METRICS_204 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_204 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_204 {0x40, 0x20, 0xe0, 0x40, 0xe0} /* Iacute (205) */ -#define NXFONT_METRICS_205 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_205 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_205 {0x40, 0x80, 0xe0, 0x40, 0xe0} /* Icircumflex (206) */ -#define NXFONT_METRICS_206 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_206 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_206 {0xe0, 0x0, 0xe0, 0x40, 0xe0} /* Idieresis (207) */ -#define NXFONT_METRICS_207 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_207 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_207 {0xa0, 0x0, 0xe0, 0x40, 0xe0} /* Eth (208) */ -#define NXFONT_METRICS_208 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_208 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_208 {0xc0, 0xa0, 0xe0, 0xa0, 0xc0} /* Ntilde (209) */ -#define NXFONT_METRICS_209 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_209 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_209 {0xc0, 0x60, 0xa0, 0xe0, 0xa0} /* Ograve (210) */ -#define NXFONT_METRICS_210 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_210 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_210 {0x40, 0x20, 0xe0, 0xa0, 0xe0} /* Oacute (211) */ -#define NXFONT_METRICS_211 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_211 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_211 {0x40, 0x80, 0xe0, 0xa0, 0xe0} /* Ocircumflex (212) */ -#define NXFONT_METRICS_212 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_212 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_212 {0xe0, 0x0, 0xe0, 0xa0, 0xe0} /* Otilde (213) */ -#define NXFONT_METRICS_213 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_213 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_213 {0xc0, 0x60, 0xe0, 0xa0, 0xe0} /* Odieresis (214) */ -#define NXFONT_METRICS_214 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_214 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_214 {0xa0, 0x0, 0xe0, 0xa0, 0xe0} /* multiply (215) */ -#define NXFONT_METRICS_215 {1, 3, 3, 1, 1, 0} +#define NXFONT_METRICS_215 {1, 4, 3, 0, 1, 0} #define NXFONT_BITMAP_215 {0xa0, 0x40, 0xa0} /* Oslash (216) */ -#define NXFONT_METRICS_216 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_216 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_216 {0x60, 0xa0, 0xe0, 0xa0, 0xc0} /* Ugrave (217) */ -#define NXFONT_METRICS_217 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_217 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_217 {0x80, 0x40, 0xa0, 0xa0, 0xe0} /* Uacute (218) */ -#define NXFONT_METRICS_218 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_218 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_218 {0x20, 0x40, 0xa0, 0xa0, 0xe0} /* Ucircumflex (219) */ -#define NXFONT_METRICS_219 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_219 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_219 {0xe0, 0x0, 0xa0, 0xa0, 0xe0} /* Udieresis (220) */ -#define NXFONT_METRICS_220 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_220 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_220 {0xa0, 0x0, 0xa0, 0xa0, 0xe0} /* Yacute (221) */ -#define NXFONT_METRICS_221 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_221 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_221 {0x20, 0x40, 0xa0, 0xe0, 0x40} /* Thorn (222) */ -#define NXFONT_METRICS_222 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_222 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_222 {0x80, 0xe0, 0xa0, 0xe0, 0x80} /* germandbls (223) */ -#define NXFONT_METRICS_223 {1, 3, 6, 1, 0, 0} +#define NXFONT_METRICS_223 {1, 4, 6, 0, 0, 0} #define NXFONT_BITMAP_223 {0x60, 0xa0, 0xc0, 0xa0, 0xc0, 0x80} /* agrave (224) */ -#define NXFONT_METRICS_224 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_224 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_224 {0x40, 0x20, 0x60, 0xa0, 0xe0} /* aacute (225) */ -#define NXFONT_METRICS_225 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_225 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_225 {0x40, 0x80, 0x60, 0xa0, 0xe0} /* acircumflex (226) */ -#define NXFONT_METRICS_226 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_226 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_226 {0xe0, 0x0, 0x60, 0xa0, 0xe0} /* atilde (227) */ -#define NXFONT_METRICS_227 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_227 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_227 {0x60, 0xc0, 0x60, 0xa0, 0xe0} /* adieresis (228) */ -#define NXFONT_METRICS_228 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_228 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_228 {0xa0, 0x0, 0x60, 0xa0, 0xe0} /* aring (229) */ -#define NXFONT_METRICS_229 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_229 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_229 {0x60, 0x60, 0x60, 0xa0, 0xe0} /* ae (230) */ -#define NXFONT_METRICS_230 {1, 3, 4, 1, 1, 0} +#define NXFONT_METRICS_230 {1, 4, 4, 0, 1, 0} #define NXFONT_BITMAP_230 {0x60, 0xe0, 0xe0, 0xc0} /* ccedilla (231) */ -#define NXFONT_METRICS_231 {1, 3, 5, 1, 1, 0} +#define NXFONT_METRICS_231 {1, 4, 5, 0, 1, 0} #define NXFONT_BITMAP_231 {0x60, 0x80, 0x60, 0x20, 0x40} /* egrave (232) */ -#define NXFONT_METRICS_232 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_232 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_232 {0x40, 0x20, 0x60, 0xe0, 0x60} /* eacute (233) */ -#define NXFONT_METRICS_233 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_233 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_233 {0x40, 0x80, 0x60, 0xe0, 0x60} /* ecircumflex (234) */ -#define NXFONT_METRICS_234 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_234 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_234 {0xe0, 0x0, 0x60, 0xe0, 0x60} /* edieresis (235) */ -#define NXFONT_METRICS_235 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_235 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_235 {0xa0, 0x0, 0x60, 0xe0, 0x60} /* igrave (236) */ -#define NXFONT_METRICS_236 {1, 2, 5, 1, 0, 0} +#define NXFONT_METRICS_236 {1, 3, 5, 1, 0, 0} #define NXFONT_BITMAP_236 {0x80, 0x40, 0x80, 0x80, 0x80} /* iacute (237) */ -#define NXFONT_METRICS_237 {1, 2, 5, 1, 0, 0} +#define NXFONT_METRICS_237 {1, 3, 5, 0, 0, 0} #define NXFONT_BITMAP_237 {0x40, 0x80, 0x40, 0x40, 0x40} /* icircumflex (238) */ -#define NXFONT_METRICS_238 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_238 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_238 {0xe0, 0x0, 0x40, 0x40, 0x40} /* idieresis (239) */ -#define NXFONT_METRICS_239 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_239 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_239 {0xa0, 0x0, 0x40, 0x40, 0x40} /* eth (240) */ -#define NXFONT_METRICS_240 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_240 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_240 {0x60, 0xc0, 0x60, 0xa0, 0x60} /* ntilde (241) */ -#define NXFONT_METRICS_241 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_241 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_241 {0xc0, 0x60, 0xc0, 0xa0, 0xa0} /* ograve (242) */ -#define NXFONT_METRICS_242 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_242 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_242 {0x40, 0x20, 0x40, 0xa0, 0x40} /* oacute (243) */ -#define NXFONT_METRICS_243 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_243 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_243 {0x40, 0x80, 0x40, 0xa0, 0x40} /* ocircumflex (244) */ -#define NXFONT_METRICS_244 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_244 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_244 {0xe0, 0x0, 0x40, 0xa0, 0x40} /* otilde (245) */ -#define NXFONT_METRICS_245 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_245 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_245 {0xc0, 0x60, 0x40, 0xa0, 0x40} /* odieresis (246) */ -#define NXFONT_METRICS_246 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_246 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_246 {0xa0, 0x0, 0x40, 0xa0, 0x40} /* divide (247) */ -#define NXFONT_METRICS_247 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_247 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_247 {0x40, 0x0, 0xe0, 0x0, 0x40} /* oslash (248) */ -#define NXFONT_METRICS_248 {1, 3, 4, 1, 1, 0} +#define NXFONT_METRICS_248 {1, 4, 4, 0, 1, 0} #define NXFONT_BITMAP_248 {0x60, 0xe0, 0xa0, 0xc0} /* ugrave (249) */ -#define NXFONT_METRICS_249 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_249 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_249 {0x80, 0x40, 0xa0, 0xa0, 0x60} /* uacute (250) */ -#define NXFONT_METRICS_250 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_250 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_250 {0x20, 0x40, 0xa0, 0xa0, 0x60} /* ucircumflex (251) */ -#define NXFONT_METRICS_251 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_251 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_251 {0xe0, 0x0, 0xa0, 0xa0, 0x60} /* udieresis (252) */ -#define NXFONT_METRICS_252 {1, 3, 5, 1, 0, 0} +#define NXFONT_METRICS_252 {1, 4, 5, 0, 0, 0} #define NXFONT_BITMAP_252 {0xa0, 0x0, 0xa0, 0xa0, 0x60} /* yacute (253) */ -#define NXFONT_METRICS_253 {1, 3, 6, 1, 0, 0} +#define NXFONT_METRICS_253 {1, 4, 6, 0, 0, 0} #define NXFONT_BITMAP_253 {0x20, 0x40, 0xa0, 0x60, 0x20, 0x40} /* thorn (254) */ -#define NXFONT_METRICS_254 {1, 3, 5, 1, 1, 0} +#define NXFONT_METRICS_254 {1, 4, 5, 0, 1, 0} #define NXFONT_BITMAP_254 {0x80, 0xc0, 0xa0, 0xc0, 0x80} /* ydieresis (255) */ -#define NXFONT_METRICS_255 {1, 3, 6, 1, 0, 0} +#define NXFONT_METRICS_255 {1, 4, 6, 0, 0, 0} #define NXFONT_BITMAP_255 {0xa0, 0x0, 0xa0, 0x60, 0x20, 0x40} #endif