diff --git a/engine/data/font.png b/engine/data/font.png index 2833be3..f37502a 100644 Binary files a/engine/data/font.png and b/engine/data/font.png differ diff --git a/engine/include/GearSrc/File.h b/engine/include/GearSrc/File.h index 189c755..403e8d9 100644 --- a/engine/include/GearSrc/File.h +++ b/engine/include/GearSrc/File.h @@ -17,7 +17,7 @@ GSDECL unsigned int GSFileSize(GSFile file); GSDECL void GSFileClose(GSFile file); /* getline.c */ -GSDECL int GSFileGetLine(char** lineptr, int* n, FILE* fp); +GSDECL int GSFileGetLine(GSFile file, char** lineptr, int* n); #ifdef __cplusplus } diff --git a/engine/include/GearSrc/GL.h b/engine/include/GearSrc/GL.h index ef36eff..5207d3f 100644 --- a/engine/include/GearSrc/GL.h +++ b/engine/include/GearSrc/GL.h @@ -16,15 +16,19 @@ extern "C" { GSDECL GSBool GSGLShaderPrepare(GSGL gl, GLuint* shader, const char* vs, const char* fs); /* gl_texture.c */ -GSDECL void GSGLTexturePrepare(GSGL gl, GLuint* texture, unsigned char* rgba, int width, int height); +GSDECL void GSGLTextureLoad(GSGL gl, GLuint* texture, unsigned char* rgba, int width, int height); /* you probably don't want this. use GSGLTexturePrepare */ GSDECL void GSGLTextureSet(GSGL gl, GLuint texture); GSDECL void GSGLTextureDelete(GSGL gl, GLuint texture); /* gl_common.c */ +GSDECL void GSGLTexturePrepareEx(GSGL gl, GLuint* texture, unsigned char* rgba, int width, int height, int expand); +GSDECL void GSGLTexturePrepare(GSGL gl, GLuint* texture, unsigned char* rgba, int width, int height); GSDECL GSBool GSGLTextureLoadFile(GSGL gl, GLuint* texture, int* width, int* height, const char* filename); +GSDECL GSBool GSGLTextureLoadFileEx(GSGL gl, GLuint* texture, int* width, int* height, const char* filename, int expand); GSDECL GSBool GSGLTextureTry(GSGL gl, GLuint* texture, int* width, int* height, const char* prefix); -GSDECL void GSGLTextEx(GSGL gl, double x, double y, double sx, double sy, const char* text); -GSDECL void GSGLText(GSGL gl, double x, double y, const char* text); +GSDECL GSBool GSGLTextureTryEx(GSGL gl, GLuint* texture, int* width, int* height, const char* prefix, int expand); +GSDECL void GSGLTextEx(GSGL gl, GSNumber x, GSNumber y, const char* text, GSNumber sx, GSNumber sy); +GSDECL void GSGLText(GSGL gl, GSNumber x, GSNumber y, const char* text); GSDECL double GSGLTextWidth(GSGL gl, const char* text); GSDECL double GSGLTextHeight(GSGL gl, const char* text); diff --git a/engine/include/GearSrc/Math.h b/engine/include/GearSrc/Math.h index 657b7db..65c7b9a 100644 --- a/engine/include/GearSrc/Math.h +++ b/engine/include/GearSrc/Math.h @@ -18,6 +18,7 @@ GSDECL void GSMathNormal3x3(GSVector3 r, GSVector3 v0, GSVector3 v1, GSVector3 v GSDECL void GSMathNormal3x4(GSVector3 r, GSVector3 v0, GSVector3 v1, GSVector3 v2, GSVector3 v3); GSDECL void GSMathInvert4x4(GSMatrix4x4 out, GSMatrix4x4 in); GSDECL GSNumber GSMathCot(GSNumber x); +GSDECL GSNumber GSMathClosestPOT(GSNumber x); #ifdef __cplusplus } diff --git a/engine/include/GearSrc/TypeDefs.h b/engine/include/GearSrc/TypeDefs.h index 8355c05..cd035c8 100644 --- a/engine/include/GearSrc/TypeDefs.h +++ b/engine/include/GearSrc/TypeDefs.h @@ -114,6 +114,8 @@ struct _GSClient { GLuint font; int font_width; int font_height; + int glyph_width; + int glyph_height; GSVector3 look_at; GSVector3 camera; GSVector4 light0; diff --git a/engine/resource/font/8x16.bdf b/engine/resource/font/7x14.bdf similarity index 53% rename from engine/resource/font/8x16.bdf rename to engine/resource/font/7x14.bdf index 209d408..12e5a79 100644 --- a/engine/resource/font/8x16.bdf +++ b/engine/resource/font/7x14.bdf @@ -1,286 +1,80 @@ STARTFONT 2.1 -COMMENT -COMMENT Copyright 1989 by Sony Corp. -COMMENT -COMMENT Permission to use, copy, modify, and distribute this software and -COMMENT its documentation for any purpose and without fee is hereby granted, -COMMENT provided that the above copyright notices appear in all copies and -COMMENT that both those copyright notices and this permission notice appear -COMMENT in supporting documentation, and that the name of Sony Corp. -COMMENT not be used in advertising or publicity pertaining to distribution -COMMENT of the software without specific, written prior permission. Sony -COMMENT Corp. makes no representations about the suitability of this -COMMENT software for any purpose. It is provided "as is" without express or -COMMENT implied warranty. -COMMENT -COMMENT SONY DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -COMMENT SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -COMMENT FITNESS, IN NO EVENT SHALL SONY BE LIABLE FOR ANY -COMMENT SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER -COMMENT RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF -COMMENT CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -COMMENT CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -COMMENT -FONT -Sony-Fixed-Medium-R-Normal--16-120-100-100-C-80-ISO8859-1 -SIZE 16 100 100 -FONTBOUNDINGBOX 8 16 0 -2 +COMMENT +COMMENT Donated by H. Kagotani ; public domain +COMMENT font from Japan +COMMENT +FONT -Misc-Fixed-Medium-R-Normal--14-130-75-75-C-70-ISO8859-1 +SIZE 7 75 75 +FONTBOUNDINGBOX 7 14 0 -2 STARTPROPERTIES 19 FONTNAME_REGISTRY "" -FOUNDRY "Sony" +FOUNDRY "Misc" FAMILY_NAME "Fixed" WEIGHT_NAME "Medium" SLANT "R" SETWIDTH_NAME "Normal" ADD_STYLE_NAME "" -PIXEL_SIZE 16 -POINT_SIZE 120 -RESOLUTION_X 100 -RESOLUTION_Y 100 +PIXEL_SIZE 14 +POINT_SIZE 130 +RESOLUTION_X 75 +RESOLUTION_Y 75 SPACING "C" -AVERAGE_WIDTH 80 +AVERAGE_WIDTH 70 CHARSET_REGISTRY "ISO8859" CHARSET_ENCODING "1" DEFAULT_CHAR 32 FONT_DESCENT 2 -FONT_ASCENT 14 -COPYRIGHT "Copyright (c) 1987, 1988 Sony Corp." +FONT_ASCENT 12 +COPYRIGHT "Public domain font. Share and enjoy." ENDPROPERTIES -CHARS 221 -STARTCHAR C001 +CHARS 209 +STARTCHAR 0001 ENCODING 1 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -10 -10 -38 -38 -7c -7c -fe -fe -7c -7c -38 -38 -10 -10 +00 +00 +18 +18 +3c +3c +7e +7e +3c +3c +18 +18 00 00 ENDCHAR -STARTCHAR C002 +STARTCHAR 0002 ENCODING 2 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -92 -92 -44 -44 -92 -92 -44 -44 -92 -92 -44 -44 -92 -92 -00 -00 +54 +aa +54 +aa +54 +aa +54 +aa +54 +aa +54 +aa +54 +aa ENDCHAR -STARTCHAR C003 -ENCODING 3 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -88 -88 -88 -f8 -88 -88 -88 -00 -3e -08 -08 -08 -08 -08 -08 -ENDCHAR -STARTCHAR C004 -ENCODING 4 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -f8 -80 -80 -f0 -80 -80 -80 -3e -20 -20 -3c -20 -20 -20 -00 -ENDCHAR -STARTCHAR C005 -ENCODING 5 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -70 -88 -80 -80 -80 -88 -70 -00 -3c -22 -22 -3c -28 -24 -22 -ENDCHAR -STARTCHAR C006 -ENCODING 6 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -80 -80 -80 -80 -80 -80 -f8 -00 -3e -20 -20 -3c -20 -20 -20 -ENDCHAR -STARTCHAR C007 -ENCODING 7 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -38 -44 -44 -44 -38 -00 -00 -00 -00 -00 -00 -00 -00 -00 -ENDCHAR -STARTCHAR C010 -ENCODING 8 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -10 -10 -10 -10 -fe -10 -10 -10 -10 -00 -fe -00 -00 -00 -ENDCHAR -STARTCHAR C011 -ENCODING 9 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -84 -c4 -a4 -a4 -94 -94 -8c -84 -20 -20 -20 -20 -20 -20 -3e -ENDCHAR -STARTCHAR C012 -ENCODING 10 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -88 -88 -88 -50 -50 -20 -00 -3e -08 -08 -08 -08 -08 -00 -ENDCHAR -STARTCHAR C013 +STARTCHAR 000b ENCODING 11 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 10 10 @@ -289,7 +83,6 @@ BITMAP 10 10 10 -10 f0 00 00 @@ -297,13 +90,12 @@ f0 00 00 00 -00 ENDCHAR -STARTCHAR C014 +STARTCHAR 000c ENCODING 12 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -312,7 +104,6 @@ BITMAP 00 00 00 -00 f0 10 10 @@ -320,13 +111,12 @@ f0 10 10 10 -10 ENDCHAR -STARTCHAR C015 +STARTCHAR 000d ENCODING 13 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -335,9 +125,7 @@ BITMAP 00 00 00 -00 -1f -10 +1e 10 10 10 @@ -345,11 +133,11 @@ BITMAP 10 10 ENDCHAR -STARTCHAR C016 +STARTCHAR 000e ENCODING 14 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 10 10 @@ -358,9 +146,7 @@ BITMAP 10 10 10 -10 -1f -00 +1e 00 00 00 @@ -368,11 +154,11 @@ BITMAP 00 00 ENDCHAR -STARTCHAR C017 +STARTCHAR 000f ENCODING 15 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 10 10 @@ -381,9 +167,7 @@ BITMAP 10 10 10 -10 -ff -10 +fe 10 10 10 @@ -391,15 +175,13 @@ ff 10 10 ENDCHAR -STARTCHAR C020 +STARTCHAR 0010 ENCODING 16 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -00 -00 -ff +fe 00 00 00 @@ -414,19 +196,17 @@ ff 00 00 ENDCHAR -STARTCHAR C021 +STARTCHAR 0011 ENCODING 17 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 00 -00 -ff -00 +fe 00 00 00 @@ -437,11 +217,11 @@ ff 00 00 ENDCHAR -STARTCHAR C022 +STARTCHAR 0012 ENCODING 18 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -450,9 +230,7 @@ BITMAP 00 00 00 -00 -ff -00 +fe 00 00 00 @@ -460,11 +238,11 @@ ff 00 00 ENDCHAR -STARTCHAR C023 +STARTCHAR 0013 ENCODING 19 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -475,19 +253,17 @@ BITMAP 00 00 00 -00 -00 -ff +fe 00 00 00 00 ENDCHAR -STARTCHAR C024 +STARTCHAR 0014 ENCODING 20 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -502,15 +278,13 @@ BITMAP 00 00 00 -00 -ff -00 +fe ENDCHAR -STARTCHAR C025 +STARTCHAR 0015 ENCODING 21 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 10 10 @@ -519,9 +293,7 @@ BITMAP 10 10 10 -10 -1f -10 +1e 10 10 10 @@ -529,11 +301,11 @@ BITMAP 10 10 ENDCHAR -STARTCHAR C026 +STARTCHAR 0016 ENCODING 22 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 10 10 @@ -542,7 +314,6 @@ BITMAP 10 10 10 -10 f0 10 10 @@ -550,13 +321,12 @@ f0 10 10 10 -10 ENDCHAR -STARTCHAR C027 +STARTCHAR 0017 ENCODING 23 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 10 10 @@ -565,9 +335,7 @@ BITMAP 10 10 10 -10 -ff -00 +fe 00 00 00 @@ -575,11 +343,11 @@ ff 00 00 ENDCHAR -STARTCHAR C030 +STARTCHAR 0018 ENCODING 24 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -588,9 +356,7 @@ BITMAP 00 00 00 -00 -ff -10 +fe 10 10 10 @@ -598,11 +364,11 @@ ff 10 10 ENDCHAR -STARTCHAR C031 +STARTCHAR 0019 ENCODING 25 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 10 10 @@ -618,152 +384,12 @@ BITMAP 10 10 10 -10 -10 ENDCHAR -STARTCHAR C032 -ENCODING 26 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -00 -00 -02 -0c -30 -c0 -30 -0c -02 -fe -00 -fe -00 -00 -ENDCHAR -STARTCHAR C033 -ENCODING 27 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -00 -00 -80 -60 -18 -06 -18 -60 -80 -fe -00 -fe -00 -00 -ENDCHAR -STARTCHAR C034 -ENCODING 28 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -00 -00 -00 -00 -00 -fe -24 -24 -24 -24 -44 -84 -00 -00 -ENDCHAR -STARTCHAR C035 -ENCODING 29 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -00 -00 -02 -04 -08 -fe -10 -fe -20 -40 -80 -00 -00 -00 -ENDCHAR -STARTCHAR C036 -ENCODING 30 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -00 -00 -0c -12 -10 -10 -10 -7c -10 -10 -3c -52 -20 -00 -ENDCHAR -STARTCHAR C037 -ENCODING 31 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -00 -00 -00 -00 -00 -00 -10 -00 -00 -00 -00 -00 -00 -00 -ENDCHAR -STARTCHAR C040 +STARTCHAR 0020 ENCODING 32 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -779,39 +405,35 @@ BITMAP 00 00 00 -00 -00 ENDCHAR -STARTCHAR ! +STARTCHAR 0021 ENCODING 33 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -38 -38 -38 -38 -38 -38 +00 +10 +10 +10 10 10 10 10 00 +10 +10 +00 00 -10 -38 -10 ENDCHAR -STARTCHAR " +STARTCHAR 0022 ENCODING 34 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -6c +00 6c 24 24 @@ -825,114 +447,102 @@ BITMAP 00 00 00 -00 -00 ENDCHAR -STARTCHAR # +STARTCHAR 0023 ENCODING 35 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -12 -12 -12 -7f -24 -24 -24 -24 -24 -fe -48 -48 -48 -48 +00 +0a +0a +0a +7e +14 +14 +7e +28 +28 +28 +00 00 ENDCHAR -STARTCHAR $ +STARTCHAR 0024 ENCODING 36 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -10 -38 -54 -92 -96 -90 -50 -38 -14 -12 -d2 -92 -94 -78 -10 -10 +00 +00 +08 +3c +4a +4a +28 +1c +0a +4a +4a +3c +08 +00 ENDCHAR -STARTCHAR % +STARTCHAR 0025 ENCODING 37 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -02 -62 -94 -94 -94 -98 -68 +00 +00 +32 +4a +4c +38 +08 10 -10 -2c +1c 32 52 -52 -52 -8c -80 +4c +00 +00 ENDCHAR -STARTCHAR & +STARTCHAR 0026 ENCODING 38 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -30 -48 -48 -48 -50 -20 -2e -54 -54 -94 -88 -8c -72 +00 +18 +24 +24 +24 +18 +32 +4a +44 +4c +32 00 00 ENDCHAR -STARTCHAR ' +STARTCHAR 0027 ENCODING 39 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -e0 -e0 -20 -20 -c0 -00 00 +18 +08 +08 +10 00 00 00 @@ -943,12 +553,13 @@ c0 00 00 ENDCHAR -STARTCHAR ( +STARTCHAR 0028 ENCODING 40 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP +00 02 04 08 @@ -958,88 +569,79 @@ BITMAP 10 10 10 -10 -10 -10 08 08 04 02 ENDCHAR -STARTCHAR ) +STARTCHAR 0029 ENCODING 41 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -80 +00 40 20 -20 10 10 +08 +08 +08 +08 +08 10 10 -10 -10 -10 -10 -20 20 40 -80 ENDCHAR -STARTCHAR * +STARTCHAR 002a ENCODING 42 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 +08 +2a +1c +08 +1c +2a +08 00 -10 -38 -92 -d6 -38 -d6 -92 -38 -10 00 00 00 00 ENDCHAR -STARTCHAR + +STARTCHAR 002b ENCODING 43 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 -10 -10 -10 -10 -fe -10 -10 -10 -10 00 +10 +10 +10 +7c +10 +10 +10 00 00 00 ENDCHAR -STARTCHAR , +STARTCHAR 002c ENCODING 44 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -1051,18 +653,16 @@ BITMAP 00 00 00 -00 -e0 -e0 +30 +10 +10 20 -20 -c0 ENDCHAR -STARTCHAR - +STARTCHAR 002d ENCODING 45 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -1071,9 +671,7 @@ BITMAP 00 00 00 -fe -00 -00 +7e 00 00 00 @@ -1081,11 +679,11 @@ fe 00 00 ENDCHAR -STARTCHAR . +STARTCHAR 002e ENCODING 46 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -1097,19 +695,18 @@ BITMAP 00 00 00 -00 -40 -e0 -e0 -40 +08 +1c +08 00 ENDCHAR -STARTCHAR / +STARTCHAR 002f ENCODING 47 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP +00 02 02 04 @@ -1119,1084 +716,987 @@ BITMAP 08 10 10 -10 20 20 40 40 -80 -80 ENDCHAR -STARTCHAR 0 +STARTCHAR 0030 ENCODING 48 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 +00 18 24 -24 42 42 42 42 42 42 -42 -42 -24 24 18 00 +00 ENDCHAR -STARTCHAR 1 +STARTCHAR 0031 ENCODING 49 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 +00 +08 +18 +28 +08 +08 +08 +08 +08 +08 +3e +00 +00 +ENDCHAR +STARTCHAR 0032 +ENCODING 50 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +3c +42 +42 +02 +04 +04 +08 10 -70 -10 -10 -10 -10 -10 +20 +7e +00 +00 +ENDCHAR +STARTCHAR 0033 +ENCODING 51 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +3c +42 +42 +02 +1c +02 +02 +42 +42 +3c +00 +00 +ENDCHAR +STARTCHAR 0034 +ENCODING 52 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +04 +0c +14 +14 +24 +24 +44 +7e +04 +04 +00 +00 +ENDCHAR +STARTCHAR 0035 +ENCODING 53 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +7e +40 +40 +7c +42 +02 +02 +42 +42 +3c +00 +00 +ENDCHAR +STARTCHAR 0036 +ENCODING 54 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +1c +22 +42 +40 +5c +62 +42 +42 +42 +3c +00 +00 +ENDCHAR +STARTCHAR 0037 +ENCODING 55 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +7e +42 +44 +04 +08 +08 +08 +08 +08 +08 +00 +00 +ENDCHAR +STARTCHAR 0038 +ENCODING 56 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +3c +42 +42 +24 +18 +24 +42 +42 +42 +3c +00 +00 +ENDCHAR +STARTCHAR 0039 +ENCODING 57 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +3c +42 +42 +42 +46 +3a +02 +42 +44 +38 +00 +00 +ENDCHAR +STARTCHAR 003a +ENCODING 58 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +00 +00 +08 +1c +08 +00 +00 +08 +1c +08 +00 +00 +ENDCHAR +STARTCHAR 003b +ENCODING 59 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +00 +00 +00 +18 +18 +00 +00 +18 +08 +08 10 +00 +ENDCHAR +STARTCHAR 003c +ENCODING 60 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +00 +04 +08 10 +20 +40 +20 10 +08 +04 +00 +00 +ENDCHAR +STARTCHAR 003d +ENCODING 61 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +00 +00 +00 +7e +00 +00 +7e +00 +00 +00 +00 +00 +ENDCHAR +STARTCHAR 003e +ENCODING 62 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +00 +40 +20 10 +08 +04 +08 10 +20 +40 +00 +00 +ENDCHAR +STARTCHAR 003f +ENCODING 63 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +3c +42 +42 +04 +08 +08 +08 +00 +08 +08 +00 +00 +ENDCHAR +STARTCHAR 0040 +ENCODING 64 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +1c +22 +4e +52 +52 +52 +52 +4e +20 +1e +00 +00 +ENDCHAR +STARTCHAR 0041 +ENCODING 65 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +18 +24 +42 +42 +42 +7e +42 +42 +42 +42 +00 +00 +ENDCHAR +STARTCHAR 0042 +ENCODING 66 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +7c +22 +22 +22 +3c +22 +22 +22 +22 7c 00 00 ENDCHAR -STARTCHAR 2 -ENCODING 50 +STARTCHAR 0043 +ENCODING 67 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +3c +42 +42 +40 +40 +40 +40 +42 +42 +3c +00 +00 +ENDCHAR +STARTCHAR 0044 +ENCODING 68 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +7c +22 +22 +22 +22 +22 +22 +22 +22 +7c +00 +00 +ENDCHAR +STARTCHAR 0045 +ENCODING 69 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +7e +40 +40 +40 +78 +40 +40 +40 +40 +7e +00 +00 +ENDCHAR +STARTCHAR 0046 +ENCODING 70 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +7e +40 +40 +40 +78 +40 +40 +40 +40 +40 +00 +00 +ENDCHAR +STARTCHAR 0047 +ENCODING 71 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +3c +42 +42 +40 +40 +4e +42 +42 +46 +3a +00 +00 +ENDCHAR +STARTCHAR 0048 +ENCODING 72 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +42 +42 +42 +42 +7e +42 +42 +42 +42 +42 +00 +00 +ENDCHAR +STARTCHAR 0049 +ENCODING 73 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +3e +08 +08 +08 +08 +08 +08 +08 +08 +3e +00 +00 +ENDCHAR +STARTCHAR 004a +ENCODING 74 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +0e +04 +04 +04 +04 +04 +04 +44 +44 +38 +00 +00 +ENDCHAR +STARTCHAR 004b +ENCODING 75 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +42 +44 +48 +50 +60 +50 +48 +44 +42 +42 +00 +00 +ENDCHAR +STARTCHAR 004c +ENCODING 76 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +40 +40 +40 +40 +40 +40 +40 +40 +40 +7e +00 +00 +ENDCHAR +STARTCHAR 004d +ENCODING 77 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +42 +66 +66 +5a +5a +42 +42 +42 +42 +42 +00 +00 +ENDCHAR +STARTCHAR 004e +ENCODING 78 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +42 +42 +62 +62 +52 +4a +46 +46 +42 +42 +00 +00 +ENDCHAR +STARTCHAR 004f +ENCODING 79 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +3c +42 +42 +42 +42 +42 +42 +42 +42 +3c +00 +00 +ENDCHAR +STARTCHAR 0050 +ENCODING 80 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +7c +42 +42 +42 +42 +7c +40 +40 +40 +40 +00 +00 +ENDCHAR +STARTCHAR 0051 +ENCODING 81 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +3c +42 +42 +42 +42 +42 +72 +4a +46 +3c +04 +02 +ENDCHAR +STARTCHAR 0052 +ENCODING 82 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +7c +42 +42 +42 +42 +7c +48 +44 +42 +42 +00 +00 +ENDCHAR +STARTCHAR 0053 +ENCODING 83 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +3c +42 +42 +40 +30 +0c +02 +42 +42 +3c +00 +00 +ENDCHAR +STARTCHAR 0054 +ENCODING 84 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +fe +10 +10 +10 +10 +10 +10 +10 +10 +10 +00 +00 +ENDCHAR +STARTCHAR 0055 +ENCODING 85 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +42 +42 +42 +42 +42 +42 +42 +42 +42 +3c +00 +00 +ENDCHAR +STARTCHAR 0056 +ENCODING 86 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +42 +42 +42 +42 +24 +24 +24 +18 +18 +18 +00 +00 +ENDCHAR +STARTCHAR 0057 +ENCODING 87 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +42 +42 +42 +42 +42 +5a +5a +66 +66 +42 +00 +00 +ENDCHAR +STARTCHAR 0058 +ENCODING 88 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +42 +42 +24 +24 +18 +18 +24 +24 +42 +42 +00 +00 +ENDCHAR +STARTCHAR 0059 +ENCODING 89 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +44 +44 +44 +28 +28 +10 +10 +10 +10 +10 +00 +00 +ENDCHAR +STARTCHAR 005a +ENCODING 90 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +7e +02 +04 +08 +08 +10 +20 +20 +40 +7e +00 +00 +ENDCHAR +STARTCHAR 005b +ENCODING 91 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +1e +10 +10 +10 +10 +10 +10 +10 +10 +10 +10 +10 +1e +ENDCHAR +STARTCHAR 005c +ENCODING 92 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +40 +40 +20 +20 +10 +10 +10 +08 +08 +04 +04 +02 +02 +ENDCHAR +STARTCHAR 005d +ENCODING 93 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +78 +08 +08 +08 +08 +08 +08 +08 +08 +08 +08 +08 +78 +ENDCHAR +STARTCHAR 005e +ENCODING 94 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 18 24 42 -62 -02 -04 -08 -08 -10 -20 -22 -42 -7e -00 -00 -ENDCHAR -STARTCHAR 3 -ENCODING 51 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -38 -44 -82 -82 -02 -04 -38 -04 -02 -82 -82 -44 -38 -00 -00 -ENDCHAR -STARTCHAR 4 -ENCODING 52 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -08 -18 -28 -28 -48 -48 -88 -88 -fe -08 -08 -08 -3c -00 -00 -ENDCHAR -STARTCHAR 5 -ENCODING 53 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -fc -80 -80 -80 -b8 -c4 -82 -02 -02 -c2 -82 -44 -38 -00 -00 -ENDCHAR -STARTCHAR 6 -ENCODING 54 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -3c -42 -46 -80 -80 -b8 -c4 -82 -82 -82 -82 -44 -38 -00 -00 -ENDCHAR -STARTCHAR 7 -ENCODING 55 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -fe -82 -82 -04 -04 -04 -08 -08 -08 -08 -10 -10 -10 -10 -00 -ENDCHAR -STARTCHAR 8 -ENCODING 56 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -38 -44 -82 -82 -82 -44 -38 -44 -82 -82 -82 -44 -38 -00 -00 -ENDCHAR -STARTCHAR 9 -ENCODING 57 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -38 -44 -82 -82 -82 -82 -46 -3a -02 -02 -82 -44 -38 -00 -00 -ENDCHAR -STARTCHAR : -ENCODING 58 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -00 -00 -00 -38 -38 -00 -00 -00 -00 -00 -38 -38 -00 -00 -ENDCHAR -STARTCHAR ; -ENCODING 59 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -00 -00 -00 -38 -38 -00 -00 -00 -00 -38 -38 -18 -10 -30 -ENDCHAR -STARTCHAR < -ENCODING 60 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -02 -04 -04 -08 -08 -10 -10 -20 -20 -10 -10 -08 -08 -04 -04 -02 -ENDCHAR -STARTCHAR = -ENCODING 61 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -00 -00 -00 -fe -00 -00 -00 -fe -00 -00 -00 -00 -00 -00 -ENDCHAR -STARTCHAR > -ENCODING 62 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -80 -40 -40 -20 -20 -10 -10 -08 -08 -10 -10 -20 -20 -40 -40 -80 -ENDCHAR -STARTCHAR ? -ENCODING 63 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -38 -44 -82 -c2 -02 -04 -04 -08 -10 -10 -00 -00 -10 -38 -10 -ENDCHAR -STARTCHAR @ -ENCODING 64 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -3c -42 -82 -9a -a6 -a2 -a2 -a2 -a6 -9a -80 -42 -3c -00 -00 -ENDCHAR -STARTCHAR A -ENCODING 65 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -10 -28 -28 -28 -44 -44 -44 -44 -7c -82 -82 -82 -c6 -00 -00 -ENDCHAR -STARTCHAR B -ENCODING 66 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -f8 -44 -42 -42 -42 -44 -78 -44 -42 -42 -42 -42 -fc -00 -00 -ENDCHAR -STARTCHAR C -ENCODING 67 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -3a -46 -42 -80 -80 -80 -80 -80 -80 -82 -42 -42 -3c -00 -00 -ENDCHAR -STARTCHAR D -ENCODING 68 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -f8 -44 -44 -42 -42 -42 -42 -42 -42 -42 -44 -44 -f8 -00 -00 -ENDCHAR -STARTCHAR E -ENCODING 69 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -fe -42 -42 -40 -48 -48 -78 -48 -48 -42 -42 -42 -fe -00 -00 -ENDCHAR -STARTCHAR F -ENCODING 70 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -fe -42 -42 -40 -48 -48 -78 -48 -48 -40 -40 -40 -f0 -00 -00 -ENDCHAR -STARTCHAR G -ENCODING 71 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -1a -26 -42 -40 -80 -80 -8f -82 -82 -82 -42 -66 -1a -00 -00 -ENDCHAR -STARTCHAR H -ENCODING 72 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -e7 -42 -42 -42 -42 -7e -42 -42 -42 -42 -42 -42 -e7 -00 -00 -ENDCHAR -STARTCHAR I -ENCODING 73 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -fe -10 -10 -10 -10 -10 -10 -10 -10 -10 -10 -10 -fe -00 -00 -ENDCHAR -STARTCHAR J -ENCODING 74 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -1f -02 -02 -02 -02 -02 -02 -02 -82 -82 -82 -44 -38 -00 -00 -ENDCHAR -STARTCHAR K -ENCODING 75 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -e6 -44 -44 -48 -48 -70 -50 -48 -48 -44 -44 -42 -e3 -00 -00 -ENDCHAR -STARTCHAR L -ENCODING 76 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -f0 -40 -40 -40 -40 -40 -40 -40 -40 -42 -42 -42 -fe -00 -00 -ENDCHAR -STARTCHAR M -ENCODING 77 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -82 -c6 -aa -aa -aa -92 -92 -92 -82 -82 -82 -82 -c6 -00 -00 -ENDCHAR -STARTCHAR N -ENCODING 78 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -87 -c2 -a2 -a2 -a2 -92 -92 -92 -8a -8a -8a -86 -c2 -00 -00 -ENDCHAR -STARTCHAR O -ENCODING 79 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -38 -44 -82 -82 -82 -82 -82 -82 -82 -82 -82 -44 -38 -00 -00 -ENDCHAR -STARTCHAR P -ENCODING 80 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -f8 -44 -42 -42 -42 -42 -44 -78 -40 -40 -40 -40 -f0 -00 -00 -ENDCHAR -STARTCHAR Q -ENCODING 81 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -38 -44 -44 -82 -82 -82 -82 -82 -82 -ba -44 -44 -38 -08 -06 -ENDCHAR -STARTCHAR R -ENCODING 82 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -f8 -44 -42 -42 -42 -44 -78 -48 -44 -44 -44 -42 -e3 -00 -00 -ENDCHAR -STARTCHAR S -ENCODING 83 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -34 -4c -84 -80 -80 -60 -18 -04 -82 -82 -82 -c4 -b8 -00 -00 -ENDCHAR -STARTCHAR T -ENCODING 84 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -fe -92 -92 -10 -10 -10 -10 -10 -10 -10 -10 -10 -7c -00 -00 -ENDCHAR -STARTCHAR U -ENCODING 85 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -e7 -42 -42 -42 -42 -42 -42 -42 -42 -42 -42 -42 -3c -00 -00 -ENDCHAR -STARTCHAR V -ENCODING 86 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -c6 -82 -82 -82 -82 -44 -44 -44 -44 -28 -28 -10 -10 -00 -00 -ENDCHAR -STARTCHAR W -ENCODING 87 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -c6 -82 -82 -82 -92 -92 -92 -aa -aa -aa -44 -44 -44 -00 -00 -ENDCHAR -STARTCHAR X -ENCODING 88 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -ee -44 -44 -28 -28 -10 -28 -28 -28 -44 -44 -82 -c6 -00 -00 -ENDCHAR -STARTCHAR Y -ENCODING 89 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -c6 -82 -44 -44 -44 -28 -28 -10 -10 -10 -10 -10 -7c -00 -00 -ENDCHAR -STARTCHAR Z -ENCODING 90 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -fe -84 -88 -08 -10 -10 -10 -20 -20 -42 -42 -82 -fe -00 -00 -ENDCHAR -STARTCHAR [ -ENCODING 91 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -1e -10 -10 -10 -10 -10 -10 -10 -10 -10 -10 -10 -10 -10 -10 -1e -ENDCHAR -STARTCHAR \ -ENCODING 92 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -80 -80 -40 -40 -20 -20 -10 -10 -08 -08 -04 -04 -02 -02 -00 -ENDCHAR -STARTCHAR ] -ENCODING 93 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -f0 -10 -10 -10 -10 -10 -10 -10 -10 -10 -10 -10 -10 -10 -10 -f0 -ENDCHAR -STARTCHAR ^ -ENCODING 94 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -10 -28 -44 -82 -00 -00 00 00 00 @@ -2208,11 +1708,11 @@ BITMAP 00 00 ENDCHAR -STARTCHAR _ +STARTCHAR 005f ENCODING 95 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -2227,23 +1727,19 @@ BITMAP 00 00 00 -00 -00 -fe +7e ENDCHAR -STARTCHAR ` +STARTCHAR 0060 ENCODING 96 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -30 -30 -20 -20 -10 -00 00 +0c +08 +08 +04 00 00 00 @@ -2254,11 +1750,11 @@ BITMAP 00 00 ENDCHAR -STARTCHAR a +STARTCHAR 0061 ENCODING 97 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -2267,44 +1763,124 @@ BITMAP 00 3c 42 -02 -3e +0e +32 42 -82 -82 -86 -7b +46 +3a 00 00 ENDCHAR -STARTCHAR b +STARTCHAR 0062 ENCODING 98 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -c0 +00 40 40 40 -78 -44 +5c +62 42 42 42 -42 -42 -44 -78 +62 +5c 00 00 ENDCHAR -STARTCHAR c +STARTCHAR 0063 ENCODING 99 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +00 +00 +00 +3c +42 +40 +40 +40 +42 +3c +00 +00 +ENDCHAR +STARTCHAR 0064 +ENCODING 100 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +02 +02 +02 +3a +46 +42 +42 +42 +46 +3a +00 +00 +ENDCHAR +STARTCHAR 0065 +ENCODING 101 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +00 +00 +00 +3c +42 +42 +7e +40 +42 +3c +00 +00 +ENDCHAR +STARTCHAR 0066 +ENCODING 102 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +0c +12 +10 +10 +7c +10 +10 +10 +10 +10 +00 +00 +ENDCHAR +STARTCHAR 0067 +ENCODING 103 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -2312,117 +1888,23 @@ BITMAP 00 00 3a -46 -82 -80 -80 -80 -82 -42 -3c -00 -00 -ENDCHAR -STARTCHAR d -ENCODING 100 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -06 -04 -04 -04 -3c -44 -84 -84 -84 -84 -84 -44 -3e -00 -00 -ENDCHAR -STARTCHAR e -ENCODING 101 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -00 -00 -00 -38 -44 -82 -fe -80 -80 -82 -42 -3c -00 -00 -ENDCHAR -STARTCHAR f -ENCODING 102 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -0e -11 -10 -10 -fe -10 -10 -10 -10 -10 -10 -10 -7c -00 -00 -ENDCHAR -STARTCHAR g -ENCODING 103 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -00 -00 -00 -3b 44 44 44 38 -40 -78 -84 -82 -82 -7c +20 +5c +42 +3c ENDCHAR -STARTCHAR h +STARTCHAR 0068 ENCODING 104 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -c0 +00 40 40 40 @@ -2433,88 +1915,81 @@ c0 42 42 42 -42 -e7 00 00 ENDCHAR -STARTCHAR i +STARTCHAR 0069 ENCODING 105 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP +00 +00 +08 +08 +00 18 -18 -00 -00 -00 -78 08 08 08 08 08 -08 -08 -ff +3e 00 00 ENDCHAR -STARTCHAR j +STARTCHAR 006a ENCODING 106 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -06 -06 00 00 +04 +04 00 -3e -02 -02 -02 -02 -02 -02 -82 -82 +0c +04 +04 +04 +04 +04 +44 44 38 ENDCHAR -STARTCHAR k +STARTCHAR 006b ENCODING 107 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -c0 +00 40 40 40 -42 44 48 -58 -64 +50 +70 +48 44 42 -42 -e3 00 00 ENDCHAR -STARTCHAR l +STARTCHAR 006c ENCODING 108 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -78 +00 +18 08 08 08 @@ -2523,156 +1998,99 @@ BITMAP 08 08 08 -08 -08 -08 -ff +3e 00 00 ENDCHAR -STARTCHAR m +STARTCHAR 006d ENCODING 109 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 00 00 -6c -92 -92 -92 -92 -92 -92 -92 -db +68 +54 +54 +54 +54 +54 +44 00 00 ENDCHAR -STARTCHAR n +STARTCHAR 006e ENCODING 110 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 00 00 -dc +5c 62 42 42 42 42 42 -42 -e7 00 00 ENDCHAR -STARTCHAR o +STARTCHAR 006f ENCODING 111 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 00 00 -38 -44 -82 -82 -82 -82 -82 -44 -38 +3c +42 +42 +42 +42 +42 +3c 00 00 ENDCHAR -STARTCHAR p +STARTCHAR 0070 ENCODING 112 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 00 00 -f8 -44 +5c +62 42 42 42 -42 -44 -78 +62 +5c 40 40 -f0 ENDCHAR -STARTCHAR q +STARTCHAR 0071 ENCODING 113 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -00 -00 -00 -3e -44 -84 -84 -84 -84 -44 -3c -04 -04 -1e -ENDCHAR -STARTCHAR r -ENCODING 114 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -00 -00 -00 -ec -32 -22 -20 -20 -20 -20 -20 -fc -00 -00 -ENDCHAR -STARTCHAR s -ENCODING 115 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -2682,158 +2100,186 @@ BITMAP 3a 46 42 -40 -3c +42 +42 +46 +3a 02 -82 -c2 -bc +02 +ENDCHAR +STARTCHAR 0072 +ENCODING 114 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +00 +00 +00 +5c +62 +42 +40 +40 +40 +40 00 00 ENDCHAR -STARTCHAR t +STARTCHAR 0073 +ENCODING 115 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +00 +00 +00 +3c +42 +20 +18 +04 +42 +3c +00 +00 +ENDCHAR +STARTCHAR 0074 ENCODING 116 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 -20 -20 -20 -fc -20 -20 -20 -20 -20 -22 -22 -1c +10 +10 +10 +7c +10 +10 +10 +10 +12 +0c 00 00 ENDCHAR -STARTCHAR u +STARTCHAR 0075 ENCODING 117 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 00 00 -c6 -42 42 42 42 42 42 46 -39 +3a 00 00 ENDCHAR -STARTCHAR v +STARTCHAR 0076 ENCODING 118 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 00 00 -c6 -82 -82 44 44 44 28 28 10 +10 00 00 ENDCHAR -STARTCHAR w +STARTCHAR 0077 ENCODING 119 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 00 00 -92 -92 -92 -92 -aa -aa -44 44 44 +54 +54 +54 +54 +28 00 00 ENDCHAR -STARTCHAR x +STARTCHAR 0078 ENCODING 120 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 00 00 -ee -44 -28 -28 -10 -28 -28 -44 -ee +42 +42 +24 +18 +24 +42 +42 00 00 ENDCHAR -STARTCHAR y +STARTCHAR 0079 ENCODING 121 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 00 00 -e7 42 -22 -24 -14 -08 -08 -10 -90 -a0 -40 +42 +42 +42 +46 +3a +02 +42 +3c ENDCHAR -STARTCHAR z +STARTCHAR 007a ENCODING 122 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -2841,23 +2287,22 @@ BITMAP 00 00 7e -44 -08 +04 08 10 10 -22 -42 -fe +20 +7e 00 00 ENDCHAR -STARTCHAR { +STARTCHAR 007b ENCODING 123 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP +00 06 08 08 @@ -2865,9 +2310,6 @@ BITMAP 08 08 10 -20 -10 -08 08 08 08 @@ -2875,15 +2317,13 @@ BITMAP 08 06 ENDCHAR -STARTCHAR | +STARTCHAR 007c ENCODING 124 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -10 -10 -10 +00 10 10 10 @@ -2898,38 +2338,55 @@ BITMAP 10 10 ENDCHAR -STARTCHAR } +STARTCHAR 007d ENCODING 125 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -c0 -20 -20 -20 -20 -20 +00 +60 +10 +10 +10 +10 10 08 10 -20 -20 -20 -20 -20 -20 -c0 +10 +10 +10 +10 +60 ENDCHAR -STARTCHAR ~ +STARTCHAR 007e ENCODING 126 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -60 -92 -0c +00 +20 +52 +4a +04 +00 +00 +00 +00 +00 +00 +00 +00 +00 +ENDCHAR +STARTCHAR 007f +ENCODING 127 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 00 00 00 @@ -2944,86 +2401,100 @@ BITMAP 00 00 ENDCHAR -STARTCHAR C241 +STARTCHAR 00a0 +ENCODING 160 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +ENDCHAR +STARTCHAR 00a1 ENCODING 161 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -10 -38 -10 00 +10 +10 00 10 10 10 10 -38 -38 -38 -38 -38 -38 +10 +10 +10 +00 +00 ENDCHAR -STARTCHAR C242 +STARTCHAR 00a2 ENCODING 162 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 +00 +00 10 -3c +3e 52 -92 -90 -90 -90 -90 -90 -92 +50 +50 +50 52 -3c +3e 10 00 ENDCHAR -STARTCHAR C243 +STARTCHAR 00a3 ENCODING 163 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 -00 -0c -12 -10 -10 -10 -7c -10 -10 -3c -52 +18 +24 20 +20 +78 +20 +20 +78 +24 +00 00 ENDCHAR -STARTCHAR C244 +STARTCHAR 00a4 ENCODING 164 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 00 -00 42 3c 24 @@ -3034,47 +2505,42 @@ BITMAP 00 00 00 -00 ENDCHAR -STARTCHAR C245 +STARTCHAR 00a5 ENCODING 165 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -82 -82 -44 -44 -fe -28 -10 -fe -10 -10 -10 -10 -10 -38 +00 +00 +42 +24 +18 +7e +08 +08 +7e +08 +08 +08 00 00 ENDCHAR -STARTCHAR C246 +STARTCHAR 00a6 ENCODING 166 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -10 +00 10 10 10 10 00 00 -00 -10 10 10 10 @@ -3082,40 +2548,36 @@ BITMAP 00 00 ENDCHAR -STARTCHAR C247 +STARTCHAR 00a7 ENCODING 167 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 3c 42 -40 20 -3c +18 +24 42 -42 -42 -3c +24 +18 04 -02 42 3c 00 00 ENDCHAR -STARTCHAR C250 +STARTCHAR 00a8 ENCODING 168 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -24 -24 -24 -00 +48 +48 00 00 00 @@ -3128,34 +2590,32 @@ BITMAP 00 00 ENDCHAR -STARTCHAR C251 +STARTCHAR 00a9 ENCODING 169 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 3c 42 -99 -a5 -c3 -c1 -c1 -c1 -c3 -a5 -99 +5a +66 +62 +62 +62 +66 +5a 42 3c 00 00 ENDCHAR -STARTCHAR C252 +STARTCHAR 00aa ENCODING 170 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 1c @@ -3171,37 +2631,33 @@ BITMAP 00 00 00 -00 -00 ENDCHAR -STARTCHAR C253 +STARTCHAR 00ab ENCODING 171 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 -09 -12 -24 -48 -90 -90 -48 -24 -12 -09 00 00 +0a +14 +28 +50 +28 +14 +0a +00 00 ENDCHAR -STARTCHAR C254 +STARTCHAR 00ac ENCODING 172 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -3210,21 +2666,19 @@ BITMAP 00 00 00 -fe -fe -06 -06 -00 -00 00 +f8 +08 +08 +08 00 00 ENDCHAR -STARTCHAR C255 +STARTCHAR 00ad ENCODING 173 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -3233,50 +2687,44 @@ BITMAP 00 00 00 -fe -fe -00 00 +f0 00 00 00 00 00 ENDCHAR -STARTCHAR C256 +STARTCHAR 00ae ENCODING 174 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 3c 42 -81 -f9 -c5 -c5 -f9 -c5 -c5 -c5 -81 +7a +66 +66 +7a +66 +66 +66 42 3c 00 00 ENDCHAR -STARTCHAR C257 +STARTCHAR 00af ENCODING 175 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 -fe -00 -00 +f0 00 00 00 @@ -3289,107 +2737,16 @@ fe 00 00 ENDCHAR -STARTCHAR C260 +STARTCHAR 00b0 ENCODING 176 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -38 -44 -44 -44 -38 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -ENDCHAR -STARTCHAR C261 -ENCODING 177 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -00 -00 -10 -10 -10 -fe -10 -10 -10 -00 -fe -00 -00 -00 -ENDCHAR -STARTCHAR C262 -ENCODING 178 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -18 -24 -04 -08 -10 -20 -3c -00 -00 -00 -00 -00 -00 -00 -00 -ENDCHAR -STARTCHAR C263 -ENCODING 179 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -18 -24 -04 -18 -04 -24 -18 -00 -00 -00 -00 -00 -00 -00 -00 -ENDCHAR -STARTCHAR C264 -ENCODING 180 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -0c -18 +30 +48 +48 30 00 00 @@ -3400,15 +2757,12 @@ BITMAP 00 00 00 -00 -00 -00 ENDCHAR -STARTCHAR C265 -ENCODING 181 +STARTCHAR 00b1 +ENCODING 177 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -3416,45 +2770,125 @@ BITMAP 00 00 00 +10 +10 +7c +10 +10 +7c 00 -22 -22 -22 +00 +ENDCHAR +STARTCHAR 00b2 +ENCODING 178 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +30 +48 +08 +10 +20 +40 +78 +00 +00 +00 +00 +00 +00 +ENDCHAR +STARTCHAR 00b3 +ENCODING 179 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +30 +48 +08 +30 +08 +48 +30 +00 +00 +00 +00 +00 +00 +ENDCHAR +STARTCHAR 00b4 +ENCODING 180 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +08 +10 +20 +40 +00 +00 +00 +00 +00 +00 +00 +00 +00 +ENDCHAR +STARTCHAR 00b5 +ENCODING 181 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +00 +00 +00 +00 +44 +44 44 44 6c 54 -82 -80 +40 +40 ENDCHAR -STARTCHAR C266 +STARTCHAR 00b6 ENCODING 182 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -7f -fa -fa -fa -fa -fa -7a -0a -0a -0a -0a -0a -1b -00 00 +3c +54 +54 +54 +54 +34 +14 +14 +14 +14 +14 +1c ENDCHAR -STARTCHAR C267 +STARTCHAR 00b7 ENCODING 183 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -3462,9 +2896,7 @@ BITMAP 00 00 00 -18 -18 -00 +10 00 00 00 @@ -3473,11 +2905,11 @@ BITMAP 00 00 ENDCHAR -STARTCHAR C270 +STARTCHAR 00b8 ENCODING 184 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 @@ -3490,28 +2922,24 @@ BITMAP 00 00 00 -00 -00 -0c -08 10 +10 +20 ENDCHAR -STARTCHAR C271 +STARTCHAR 00b9 ENCODING 185 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -08 -18 -28 -08 -08 -08 -08 -00 00 +20 +60 +20 +20 +20 +20 00 00 00 @@ -3519,18 +2947,17 @@ BITMAP 00 00 ENDCHAR -STARTCHAR C272 +STARTCHAR 00ba ENCODING 186 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 +00 18 24 24 -24 -24 18 00 3c @@ -3540,502 +2967,458 @@ BITMAP 00 00 00 -00 ENDCHAR -STARTCHAR C273 +STARTCHAR 00bb ENCODING 187 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 00 -90 -48 -24 -12 -09 -09 -12 -24 -48 -90 +00 +50 +28 +14 +0a +14 +28 +50 00 00 ENDCHAR -STARTCHAR C274 +STARTCHAR 00bc ENCODING 188 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -40 -c0 -40 -40 -41 -46 -08 -32 -c6 -0a +00 +20 +62 +24 +24 +28 12 -1f -02 +16 +2a +4e +42 00 00 ENDCHAR -STARTCHAR C275 +STARTCHAR 00bd ENCODING 189 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -40 -c0 -40 -40 -41 -46 -08 -36 -c9 -01 -06 -08 -0f +00 +20 +62 +24 +24 +28 +14 +1a +22 +44 +4e 00 00 ENDCHAR -STARTCHAR C276 +STARTCHAR 00be ENCODING 190 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -60 -90 -10 -60 -11 -96 -68 -32 -c6 -0a +00 +62 12 -1f +24 +18 +68 +12 +26 +2a +4e 02 00 00 ENDCHAR -STARTCHAR C277 +STARTCHAR 00bf ENCODING 191 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP +00 +00 +00 08 -1c 08 00 08 08 08 -10 -20 -20 -40 -43 -41 -22 -1c -00 +08 +04 +42 +42 +3c ENDCHAR -STARTCHAR C300 +STARTCHAR 00c0 ENCODING 192 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -30 -10 -08 -10 -28 -28 -44 -44 -44 -7c -82 -82 -82 -c6 +20 +18 +00 +18 +24 +42 +42 +7e +42 +42 +42 +42 00 00 ENDCHAR -STARTCHAR C301 +STARTCHAR 00c1 ENCODING 193 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP +04 18 -10 -20 -10 -28 -28 -44 -44 -44 -7c -82 -82 -82 -c6 +00 +18 +24 +42 +42 +7e +42 +42 +42 +42 00 00 ENDCHAR -STARTCHAR C302 +STARTCHAR 00c2 ENCODING 194 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -10 -28 -44 -10 -28 -28 -44 -44 -44 -7c -82 -82 -82 -c6 +18 +24 +00 +18 +24 +42 +42 +7e +42 +42 +42 +42 00 00 ENDCHAR -STARTCHAR C303 +STARTCHAR 00c3 ENCODING 195 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -24 -58 +14 +28 00 -10 -28 -28 -44 -44 -44 -7c -82 -82 -82 -c6 +18 +24 +42 +42 +7e +42 +42 +42 +42 00 00 ENDCHAR -STARTCHAR C304 +STARTCHAR 00c4 ENCODING 196 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -44 -44 +24 +24 00 -10 -28 -28 -44 -44 -44 -7c -82 -82 -82 -c6 +18 +24 +42 +42 +7e +42 +42 +42 +42 00 00 ENDCHAR -STARTCHAR C305 +STARTCHAR 00c5 ENCODING 197 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -38 -44 -38 -10 -28 -28 -44 -44 -44 -7c -82 -82 -82 -c6 +18 +18 +00 +18 +24 +42 +42 +7e +42 +42 +42 +42 00 00 ENDCHAR -STARTCHAR C306 +STARTCHAR 00c6 ENCODING 198 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 -1f -28 -28 -48 -48 -48 -4e -f8 -88 -88 -88 -8f +3e +50 +90 +90 +fc +90 +90 +90 +90 +9e 00 00 ENDCHAR -STARTCHAR C307 +STARTCHAR 00c7 ENCODING 199 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 +00 3c 42 +42 40 -80 -80 -80 -80 -80 -80 40 +40 +40 +42 42 3c 08 -08 10 ENDCHAR -STARTCHAR C310 +STARTCHAR 00c8 ENCODING 200 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -30 -10 -08 -fe -42 -42 +20 +18 +00 +7e 40 -48 -78 -48 40 -42 -42 -fe +40 +7c +40 +40 +40 +7e 00 00 ENDCHAR -STARTCHAR C311 +STARTCHAR 00c9 ENCODING 201 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP +04 18 -10 -20 -fe -42 -42 +00 +7e 40 -48 -78 -48 40 -42 -42 -fe +40 +7c +40 +40 +40 +7e 00 00 ENDCHAR -STARTCHAR C312 +STARTCHAR 00ca ENCODING 202 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -30 -48 -00 -fe -42 -42 -40 -48 -78 -48 -40 -42 -42 -fe -00 -00 -ENDCHAR -STARTCHAR C313 -ENCODING 203 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -44 -44 -00 -fe -42 -42 -40 -48 -78 -48 -40 -42 -42 -fe -00 -00 -ENDCHAR -STARTCHAR C314 -ENCODING 204 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -30 -10 -08 -fe -10 -10 -10 -10 -10 -10 -10 -10 -10 -fe -00 -00 -ENDCHAR -STARTCHAR C315 -ENCODING 205 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 18 -10 -20 -fe -10 -10 -10 -10 -10 -10 -10 -10 -10 -fe +24 +00 +7e +40 +40 +40 +7c +40 +40 +40 +7e 00 00 ENDCHAR -STARTCHAR C316 +STARTCHAR 00cb +ENCODING 203 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +24 +00 +7e +40 +40 +40 +7c +40 +40 +40 +7e +00 +00 +ENDCHAR +STARTCHAR 00cc +ENCODING 204 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +10 +0c +00 +3e +08 +08 +08 +08 +08 +08 +08 +3e +00 +00 +ENDCHAR +STARTCHAR 00cd +ENCODING 205 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +04 +18 +00 +3e +08 +08 +08 +08 +08 +08 +08 +3e +00 +00 +ENDCHAR +STARTCHAR 00ce ENCODING 206 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -10 -28 -44 -fe -10 -10 -10 -10 -10 -10 -10 -10 -10 -fe +08 +14 +00 +3e +08 +08 +08 +08 +08 +08 +08 +3e 00 00 ENDCHAR -STARTCHAR C317 +STARTCHAR 00cf ENCODING 207 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -44 -44 00 -fe -10 -10 -10 -10 -10 -10 -10 -10 -10 -fe +14 +00 +3e +08 +08 +08 +08 +08 +08 +08 +3e 00 00 ENDCHAR -STARTCHAR C320 +STARTCHAR 00d0 ENCODING 208 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -f8 +00 +78 44 -44 -42 42 42 f2 @@ -4043,1090 +3426,995 @@ f2 42 42 44 -44 -f8 +78 00 00 ENDCHAR -STARTCHAR C321 +STARTCHAR 00d1 ENCODING 209 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -24 -58 +14 +28 00 -87 -c2 -a2 -a2 -92 -92 -92 -8a -8a -86 -c2 +62 +62 +52 +52 +4a +4a +4a +46 +46 00 00 ENDCHAR -STARTCHAR C322 +STARTCHAR 00d2 ENCODING 210 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -30 -10 -08 -38 -44 -82 -82 -82 -82 -82 -82 -82 -44 -38 +20 +18 +00 +3c +42 +42 +42 +42 +42 +42 +42 +3c 00 00 ENDCHAR -STARTCHAR C323 +STARTCHAR 00d3 ENCODING 211 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP +04 18 -10 -20 -38 -44 -82 -82 -82 -82 -82 -82 -82 -44 -38 +00 +3c +42 +42 +42 +42 +42 +42 +42 +3c 00 00 ENDCHAR -STARTCHAR C324 +STARTCHAR 00d4 ENCODING 212 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -38 -44 +18 +24 00 -38 -44 -82 -82 -82 -82 -82 -82 -82 -44 -38 +3c +42 +42 +42 +42 +42 +42 +42 +3c 00 00 ENDCHAR -STARTCHAR C325 +STARTCHAR 00d5 ENCODING 213 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -24 -58 +14 +28 00 -38 -44 -82 -82 -82 -82 -82 -82 -82 -44 -38 +3c +42 +42 +42 +42 +42 +42 +42 +3c 00 00 ENDCHAR -STARTCHAR C326 +STARTCHAR 00d6 ENCODING 214 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP -44 -44 00 -38 -44 -82 -82 -82 -82 -82 -82 -82 -44 -38 +24 +00 +3c +42 +42 +42 +42 +42 +42 +42 +3c 00 00 ENDCHAR -STARTCHAR C327 +STARTCHAR 00d7 ENCODING 215 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 00 -81 -42 -24 -18 -18 -24 -42 -81 00 -00 -00 -00 -ENDCHAR -STARTCHAR C330 -ENCODING 216 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -02 -02 -3c -44 -86 -8a -8a -92 -92 -a2 -a2 -c2 -44 -78 -80 -80 -ENDCHAR -STARTCHAR C331 -ENCODING 217 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -30 -10 -08 -e7 -42 -42 -42 -42 -42 -42 -42 -42 -42 -3c -00 -00 -ENDCHAR -STARTCHAR C332 -ENCODING 218 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -0c -08 -10 -e7 -42 -42 -42 -42 -42 -42 -42 -42 -42 -3c -00 -00 -ENDCHAR -STARTCHAR C333 -ENCODING 219 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -18 -24 -00 -e7 -42 -42 -42 -42 -42 -42 -42 -42 -42 -3c -00 -00 -ENDCHAR -STARTCHAR C334 -ENCODING 220 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -24 -24 -00 -e7 -42 -42 -42 -42 -42 -42 -42 -42 -42 -3c -00 -00 -ENDCHAR -STARTCHAR C335 -ENCODING 221 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -0c -08 -10 -c6 82 44 +28 +10 +28 44 +82 +00 +00 +ENDCHAR +STARTCHAR 00d8 +ENCODING 216 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +02 +02 +3c +46 +4a +4a +4a +52 +52 +52 +62 +3c +40 +40 +ENDCHAR +STARTCHAR 00d9 +ENCODING 217 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +20 +18 +00 +42 +42 +42 +42 +42 +42 +42 +42 +3c +00 +00 +ENDCHAR +STARTCHAR 00da +ENCODING 218 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +04 +18 +00 +42 +42 +42 +42 +42 +42 +42 +42 +3c +00 +00 +ENDCHAR +STARTCHAR 00db +ENCODING 219 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +18 +24 +00 +42 +42 +42 +42 +42 +42 +42 +42 +3c +00 +00 +ENDCHAR +STARTCHAR 00dc +ENCODING 220 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +24 +00 +42 +42 +42 +42 +42 +42 +42 +42 +3c +00 +00 +ENDCHAR +STARTCHAR 00dd +ENCODING 221 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +04 +18 +42 +42 +44 +24 28 -28 +18 10 10 10 10 +00 +00 +ENDCHAR +STARTCHAR 00de +ENCODING 222 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +40 +40 +7c +42 +42 +42 +42 +7c +40 +40 +00 +00 +ENDCHAR +STARTCHAR 00df +ENCODING 223 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +18 +24 +24 +24 +38 +24 +22 +22 +22 7c 00 00 ENDCHAR -STARTCHAR C336 -ENCODING 222 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -e0 -40 -78 -44 -42 -42 -42 -44 -78 -40 -40 -40 -40 -f0 -00 -00 -ENDCHAR -STARTCHAR C337 -ENCODING 223 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -38 -44 -82 -82 -82 -84 -98 -84 -82 -82 -82 -82 -9c -00 -00 -ENDCHAR -STARTCHAR C340 +STARTCHAR 00e0 ENCODING 224 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -30 +20 10 08 00 3c 42 -02 -3e +0e +32 42 -82 -82 -86 -7b +46 +3a 00 00 ENDCHAR -STARTCHAR C341 +STARTCHAR 00e1 ENCODING 225 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -18 +04 +08 10 -20 00 3c 42 -02 -3e +0e +32 42 -82 -82 -86 -7b +46 +3a 00 00 ENDCHAR -STARTCHAR C342 +STARTCHAR 00e2 ENCODING 226 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 +00 18 24 -42 00 3c 42 -02 -3e +0e +32 42 -82 -82 -86 -7b +46 +3a 00 00 ENDCHAR -STARTCHAR C343 +STARTCHAR 00e3 ENCODING 227 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -32 -4c 00 +14 +28 00 3c 42 -02 -3e +0e +32 42 -82 -82 -86 -7b +46 +3a 00 00 ENDCHAR -STARTCHAR C344 +STARTCHAR 00e4 ENCODING 228 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 -24 +00 24 00 3c 42 -02 -3e +0e +32 42 -82 -82 -86 -7b +46 +3a 00 00 ENDCHAR -STARTCHAR C345 +STARTCHAR 00e5 ENCODING 229 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -18 -24 -18 +10 +28 +10 00 3c 42 -02 -3e +0e +32 42 -82 -82 -86 -7b +46 +3a 00 00 ENDCHAR -STARTCHAR C346 +STARTCHAR 00e6 ENCODING 230 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 00 00 -6c +7c 92 -12 -3e -50 +32 +5e 90 92 -92 -6c +7c 00 00 ENDCHAR -STARTCHAR C347 +STARTCHAR 00e7 ENCODING 231 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 00 00 -3a -46 -82 -80 -80 -80 -82 +00 +3c +42 +40 +40 +40 42 3c +08 10 -10 -20 ENDCHAR -STARTCHAR C350 +STARTCHAR 00e8 ENCODING 232 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -30 +20 10 08 00 -38 -44 -82 -fe -80 -80 -82 +3c +42 +42 +7e +40 42 3c 00 00 ENDCHAR -STARTCHAR C351 +STARTCHAR 00e9 ENCODING 233 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -18 +04 +08 10 -20 00 -38 -44 -82 -fe -80 -80 -82 +3c +42 +42 +7e +40 42 3c 00 00 ENDCHAR -STARTCHAR C352 +STARTCHAR 00ea ENCODING 234 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -38 -44 -82 00 -38 -44 -82 -fe -80 -80 -82 +18 +24 +00 +3c +42 +42 +7e +40 42 3c 00 00 ENDCHAR -STARTCHAR C353 +STARTCHAR 00eb ENCODING 235 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -44 -44 00 00 -38 -44 -82 -fe -80 -80 -80 -44 -38 +24 +00 +3c +42 +42 +7e +40 +42 +3c 00 00 ENDCHAR -STARTCHAR C353 +STARTCHAR 00ec ENCODING 236 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -30 10 08 +04 00 -78 +18 08 08 08 08 08 -08 -08 -ff +3e 00 00 ENDCHAR -STARTCHAR C354 +STARTCHAR 00ed ENCODING 237 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -18 +04 +08 10 -20 00 -78 +18 08 08 08 08 08 -08 -08 -ff +3e 00 00 ENDCHAR -STARTCHAR C355 +STARTCHAR 00ee ENCODING 238 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 +00 18 24 -42 00 -78 +18 08 08 08 08 08 -08 -08 -ff +3e 00 00 ENDCHAR -STARTCHAR C356 +STARTCHAR 00ef ENCODING 239 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -24 -24 00 00 -78 +14 +00 +18 08 08 08 08 08 -08 -08 -ff +3e 00 00 ENDCHAR -STARTCHAR C357 +STARTCHAR 00f0 ENCODING 240 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -64 -18 -18 -24 -3c -42 -82 -82 -82 -82 -82 -42 +28 +10 +28 +04 3c +44 +44 +44 +44 +44 +38 00 00 ENDCHAR -STARTCHAR C360 +STARTCHAR 00f1 ENCODING 241 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -32 -4c 00 +14 +28 00 -dc +5c 62 42 42 42 42 42 -42 -e7 00 00 ENDCHAR -STARTCHAR C361 +STARTCHAR 00f2 ENCODING 242 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -30 +20 10 08 00 -38 -44 -82 -82 -82 -82 -82 -44 -38 +3c +42 +42 +42 +42 +42 +3c 00 00 ENDCHAR -STARTCHAR C362 +STARTCHAR 00f3 ENCODING 243 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -18 +04 +08 10 -20 00 -38 -44 -82 -82 -82 -82 -82 -44 -38 +3c +42 +42 +42 +42 +42 +3c 00 00 ENDCHAR -STARTCHAR C363 +STARTCHAR 00f4 ENCODING 244 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -10 -28 -44 -00 -38 -44 -82 -82 -82 -82 -82 -44 -38 -00 -00 -ENDCHAR -STARTCHAR C364 -ENCODING 245 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -32 -4c -00 -00 -38 -44 -82 -82 -82 -82 -82 -44 -38 -00 -00 -ENDCHAR -STARTCHAR C365 -ENCODING 246 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -44 -44 -00 -00 -38 -44 -82 -82 -82 -82 -82 -44 -38 -00 -00 -ENDCHAR -STARTCHAR C366 -ENCODING 247 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -00 -00 -00 -10 -10 -00 -fe -00 -10 -10 -00 -00 -00 -00 -ENDCHAR -STARTCHAR C367 -ENCODING 248 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -00 -00 -00 -00 -3a -44 -8a -8a -92 -a2 -a2 -44 -b8 -00 -00 -ENDCHAR -STARTCHAR C370 -ENCODING 249 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP -00 -30 -10 -08 -00 -c6 -42 -42 -42 -42 -42 -42 -46 -39 -00 -00 -ENDCHAR -STARTCHAR C371 -ENCODING 250 -SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 -BITMAP 00 18 -10 -20 +24 00 -c6 +3c 42 42 42 42 42 +3c +00 +00 +ENDCHAR +STARTCHAR 00f5 +ENCODING 245 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +14 +28 +00 +3c +42 +42 +42 +42 +42 +3c +00 +00 +ENDCHAR +STARTCHAR 00f6 +ENCODING 246 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +00 +24 +00 +3c +42 +42 +42 +42 +42 +3c +00 +00 +ENDCHAR +STARTCHAR 00f7 +ENCODING 247 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +00 +00 +00 +00 +00 +30 +00 +fc +00 +30 +00 +00 +ENDCHAR +STARTCHAR 00f8 +ENCODING 248 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +00 +02 +04 +3c +4a +4a +52 +52 +62 +3c +40 +40 +ENDCHAR +STARTCHAR 00f9 +ENCODING 249 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +20 +10 +08 +42 +42 +42 +42 42 46 -39 +3a 00 00 ENDCHAR -STARTCHAR C372 +STARTCHAR 00fa +ENCODING 250 +SWIDTH 480 0 +DWIDTH 7 0 +BBX 7 14 0 -2 +BITMAP +00 +00 +04 +08 +10 +42 +42 +42 +42 +42 +46 +3a +00 +00 +ENDCHAR +STARTCHAR 00fb ENCODING 251 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -10 -28 -44 00 -c6 -42 +18 +24 +00 42 42 42 42 42 46 -39 +3a 00 00 ENDCHAR -STARTCHAR C373 +STARTCHAR 00fc ENCODING 252 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -24 -24 00 00 -c6 -42 +24 +00 42 42 42 42 42 46 -39 +3a 00 00 ENDCHAR -STARTCHAR C374 +STARTCHAR 00fd ENCODING 253 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -0c +00 +04 08 10 -00 -e7 +42 42 22 24 14 +1c 08 -08 -10 -90 -a0 -40 +48 +30 ENDCHAR -STARTCHAR C375 +STARTCHAR 00fe ENCODING 254 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 00 -c0 40 40 -78 -44 +40 +5c +62 42 42 42 -42 -44 -78 +62 +5c 40 40 -f0 ENDCHAR -STARTCHAR C376 +STARTCHAR 00ff ENCODING 255 SWIDTH 480 0 -DWIDTH 8 0 -BBX 8 16 0 -2 +DWIDTH 7 0 +BBX 7 14 0 -2 BITMAP 00 -24 -24 00 00 -e7 +24 +00 +42 42 22 24 14 +1c 08 -08 -10 -90 -a0 -40 +48 +30 ENDCHAR ENDFONT diff --git a/engine/src/client.c b/engine/src/client.c index c24e3c4..36e7298 100644 --- a/engine/src/client.c +++ b/engine/src/client.c @@ -33,12 +33,17 @@ GSClient GSClientCreate(GSEngine engine) { client->skybox = GSSkyBoxTry(client, "default"); - if(GSGLTextureTry(client->gl, &client->font, &client->font_width, &client->font_height, "game:/font")) { - } else if(GSGLTextureTry(client->gl, &client->font, &client->font_width, &client->font_height, "base:/font")) { + if(GSGLTextureTryEx(client->gl, &client->font, &client->glyph_width, &client->glyph_height, "game:/font", 0)) { + } else if(GSGLTextureTryEx(client->gl, &client->font, &client->glyph_width, &client->glyph_height, "base:/font", 0)) { } else { client->font = 0; } + client->font_width = GSMathClosestPOT(client->glyph_width); + client->font_height = GSMathClosestPOT(client->glyph_height); + client->glyph_width /= 16; + client->glyph_height /= 16; + GSLog(GSLogInfo, "Created client"); return client; diff --git a/engine/src/getline.c b/engine/src/getline.c index 0fc4600..c27871e 100644 --- a/engine/src/getline.c +++ b/engine/src/getline.c @@ -2,13 +2,13 @@ #define GETLINE_MINSIZE 16 -int GSFileGetLine(char** lineptr, int* n, FILE* fp) { - int ch; +int GSFileGetLine(GSFile file, char** lineptr, int* n) { + char ch; int i = 0; char free_on_err = 0; char* p; - if(lineptr == NULL || n == NULL || fp == NULL) { + if(lineptr == NULL || n == NULL || file == NULL) { return -1; } if(*lineptr == NULL) { @@ -21,7 +21,7 @@ int GSFileGetLine(char** lineptr, int* n, FILE* fp) { } for(i = 0;; i++) { - ch = fgetc(fp); + int r = GSFileRead(file, &ch, 1); while(i >= (*n) - 2) { *n *= 2; p = realloc(*lineptr, sizeof(char) * (*n)); @@ -32,7 +32,7 @@ int GSFileGetLine(char** lineptr, int* n, FILE* fp) { } *lineptr = p; } - if(ch == EOF) { + if(r < 1) { if(i == 0) { if(free_on_err) free(*lineptr); diff --git a/engine/src/gl_common.c b/engine/src/gl_common.c index a34af17..039e858 100644 --- a/engine/src/gl_common.c +++ b/engine/src/gl_common.c @@ -2,10 +2,11 @@ #include #include +#include #include -GSBool GSGLTextureLoadFile(GSGL gl, GLuint* texture, int* width, int* height, const char* filename) { +GSBool GSGLTextureLoadFileEx(GSGL gl, GLuint* texture, int* width, int* height, const char* filename, int expand) { GSFile f = GSFileOpen(gl->engine, filename); unsigned char* data; unsigned char* rgba; @@ -24,7 +25,7 @@ GSBool GSGLTextureLoadFile(GSGL gl, GLuint* texture, int* width, int* height, co if((rgba = stbi_load_from_memory(data, sz, &w, &h, &ch, 4)) == NULL) { st = GSFalse; } else { - GSGLTexturePrepare(gl, texture, rgba, w, h); + GSGLTexturePrepareEx(gl, texture, rgba, w, h, expand); free(rgba); } @@ -37,18 +38,22 @@ GSBool GSGLTextureLoadFile(GSGL gl, GLuint* texture, int* width, int* height, co return st; } -GSBool GSGLTextureTry(GSGL gl, GLuint* texture, int* width, int* height, const char* prefix) { +GSBool GSGLTextureLoadFile(GSGL gl, GLuint* texture, int* width, int* height, const char* filename) { + return GSGLTextureLoadFileEx(gl, texture, width, height, filename, 1); +} + +GSBool GSGLTextureTryEx(GSGL gl, GLuint* texture, int* width, int* height, const char* prefix, int expand) { char* png = GSStringConcat(prefix, ".png"); char* bmp = GSStringConcat(prefix, ".bmp"); char* jpg = GSStringConcat(prefix, ".jpg"); char* jpeg = GSStringConcat(prefix, ".jpeg"); GSBool st = GSTrue; - if(GSGLTextureLoadFile(gl, texture, width, height, prefix)) { - } else if(GSGLTextureLoadFile(gl, texture, width, height, png)) { - } else if(GSGLTextureLoadFile(gl, texture, width, height, bmp)) { - } else if(GSGLTextureLoadFile(gl, texture, width, height, jpg)) { - } else if(GSGLTextureLoadFile(gl, texture, width, height, jpeg)) { + if(GSGLTextureLoadFileEx(gl, texture, width, height, prefix, expand)) { + } else if(GSGLTextureLoadFileEx(gl, texture, width, height, png, expand)) { + } else if(GSGLTextureLoadFileEx(gl, texture, width, height, bmp, expand)) { + } else if(GSGLTextureLoadFileEx(gl, texture, width, height, jpg, expand)) { + } else if(GSGLTextureLoadFileEx(gl, texture, width, height, jpeg, expand)) { } else { st = GSFalse; } @@ -61,37 +66,41 @@ GSBool GSGLTextureTry(GSGL gl, GLuint* texture, int* width, int* height, const c return st; } -void GSGLTextEx(GSGL gl, double x, double y, double sx, double sy, const char* text) { - double px = x; - double py = y; - int i; - double gw = gl->engine->client->font_width / 16 * sx; - double gh = gl->engine->client->font_height / 16 * sy; +GSBool GSGLTextureTry(GSGL gl, GLuint* texture, int* width, int* height, const char* prefix) { + return GSGLTextureTryEx(gl, texture, width, height, prefix, 1); +} + +void GSGLTextEx(GSGL gl, GSNumber x, GSNumber y, const char* text, GSNumber sx, GSNumber sy) { + GSNumber px = x; + GSNumber py = y; + int i; + GSClient client = gl->engine->client; + GSNumber gw = client->glyph_width * sx; + GSNumber gh = client->glyph_height * sy; + GSNumber sw = (GSNumber)client->glyph_width / client->font_width; + GSNumber sh = (GSNumber)client->glyph_height / client->font_height; GSGLBegin2D(gl); - GSGLTextureSet(gl, gl->engine->client->font); + GSGLTextureSet(gl, client->font); for(i = 0; text[i] != 0; i++) { GSVector2 v[4]; GSVector2 t[4]; - double gx = text[i] % 16; - double gy = text[i] / 16; + GSNumber gx = text[i] % 16; + GSNumber gy = text[i] / 16; - gx = gx / 16; - gy = gy / 16; + gx = gx * sw; + gy = gy * sh; v[0][0] = px, v[0][1] = py; - v[1][0] = px, v[1][1] = py + gh; - v[2][0] = px + gw, v[2][1] = py + gh; - v[3][0] = px + gw, v[3][1] = py; t[0][0] = gx, t[0][1] = gy; - t[1][0] = gx, t[1][1] = gy + 1.0 / 16; - t[2][0] = gx + 1.0 / 16, t[2][1] = gy + 1.0 / 16; - t[3][0] = gx + 1.0 / 16, t[3][1] = gy; + t[1][0] = gx, t[1][1] = gy + sh; + t[2][0] = gx + sw, t[2][1] = gy + sh; + t[3][0] = gx + sw, t[3][1] = gy; GSGLPolygon2D(gl, 4, v, t); @@ -102,14 +111,60 @@ void GSGLTextEx(GSGL gl, double x, double y, double sx, double sy, const char* t GSGLEnd2D(gl); } -void GSGLText(GSGL gl, double x, double y, const char* text) { - GSGLTextEx(gl, x, y, 1, 1, text); +void GSGLText(GSGL gl, GSNumber x, GSNumber y, const char* text) { + GSGLTextEx(gl, x, y, text, 1, 1); } double GSGLTextWidth(GSGL gl, const char* text) { - return gl->engine->client->font_width / 16 * strlen(text); + return gl->engine->client->glyph_width * strlen(text); } double GSGLTextHeight(GSGL gl, const char* text) { - return gl->engine->client->font_height / 16; + return gl->engine->client->glyph_height; +} + +void GSGLTexturePrepareEx(GSGL gl, GLuint* texture, unsigned char* rgba, int width, int height, int expand) { + int w, h; + unsigned char* d; + int i, y, x; + GSNumber sx, sy; + + w = GSMathClosestPOT(width); + h = GSMathClosestPOT(height); + + d = malloc(w * h * 4); + + if(expand) { + sx = (GSNumber)width / w; + sy = (GSNumber)height / h; + + for(y = 0; y < h; y++) { + int fy = y * sy; + for(x = 0; x < w; x++) { + int fx = x * sx; + unsigned char* fp = &rgba[(fy * width + fx) * 4]; + unsigned char* tp = &d[(y * w + x) * 4]; + + for(i = 0; i < 4; i++) { + tp[i] = fp[i]; + } + } + } + } else { + memset(d, 0, w * h * 4); + + for(y = 0; y < height; y++) { + for(x = 0; x < width; x++) { + for(i = 0; i < 4; i++) d[(y * w + x) * 4 + i] = rgba[(y * width + x) * 4 + i]; + } + } + } + + GSGLTextureLoad(gl, texture, d, w, h); + + free(d); +} + +void GSGLTexturePrepare(GSGL gl, GLuint* texture, unsigned char* rgba, int width, int height) { + GSGLTexturePrepareEx(gl, texture, rgba, width, height, 1); } diff --git a/engine/src/gl_texture.c b/engine/src/gl_texture.c index 1e3d594..e84d542 100644 --- a/engine/src/gl_texture.c +++ b/engine/src/gl_texture.c @@ -1,6 +1,6 @@ #include -void GSGLTexturePrepare(GSGL gl, GLuint* texture, unsigned char* rgba, int width, int height) { +void GSGLTextureLoad(GSGL gl, GLuint* texture, unsigned char* rgba, int width, int height) { glGenTextures(1, texture); glBindTexture(GL_TEXTURE_2D, *texture); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, rgba); diff --git a/engine/src/math.c b/engine/src/math.c index efd7883..dcc606e 100644 --- a/engine/src/math.c +++ b/engine/src/math.c @@ -103,3 +103,11 @@ void GSMathInvert4x4(GSMatrix4x4 out, GSMatrix4x4 in) { for(i = 0; i < 16; i++) out[i] = inv[i] * det; } + +GSNumber GSMathClosestPOT(GSNumber x) { + GSNumber r = 2; + + while(r < x) r *= 2; + + return r; +} diff --git a/engine/tools/gs_dumpfont/main.c b/engine/tools/gs_dumpfont/main.c index e007952..7e7306e 100644 --- a/engine/tools/gs_dumpfont/main.c +++ b/engine/tools/gs_dumpfont/main.c @@ -18,8 +18,9 @@ int main() { int p = 0; int y = 0; int w, h; + GSFile file = GSFileOpen(NULL, "/dev/stdin"); - while((linelen = GSFileGetLine(&line, &linesize, stdin)) != -1) { + while((linelen = GSFileGetLine(file, &line, &linesize)) != -1) { linelen--; line[linelen] = 0; @@ -30,8 +31,9 @@ int main() { if(font != NULL) free(font); - iw = w * 16; - ih = h * 16; + iw = w * 16; + ih = h * 16; + font = malloc(iw * ih * 4); memset(font, 0, iw * ih * 4); } else if(CHECK("ENCODING ")) {