diff --git a/fonts/.gitignore b/fonts/.gitignore index bc93c5e89c..594cf42553 100644 --- a/fonts/.gitignore +++ b/fonts/.gitignore @@ -9,6 +9,7 @@ /cvgasys.fon /hvgasys.fon /jsmalle.fon +/jvgafix.fon /jvgasys.fon /smae1255.fon /smae1256.fon diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 716021e763..ac034f6472 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -12,6 +12,7 @@ BITMAP_FONTS = \ cvgasys.fon \ hvgasys.fon \ jsmalle.fon \ + jvgafix.fon \ jvgasys.fon \ smalle.fon \ smallee.fon \ @@ -91,6 +92,9 @@ coue1257.fon: courier.ttf vgafix.fon: fixedsys.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/fixedsys.ttf 15,1252,8 +jvgafix.fon: fixedsys_jp.ttf + $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/fixedsys_jp.ttf 18,932,8 + sserife.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1252,5 16,1252,7 20,1252,8 diff --git a/fonts/fixedsys_jp.sfd b/fonts/fixedsys_jp.sfd new file mode 100644 index 0000000000..165608ff50 --- /dev/null +++ b/fonts/fixedsys_jp.sfd @@ -0,0 +1,2301 @@ +SplineFontDB: 3.0 +FontName: fixedsys_jp +FullName: FixedSys +FamilyName: FixedSys +Weight: Medium +Copyright: Copyright (C) 2013 Huw D M Davies, Dmitry Timoshkov, et al. +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -1 +UnderlineWidth: 0 +Ascent: 16 +Descent: 2 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 516 2032022868 7388451] +FSType: 8 +OS2Version: 1 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1360244595 +ModificationTime: 1360589010 +PfmFamily: 49 +TTFWeight: 400 +TTFWidth: 5 +LineGap: 0 +VLineGap: 0 +Panose: 2 0 6 9 0 0 0 0 0 0 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 16 +OS2WinAOffset: 0 +OS2WinDescent: 2 +OS2WinDOffset: 0 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'Wine' +MarkAttachClasses: 1 +DEI: 91125 +LangName: 1033 +Encoding: UnicodeBmp +UnicodeInterp: none +NameList: Adobe Glyph List +DisplaySize: 18 +AntiAlias: 0 +FitToEm: 1 +WinInfo: 64 16 6 +OnlyBitmaps: 1 +BeginPrivate: 0 +EndPrivate +TeXData: 1 0 0 346030 173015 115343 0 1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 +BeginChars: 65536 224 + +StartChar: space +Encoding: 32 32 0 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: exclam +Encoding: 33 33 1 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: quotedbl +Encoding: 34 34 2 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: numbersign +Encoding: 35 35 3 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: dollar +Encoding: 36 36 4 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: percent +Encoding: 37 37 5 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: ampersand +Encoding: 38 38 6 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: quotesingle +Encoding: 39 39 7 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: parenleft +Encoding: 40 40 8 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: parenright +Encoding: 41 41 9 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: asterisk +Encoding: 42 42 10 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: plus +Encoding: 43 43 11 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: comma +Encoding: 44 44 12 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: hyphen +Encoding: 45 45 13 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: period +Encoding: 46 46 14 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: slash +Encoding: 47 47 15 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: zero +Encoding: 48 48 16 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: one +Encoding: 49 49 17 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: two +Encoding: 50 50 18 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: three +Encoding: 51 51 19 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: four +Encoding: 52 52 20 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: five +Encoding: 53 53 21 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: six +Encoding: 54 54 22 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: seven +Encoding: 55 55 23 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: eight +Encoding: 56 56 24 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: nine +Encoding: 57 57 25 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: colon +Encoding: 58 58 26 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: semicolon +Encoding: 59 59 27 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: less +Encoding: 60 60 28 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: equal +Encoding: 61 61 29 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: greater +Encoding: 62 62 30 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: question +Encoding: 63 63 31 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: at +Encoding: 64 64 32 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: A +Encoding: 65 65 33 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: B +Encoding: 66 66 34 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: C +Encoding: 67 67 35 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: D +Encoding: 68 68 36 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: E +Encoding: 69 69 37 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: F +Encoding: 70 70 38 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: G +Encoding: 71 71 39 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: H +Encoding: 72 72 40 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: I +Encoding: 73 73 41 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: J +Encoding: 74 74 42 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: K +Encoding: 75 75 43 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: L +Encoding: 76 76 44 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: M +Encoding: 77 77 45 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: N +Encoding: 78 78 46 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: O +Encoding: 79 79 47 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: P +Encoding: 80 80 48 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Q +Encoding: 81 81 49 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: R +Encoding: 82 82 50 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: S +Encoding: 83 83 51 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: T +Encoding: 84 84 52 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: U +Encoding: 85 85 53 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: V +Encoding: 86 86 54 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: W +Encoding: 87 87 55 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: X +Encoding: 88 88 56 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Y +Encoding: 89 89 57 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Z +Encoding: 90 90 58 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: bracketleft +Encoding: 91 91 59 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: backslash +Encoding: 92 92 60 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: bracketright +Encoding: 93 93 61 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: asciicircum +Encoding: 94 94 62 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: underscore +Encoding: 95 95 63 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: grave +Encoding: 96 96 64 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: a +Encoding: 97 97 65 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: b +Encoding: 98 98 66 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: c +Encoding: 99 99 67 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: d +Encoding: 100 100 68 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: e +Encoding: 101 101 69 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: f +Encoding: 102 102 70 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: g +Encoding: 103 103 71 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: h +Encoding: 104 104 72 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: i +Encoding: 105 105 73 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: j +Encoding: 106 106 74 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: k +Encoding: 107 107 75 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: l +Encoding: 108 108 76 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: m +Encoding: 109 109 77 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: n +Encoding: 110 110 78 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: o +Encoding: 111 111 79 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: p +Encoding: 112 112 80 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: q +Encoding: 113 113 81 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: r +Encoding: 114 114 82 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: s +Encoding: 115 115 83 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: t +Encoding: 116 116 84 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: u +Encoding: 117 117 85 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: v +Encoding: 118 118 86 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: w +Encoding: 119 119 87 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: x +Encoding: 120 120 88 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: y +Encoding: 121 121 89 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: z +Encoding: 122 122 90 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: braceleft +Encoding: 123 123 91 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: bar +Encoding: 124 124 92 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: braceright +Encoding: 125 125 93 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: asciitilde +Encoding: 126 126 94 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni007F +Encoding: 127 127 95 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0080 +Encoding: 128 128 96 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0081 +Encoding: 129 129 97 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0082 +Encoding: 130 130 98 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0083 +Encoding: 131 131 99 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0084 +Encoding: 132 132 100 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0085 +Encoding: 133 133 101 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0086 +Encoding: 134 134 102 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0087 +Encoding: 135 135 103 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0088 +Encoding: 136 136 104 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0089 +Encoding: 137 137 105 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni008A +Encoding: 138 138 106 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni008B +Encoding: 139 139 107 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni008C +Encoding: 140 140 108 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni008D +Encoding: 141 141 109 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni008E +Encoding: 142 142 110 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni008F +Encoding: 143 143 111 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0090 +Encoding: 144 144 112 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0091 +Encoding: 145 145 113 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0092 +Encoding: 146 146 114 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0093 +Encoding: 147 147 115 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0094 +Encoding: 148 148 116 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0095 +Encoding: 149 149 117 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0096 +Encoding: 150 150 118 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0097 +Encoding: 151 151 119 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0098 +Encoding: 152 152 120 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni0099 +Encoding: 153 153 121 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni009A +Encoding: 154 154 122 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni009B +Encoding: 155 155 123 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni009C +Encoding: 156 156 124 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni009D +Encoding: 157 157 125 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni009E +Encoding: 158 158 126 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni009F +Encoding: 159 159 127 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni00A0 +Encoding: 160 160 128 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: exclamdown +Encoding: 161 161 129 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: cent +Encoding: 162 162 130 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: sterling +Encoding: 163 163 131 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: currency +Encoding: 164 164 132 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: yen +Encoding: 165 165 133 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: brokenbar +Encoding: 166 166 134 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: section +Encoding: 167 167 135 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: dieresis +Encoding: 168 168 136 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: copyright +Encoding: 169 169 137 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: ordfeminine +Encoding: 170 170 138 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: guillemotleft +Encoding: 171 171 139 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: logicalnot +Encoding: 172 172 140 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni00AD +Encoding: 173 173 141 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: registered +Encoding: 174 174 142 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: macron +Encoding: 175 175 143 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: degree +Encoding: 176 176 144 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: plusminus +Encoding: 177 177 145 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni00B2 +Encoding: 178 178 146 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni00B3 +Encoding: 179 179 147 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: acute +Encoding: 180 180 148 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni00B5 +Encoding: 181 181 149 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: paragraph +Encoding: 182 182 150 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: periodcentered +Encoding: 183 183 151 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: cedilla +Encoding: 184 184 152 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni00B9 +Encoding: 185 185 153 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: ordmasculine +Encoding: 186 186 154 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: guillemotright +Encoding: 187 187 155 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: onequarter +Encoding: 188 188 156 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: onehalf +Encoding: 189 189 157 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: threequarters +Encoding: 190 190 158 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: questiondown +Encoding: 191 191 159 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Agrave +Encoding: 192 192 160 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Aacute +Encoding: 193 193 161 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Acircumflex +Encoding: 194 194 162 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Atilde +Encoding: 195 195 163 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Adieresis +Encoding: 196 196 164 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Aring +Encoding: 197 197 165 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: AE +Encoding: 198 198 166 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Ccedilla +Encoding: 199 199 167 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Egrave +Encoding: 200 200 168 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Eacute +Encoding: 201 201 169 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Ecircumflex +Encoding: 202 202 170 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Edieresis +Encoding: 203 203 171 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Igrave +Encoding: 204 204 172 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Iacute +Encoding: 205 205 173 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Icircumflex +Encoding: 206 206 174 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Idieresis +Encoding: 207 207 175 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Eth +Encoding: 208 208 176 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Ntilde +Encoding: 209 209 177 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Ograve +Encoding: 210 210 178 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Oacute +Encoding: 211 211 179 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Ocircumflex +Encoding: 212 212 180 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Otilde +Encoding: 213 213 181 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Odieresis +Encoding: 214 214 182 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: multiply +Encoding: 215 215 183 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Oslash +Encoding: 216 216 184 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Ugrave +Encoding: 217 217 185 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Uacute +Encoding: 218 218 186 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Ucircumflex +Encoding: 219 219 187 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Udieresis +Encoding: 220 220 188 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Yacute +Encoding: 221 221 189 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Thorn +Encoding: 222 222 190 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: germandbls +Encoding: 223 223 191 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: agrave +Encoding: 224 224 192 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: aacute +Encoding: 225 225 193 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: acircumflex +Encoding: 226 226 194 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: atilde +Encoding: 227 227 195 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: adieresis +Encoding: 228 228 196 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: aring +Encoding: 229 229 197 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: ae +Encoding: 230 230 198 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: ccedilla +Encoding: 231 231 199 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: egrave +Encoding: 232 232 200 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: eacute +Encoding: 233 233 201 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: ecircumflex +Encoding: 234 234 202 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: edieresis +Encoding: 235 235 203 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: igrave +Encoding: 236 236 204 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: iacute +Encoding: 237 237 205 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: icircumflex +Encoding: 238 238 206 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: idieresis +Encoding: 239 239 207 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: eth +Encoding: 240 240 208 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: ntilde +Encoding: 241 241 209 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: ograve +Encoding: 242 242 210 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: oacute +Encoding: 243 243 211 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: ocircumflex +Encoding: 244 244 212 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: otilde +Encoding: 245 245 213 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: odieresis +Encoding: 246 246 214 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: divide +Encoding: 247 247 215 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: oslash +Encoding: 248 248 216 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: ugrave +Encoding: 249 249 217 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uacute +Encoding: 250 250 218 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: ucircumflex +Encoding: 251 251 219 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: udieresis +Encoding: 252 252 220 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: yacute +Encoding: 253 253 221 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: thorn +Encoding: 254 254 222 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: ydieresis +Encoding: 255 255 223 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar +EndChars +BitmapFont: 18 225 16 2 1 +BDFChar: 0 32 8 2 2 0 0 +z +BDFChar: 1 33 8 3 4 0 13 +J:N0#J:N0#J:IV"^q]pM +BDFChar: 2 34 8 0 5 11 13 +Ce0Wf +BDFChar: 3 35 8 2 7 0 13 +84Z9Br('@L8Gl"L84W^\ +BDFChar: 4 36 8 1 7 0 13 +&.j5PP)t&(&sAE*&.egA +BDFChar: 5 37 8 1 7 0 11 +6DUEU8.Z=X.S<3_@K6B. +BDFChar: 7 39 8 0 2 11 13 +?pK5B +BDFChar: 8 40 8 3 5 -1 13 ++@&1WJ:N0#J:N/85X6Fl +BDFChar: 9 41 8 3 5 -1 13 +J3Z@b+Y.Lkl$2 +BDFChar: 73 105 8 3 3 0 9 +J,fS"J:N0#J:IV" +BDFChar: 74 106 8 3 4 -3 9 +5QCdL5X7S"5X7S"J,fQL +BDFChar: 75 107 8 1 6 0 9 +J:N0#Lle:VLkGa. +BDFChar: 76 108 8 3 3 0 9 +J:N0#J:N0#J:IV" +BDFChar: 77 109 8 1 7 0 6 +UtUupP*1t. +BDFChar: 78 110 8 1 5 0 6 +YfMWVLkpie +BDFChar: 79 111 8 1 6 0 6 +G_Ca'KS4RM +BDFChar: 80 112 8 1 6 -3 6 +\AX&RKZ(BNJ:IV" +BDFChar: 81 113 8 1 6 -3 6 +FGtm+KT(!U"9\]) +BDFChar: 82 114 8 2 4 0 6 +TYQ).J:N.M +BDFChar: 83 115 8 1 5 0 6 +E/9$`#`*F" +BDFChar: 84 116 8 2 4 0 8 +5X=6m5X7S"+92BA +BDFChar: 85 117 8 1 5 0 6 +LkpkCLmViU +BDFChar: 86 118 8 1 7 0 6 +Jq?BY-n#W, +BDFChar: 87 119 8 1 7 0 6 +JqB.b<%'-p +BDFChar: 88 120 8 1 6 0 6 +KLddN0M$is +BDFChar: 89 121 8 1 7 -3 6 +Jq?BY-n#W<+M[sW +BDFChar: 90 122 8 1 5 0 6 +p]qER5_/V0 +BDFChar: 91 123 8 3 5 -2 12 ++@&1W5X7Sb5X7S"5X6Fl +BDFChar: 92 124 8 3 3 -2 13 +J:N0#J:N0#J:N0#J:N0# +BDFChar: 93 125 8 3 5 -2 12 +J3Z@b5X7RW5X7S"5X9i" +BDFChar: 94 126 8 1 5 11 13 +8>qUM +BDFChar: 95 127 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 96 128 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 97 129 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 98 130 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 99 131 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 100 132 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 101 133 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 102 134 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 103 135 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 104 136 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 105 137 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 106 138 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 107 139 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 108 140 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 109 141 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 110 142 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 111 143 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 112 144 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 113 145 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 114 146 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 115 147 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 116 148 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 117 149 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 118 150 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 119 151 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 120 152 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 121 153 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 122 154 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 123 155 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 124 156 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 125 157 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 126 158 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 127 159 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 128 160 8 2 2 0 0 +z +BDFChar: 129 161 8 1 4 0 3 +@$$IX +BDFChar: 130 162 8 1 5 8 13 +pjdmFJ:IV" +BDFChar: 131 163 8 1 5 -2 3 +#RC\A#l"B" +BDFChar: 132 164 8 2 3 -1 0 +J3X)7 +BDFChar: 133 165 8 3 4 4 5 +^q]pM +BDFChar: 134 166 8 1 7 0 12 +rW3-&IKBQP"9\uA?iU0, +BDFChar: 135 167 8 1 5 0 9 +p]q-285N\Z5_&h7 +BDFChar: 136 168 8 1 5 0 9 +#S8+dTHG@"+b\"98E% +BDFChar: 150 182 8 1 7 0 13 +&.fEP&eYfi&gAMd64`g_D2/o"9\uA?iU0, +BDFChar: 157 189 8 1 7 0 12 +qud-*#RCtQ-q$ITJcGcN +BDFChar: 158 190 8 1 7 1 13 +5X7S0njGl:5X7S"IK0?J +BDFChar: 159 191 8 1 7 0 12 +Jq?Lk(#+J,fQL +BDFChar: 165 197 8 1 7 0 13 +#RC\ArWic8#RCtQ+@#o, +BDFChar: 166 198 8 1 7 2 10 +HiO-HzrVuou +BDFChar: 167 199 8 1 7 0 12 +rW3-&![JHc'GM`VJ,fQL +BDFChar: 168 200 8 1 7 0 12 +&.ngB":,Pq;NMG$&-)\1 +BDFChar: 169 201 8 2 7 0 12 +"9\i1"9\i5#RCta^]4?7 +BDFChar: 170 202 8 1 7 0 12 +#Y7KS6ps@.6:-9UJcGcN +BDFChar: 171 203 8 2 7 1 12 +J:N0/n:6%>J:N/t +BDFChar: 172 204 8 1 6 0 12 +qud-*"9\i1#RCta5QCca +BDFChar: 173 205 8 1 7 0 12 ++&-)\1 +BDFChar: 175 207 8 1 7 0 12 +rW3-&"@OL`&.fBY#QOi) +BDFChar: 176 208 8 1 6 0 12 +J7'2sJ7'2s!.\Go"98E% +BDFChar: 177 209 8 1 7 0 10 +&.fs,+@o$kKUUm# +BDFChar: 178 210 8 1 7 0 12 +"9\i1`$cH2$5+IHJ,fQL +BDFChar: 179 211 8 1 7 0 11 +rZE=++T`i!WiE+":,QH +BDFChar: 190 222 8 0 4 10 13 +OH<"( +BDFChar: 191 223 8 0 3 10 13 +@$$IX +BDFChar: 192 224 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 193 225 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 194 226 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 195 227 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 196 228 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 197 229 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 198 230 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 199 231 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 200 232 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 201 233 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 202 234 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 203 235 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 204 236 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 205 237 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 206 238 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 207 239 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 208 240 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 209 241 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 210 242 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 211 243 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 212 244 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 213 245 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 214 246 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 215 247 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 216 248 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 217 249 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 218 250 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 219 251 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 220 252 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 221 253 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 222 254 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 223 255 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np +EndBitmapFont +EndSplineFont diff --git a/fonts/fixedsys_jp.ttf b/fonts/fixedsys_jp.ttf new file mode 100644 index 0000000000..947731d777 Binary files /dev/null and b/fonts/fixedsys_jp.ttf differ diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index 05a3352aa5..1952c5cf16 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -432,8 +432,8 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, else if (!strcmp(face->family_name, "Fixedsys")) il = 3; - /* Japanese system fonts have an external leading (not small font) */ - if (enc == 932 && ppem > 11) + /* Japanese System font has an external leading */ + if (!strcmp(face->family_name, "System") && enc == 932) el = 2; else el = 0; @@ -529,7 +529,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, } info->hdr.fi.dfAvgWidth = avg_width; - info->hdr.fi.dfMaxWidth = max_width; + info->hdr.fi.dfMaxWidth = (enc == 932) ? avg_width * 2 : max_width; info->hdr.fi.dfDefaultChar = def_char - info->hdr.fi.dfFirstChar; info->hdr.fi.dfBreakChar = ' ' - info->hdr.fi.dfFirstChar; info->hdr.fi.dfWidthBytes = (width_bytes + 1) & ~1;