This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 86bcd463620e8f23223be4ba6aa7c119431a17ff (commit) via 025e4e5bfe38679138c784e52b1132cf9ddad9e1 (commit) via 670966c1d27848e937e3e72806ebb83d8a4c264c (commit) via 4004e53d7506d44299808e28fb578b0bdfbce3d4 (commit) via f6010aa98ae98c4e01c5f9a0c0c4ae15a44a32d0 (commit) from 24510ed5795faacbc9dc7f362d7921c2cc2d2730 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/86bcd463620e8f23223be4ba6aa7c119431a1... commit 86bcd463620e8f23223be4ba6aa7c119431a17ff Author: Cyril Hrubis <metan@ucw.cz> Date: Fri Feb 15 20:46:18 2013 +0100 tests: Fix wrong path in runtests.py script. diff --git a/tests/runtests.py b/tests/runtests.py index 9f3704e..d6619a5 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -26,7 +26,7 @@ results_dir='results' # # Relative path to the directory with GP libraries to run tests against # -build_dir='../../build' +build_dir='../build' # # By default the glibc __libc_message() writes to /dev/tty before calling http://repo.or.cz/w/gfxprim.git/commit/025e4e5bfe38679138c784e52b1132cf9ddad... commit 025e4e5bfe38679138c784e52b1132cf9ddad9e1 Author: Cyril Hrubis <metan@ucw.cz> Date: Fri Feb 15 20:46:00 2013 +0100 text: Add GP_FontTiny (proportional variant). diff --git a/build/syms/Text_symbols.txt b/build/syms/Text_symbols.txt index fe608d3..4aa0fe3 100644 --- a/build/syms/Text_symbols.txt +++ b/build/syms/Text_symbols.txt @@ -18,6 +18,7 @@ GP_Print GP_DefaultStyle +GP_FontTiny GP_FontTinyMono GP_DefaultProportionalFont GP_DefaultConsoleFont diff --git a/demos/c_simple/fileview.c b/demos/c_simple/fileview.c index 175e4c2..aa6ff0b 100644 --- a/demos/c_simple/fileview.c +++ b/demos/c_simple/fileview.c @@ -69,6 +69,9 @@ void redraw_screen(void) style.font = GP_FontTinyMono; break; case 3: + style.font = GP_FontTiny; + break; + case 4: style.font = font; break; } @@ -128,9 +131,9 @@ void event_loop(void) switch (ev.val.key.key) { case GP_KEY_SPACE: if (font) - font_flag = (font_flag + 1) % 4; + font_flag = (font_flag + 1) % 5; else - font_flag = (font_flag + 1) % 3; + font_flag = (font_flag + 1) % 4; redraw_screen(); GP_BackendFlip(backend); diff --git a/demos/c_simple/fonttest.c b/demos/c_simple/fonttest.c index 1cd3349..e374ec9 100644 --- a/demos/c_simple/fonttest.c +++ b/demos/c_simple/fonttest.c @@ -113,9 +113,12 @@ void redraw_screen(void) style.font = &GP_DefaultConsoleFont; break; case 2: - style.font = GP_FontTinyMono; + style.font = GP_FontTiny; break; case 3: + style.font = GP_FontTinyMono; + break; + case 4: style.font = font; break; } @@ -170,7 +173,7 @@ void redraw_screen(void) style.pixel_xspace = 1; style.pixel_yspace = 1; - if (font_flag == 2) { + if (font_flag == 2 || font_flag == 3) { style.pixel_xmul = 2; style.pixel_ymul = 5; @@ -196,9 +199,9 @@ void event_loop(void) switch (ev.val.key.key) { case GP_KEY_SPACE: if (font) - font_flag = (font_flag + 1) % 4; + font_flag = (font_flag + 1) % 5; else - font_flag = (font_flag + 1) % 3; + font_flag = (font_flag + 1) % 4; redraw_screen(); GP_BackendFlip(win); diff --git a/include/text/GP_Fonts.h b/include/text/GP_Fonts.h index 40ac8c6..d05dfc3 100644 --- a/include/text/GP_Fonts.h +++ b/include/text/GP_Fonts.h @@ -34,4 +34,9 @@ */ extern const GP_FontFace *GP_FontTinyMono; +/* + * Similar as FontTinyMono but proportional + */ +extern const GP_FontFace *GP_FontTiny; + #endif /* TEXT_GP_FONTS_H */ diff --git a/libs/text/GP_FontTinyMono.c b/libs/text/GP_FontTiny.c similarity index 57% copy from libs/text/GP_FontTinyMono.c copy to libs/text/GP_FontTiny.c index 5ff283e..a210997 100644 --- a/libs/text/GP_FontTinyMono.c +++ b/libs/text/GP_FontTiny.c @@ -22,210 +22,210 @@ #include "GP_Font.h" -static int8_t tiny_mono_glyphs[] = { - /* ' ' */ 5, 5, 0, 5, 6, +static int8_t tiny_glyphs[] = { + /* ' ' */ 4, 5, 0, 5, 4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - /* '!' */ 5, 5, 0, 5, 6, - 0x20, 0x20, 0x20, 0x00, 0x20, 0x00, 0x00, - /* '"' */ 5, 5, 0, 5, 6, + /* '!' */ 1, 5, 1, 5, 3, + 0x80, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, + /* '"' */ 4, 5, 0, 5, 6, 0x50, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, /* '#' */ 5, 5, 0, 5, 6, 0x50, 0xf8, 0x50, 0xf8, 0x50, 0x00, 0x00, - /* '$' */ 5, 5, 0, 5, 6, - 0x20, 0x70, 0x02, 0x70, 0x20, 0x00, 0x00, + /* '$' */ 3, 5, 0, 5, 4, + 0x40, 0xe0, 0x40, 0xe0, 0x40, 0x00, 0x00, /* '%' */ 5, 5, 0, 5, 6, 0xd0, 0x90, 0x20, 0x48, 0x58, 0x00, 0x00, - /* '&' */ 5, 5, 0, 5, 6, + /* '&' */ 4, 5, 0, 5, 5, 0x60, 0x90, 0x40, 0xa0, 0xd0, 0x00, 0x00, - /* ''' */ 5, 5, 0, 5, 6, - 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, - /* '(' */ 5, 5, 0, 5, 6, - 0x20, 0x40, 0x40, 0x40, 0x20, 0x00, 0x00, - /* ')' */ 5, 5, 0, 5, 6, - 0x20, 0x10, 0x10, 0x10, 0x20, 0x00, 0x00, - /* '*' */ 5, 5, 0, 5, 6, - 0x00, 0x50, 0x20, 0x50, 0x00, 0x00, 0x00, - /* '+' */ 5, 5, 0, 5, 6, - 0x00, 0x20, 0x70, 0x20, 0x00, 0x00, 0x00, - /* ',' */ 5, 6, 0, 5, 6, - 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x00, - /* '-' */ 5, 5, 0, 5, 6, - 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, - /* '.' */ 5, 5, 0, 5, 6, - 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, - /* '/' */ 5, 5, 0, 5, 6, - 0x10, 0x10, 0x20, 0x40, 0x40, 0x00, 0x00, - /* '0' */ 5, 5, 0, 5, 6, + /* ''' */ 1, 5, 0, 5, 2, + 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, + /* '(' */ 2, 5, 0, 5, 3, + 0x40, 0x80, 0x80, 0x80, 0x40, 0x00, 0x00, + /* ')' */ 2, 5, 0, 5, 3, + 0x80, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, + /* '*' */ 3, 5, 0, 5, 4, + 0x00, 0xa0, 0x40, 0xa0, 0x00, 0x00, 0x00, + /* '+' */ 3, 5, 0, 5, 4, + 0x00, 0x40, 0xe0, 0x40, 0x00, 0x00, 0x00, + /* ',' */ 1, 6, 0, 5, 2, + 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, + /* '-' */ 3, 5, 0, 5, 4, + 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, + /* '.' */ 1, 5, 0, 5, 2, + 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, + /* '/' */ 3, 5, 0, 5, 4, + 0x20, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, + /* '0' */ 4, 5, 0, 5, 5, 0x60, 0xb0, 0x90, 0xd0, 0x60, 0x00, 0x00, - /* '1' */ 5, 5, 0, 5, 6, - 0x60, 0x20, 0x20, 0x20, 0x70, 0x00, 0x00, - /* '2' */ 5, 5, 0, 5, 6, + /* '1' */ 3, 5, 0, 5, 4, + 0xc0, 0x40, 0x40, 0x40, 0xe0, 0x00, 0x00, + /* '2' */ 4, 5, 0, 5, 5, 0xe0, 0x10, 0x60, 0x80, 0xf0, 0x00, 0x00, - /* '3' */ 5, 5, 0, 5, 6, + /* '3' */ 4, 5, 0, 5, 5, 0xe0, 0x10, 0x60, 0x10, 0xe0, 0x00, 0x00, - /* '4' */ 5, 5, 0, 5, 6, + /* '4' */ 4, 5, 0, 5, 5, 0x20, 0x60, 0xa0, 0xf0, 0x20, 0x00, 0x00, - /* '5' */ 5, 5, 0, 5, 6, + /* '5' */ 4, 5, 0, 5, 5, 0xf0, 0x80, 0xe0, 0x10, 0xe0, 0x00, 0x00, - /* '6' */ 5, 5, 0, 5, 6, + /* '6' */ 4, 5, 0, 5, 5, 0x60, 0x80, 0xe0, 0x90, 0x60, 0x00, 0x00, - /* '7' */ 5, 5, 0, 5, 6, + /* '7' */ 4, 5, 0, 5, 5, 0xf0, 0x10, 0x20, 0x40, 0x40, 0x00, 0x00, - /* '8' */ 5, 5, 0, 5, 6, + /* '8' */ 4, 5, 0, 5, 5, 0x60, 0x90, 0x60, 0x90, 0x60, 0x00, 0x00, - /* '9' */ 5, 5, 0, 5, 6, + /* '9' */ 4, 5, 0, 5, 5, 0x60, 0x90, 0x70, 0x10, 0x60, 0x00, 0x00, - /* ':' */ 5, 5, 0, 5, 6, - 0x00, 0x20, 0x00, 0x20, 0x00, 0x00, 0x00, - /* ';' */ 5, 5, 0, 5, 6, - 0x00, 0x20, 0x00, 0x20, 0x20, 0x00, 0x00, - /* '<' */ 5, 5, 0, 5, 6, - 0x10, 0x20, 0x40, 0x20, 0x10, 0x00, 0x00, - /* '=' */ 5, 5, 0, 5, 6, - 0x00, 0x70, 0x00, 0x70, 0x00, 0x00, 0x00, - /* '>' */ 5, 5, 0, 5, 6, - 0x40, 0x20, 0x10, 0x20, 0x40, 0x00, 0x00, - /* '?' */ 5, 5, 0, 5, 6, - 0x60, 0x10, 0x20, 0x00, 0x20, 0x00, 0x00, + /* ':' */ 1, 5, 0, 5, 2, + 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, + /* ';' */ 1, 5, 0, 5, 2, + 0x00, 0x80, 0x00, 0x80, 0x80, 0x00, 0x00, + /* '<' */ 3, 5, 0, 5, 4, + 0x20, 0x40, 0x80, 0x40, 0x20, 0x00, 0x00, + /* '=' */ 3, 5, 0, 5, 4, + 0x00, 0xe0, 0x00, 0xe0, 0x00, 0x00, 0x00, + /* '>' */ 3, 5, 0, 5, 4, + 0x80, 0x40, 0x20, 0x40, 0x80, 0x00, 0x00, + /* '?' */ 3, 5, 0, 5, 4, + 0xc0, 0x20, 0x40, 0x00, 0x40, 0x00, 0x00, /* '@' */ 5, 5, 0, 5, 6, 0x70, 0x88, 0xb0, 0x80, 0x70, 0x00, 0x00, - /* 'A' */ 5, 5, 0, 5, 6, + /* 'A' */ 4, 5, 0, 5, 5, 0x60, 0x90, 0xf0, 0x90, 0x90, 0x00, 0x00, - /* 'B' */ 5, 5, 0, 5, 6, + /* 'B' */ 4, 5, 0, 5, 5, 0xe0, 0x90, 0xe0, 0x90, 0xe0, 0x00, 0x00, - /* 'C' */ 5, 5, 0, 5, 6, + /* 'C' */ 4, 5, 0, 5, 5, 0x70, 0x80, 0x80, 0x80, 0x70, 0x00, 0x00, - /* 'D' */ 5, 5, 0, 5, 6, + /* 'D' */ 4, 5, 0, 5, 5, 0xe0, 0x90, 0x90, 0x90, 0xe0, 0x00, 0x00, - /* 'E' */ 5, 5, 0, 5, 6, + /* 'E' */ 4, 5, 0, 5, 5, 0xf0, 0x80, 0xe0, 0x80, 0xf0, 0x00, 0x00, - /* 'F' */ 5, 5, 0, 5, 6, + /* 'F' */ 4, 5, 0, 5, 5, 0xf0, 0x80, 0xe0, 0x80, 0x80, 0x00, 0x00, /* 'G' */ 5, 5, 0, 5, 6, 0x70, 0x80, 0x98, 0x88, 0x70, 0x00, 0x00, - /* 'H' */ 5, 5, 0, 5, 6, + /* 'H' */ 4, 5, 0, 5, 5, 0x90, 0x90, 0xf0, 0x90, 0x90, 0x00, 0x00, - /* 'I' */ 5, 5, 0, 5, 6, - 0x70, 0x20, 0x20, 0x20, 0x70, 0x00, 0x00, - /* 'J' */ 5, 5, 0, 5, 6, + /* 'I' */ 3, 5, 0, 5, 4, + 0xe0, 0x40, 0x40, 0x40, 0xe0, 0x00, 0x00, + /* 'J' */ 4, 5, 0, 5, 5, 0xf0, 0x10, 0x10, 0x90, 0x60, 0x00, 0x00, - /* 'K' */ 5, 5, 0, 5, 6, + /* 'K' */ 4, 5, 0, 5, 5, 0x90, 0xa0, 0xc0, 0xa0, 0x90, 0x00, 0x00, - /* 'L' */ 5, 5, 0, 5, 6, + /* 'L' */ 4, 5, 0, 5, 5, 0x80, 0x80, 0x80, 0x80, 0xf0, 0x00, 0x00, /* 'M' */ 5, 5, 0, 5, 6, 0x88, 0xd8, 0xa8, 0x88, 0x88, 0x00, 0x00, - /* 'N' */ 5, 5, 0, 5, 6, + /* 'N' */ 4, 5, 0, 5, 5, 0x90, 0xd0, 0xb0, 0x90, 0x90, 0x00, 0x00, - /* 'O' */ 5, 5, 0, 5, 6, + /* 'O' */ 4, 5, 0, 5, 5, 0x60, 0x90, 0x90, 0x90, 0x60, 0x00, 0x00, - /* 'P' */ 5, 5, 0, 5, 6, + /* 'P' */ 4, 5, 0, 5, 5, 0xe0, 0x90, 0xe0, 0x80, 0x80, 0x00, 0x00, - /* 'Q' */ 5, 5, 0, 5, 6, + /* 'Q' */ 4, 5, 0, 5, 5, 0x60, 0x90, 0x90, 0xa0, 0x50, 0x00, 0x00, - /* 'R' */ 5, 5, 0, 5, 6, + /* 'R' */ 4, 5, 0, 5, 5, 0xe0, 0x90, 0xe0, 0x90, 0x90, 0x00, 0x00, - /* 'S' */ 5, 5, 0, 5, 6, + /* 'S' */ 4, 5, 0, 5, 5, 0x70, 0x80, 0x60, 0x10, 0xe0, 0x00, 0x00, /* 'T' */ 5, 5, 0, 5, 6, 0xf8, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, - /* 'U' */ 5, 5, 0, 5, 6, + /* 'U' */ 4, 5, 0, 5, 5, 0x90, 0x90, 0x90, 0x90, 0x60, 0x00, 0x00, /* 'V' */ 5, 5, 0, 5, 6, 0x88, 0x88, 0x50, 0x50, 0x20, 0x00, 0x00, /* 'W' */ 5, 5, 0, 5, 6, 0x88, 0x88, 0x88, 0xa8, 0x50, 0x00, 0x00, - /* 'X' */ 5, 5, 0, 5, 6, + /* 'X' */ 4, 5, 0, 5, 5, 0x90, 0x90, 0x60, 0x90, 0x90, 0x00, 0x00, - /* 'Y' */ 5, 5, 0, 5, 6, + /* 'Y' */ 4, 5, 0, 5, 5, 0x90, 0x90, 0x70, 0x10, 0x60, 0x00, 0x00, - /* 'Z' */ 5, 5, 0, 5, 6, - 0xf0, 0x10, 0x20, 0xc0, 0xf0, 0x00, 0x00, - /* '[' */ 5, 5, 0, 5, 6, - 0x60, 0x40, 0x40, 0x40, 0x60, 0x00, 0x00, - /* '' */ 5, 5, 0, 5, 6, - 0x40, 0x40, 0x20, 0x10, 0x10, 0x00, 0x00, - /* ']' */ 5, 5, 0, 5, 6, - 0x30, 0x10, 0x10, 0x10, 0x30, 0x00, 0x00, - /* '^' */ 5, 5, 0, 5, 6, - 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, - /* '_' */ 5, 5, 0, 5, 6, + /* 'Z' */ 4, 5, 0, 5, 5, + 0xf0, 0x10, 0x60, 0x80, 0xf0, 0x00, 0x00, + /* '[' */ 2, 5, 0, 5, 3, + 0xc0, 0x80, 0x80, 0x80, 0xc0, 0x00, 0x00, + /* '' */ 3, 5, 0, 5, 4, + 0x80, 0x80, 0x40, 0x20, 0x20, 0x00, 0x00, + /* ']' */ 2, 5, 0, 5, 3, + 0xc0, 0x40, 0x40, 0x40, 0xc0, 0x00, 0x00, + /* '^' */ 3, 5, 0, 5, 4, + 0x40, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, + /* '_' */ 4, 5, 0, 5, 5, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, - /* '`' */ 5, 5, 0, 5, 6, - 0x20, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, - /* 'a' */ 5, 5, 0, 5, 6, + /* '`' */ 2, 5, 0, 5, 3, + 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, + /* 'a' */ 4, 5, 0, 5, 5, 0x00, 0x60, 0x90, 0x90, 0x70, 0x00, 0x00, - /* 'b' */ 5, 5, 0, 5, 6, + /* 'b' */ 4, 5, 0, 5, 5, 0x80, 0xe0, 0x90, 0x90, 0xe0, 0x00, 0x00, - /* 'c' */ 5, 5, 0, 5, 6, + /* 'c' */ 4, 5, 0, 5, 5, 0x00, 0x70, 0x80, 0x80, 0x70, 0x00, 0x00, - /* 'd' */ 5, 5, 0, 5, 6, + /* 'd' */ 4, 5, 0, 5, 5, 0x10, 0x70, 0x90, 0x90, 0x70, 0x00, 0x00, - /* 'e' */ 5, 5, 0, 5, 6, + /* 'e' */ 4, 5, 0, 5, 5, 0x00, 0x60, 0xf0, 0x80, 0x70, 0x00, 0x00, - /* 'f' */ 5, 7, 0, 5, 6, + /* 'f' */ 4, 7, 0, 5, 5, 0x00, 0x70, 0x80, 0xc0, 0x80, 0x80, 0x80, - /* 'g' */ 5, 7, 0, 5, 6, + /* 'g' */ 4, 7, 0, 5, 5, 0x00, 0x60, 0x90, 0x90, 0x70, 0x10, 0x60, - /* 'h' */ 5, 5, 0, 5, 6, + /* 'h' */ 4, 5, 0, 5, 5, 0x80, 0xe0, 0x90, 0x90, 0x90, 0x00, 0x00, - /* 'i' */ 5, 5, 0, 5, 6, - 0x20, 0x00, 0x20, 0x20, 0x70, 0x00, 0x00, - /* 'j' */ 5, 5, 0, 5, 6, + /* 'i' */ 3, 5, 0, 5, 4, + 0x40, 0x00, 0x40, 0x40, 0xe0, 0x00, 0x00, + /* 'j' */ 4, 5, 0, 5, 5, 0x00, 0x10, 0x10, 0x90, 0x60, 0x00, 0x00, - /* 'k' */ 5, 5, 0, 5, 6, + /* 'k' */ 4, 5, 0, 5, 5, 0x80, 0xb0, 0xc0, 0xa0, 0x90, 0x00, 0x00, - /* 'l' */ 5, 5, 0, 5, 6, - 0x40, 0x40, 0x40, 0x40, 0x30, 0x00, 0x00, + /* 'l' */ 2, 5, 0, 5, 3, + 0x80, 0x80, 0x80, 0x80, 0x40, 0x00, 0x00, /* 'm' */ 5, 5, 0, 5, 6, 0x00, 0xd0, 0xa8, 0xa8, 0xa8, 0x00, 0x00, - /* 'n' */ 5, 5, 0, 5, 6, + /* 'n' */ 4, 5, 0, 5, 5, 0x00, 0xe0, 0x90, 0x90, 0x90, 0x00, 0x00, - /* 'o' */ 5, 5, 0, 5, 6, + /* 'o' */ 4, 5, 0, 5, 5, 0x00, 0x60, 0x90, 0x90, 0x60, 0x00, 0x00, - /* 'p' */ 5, 7, 0, 5, 6, + /* 'p' */ 4, 7, 0, 5, 5, 0x00, 0xe0, 0x90, 0x90, 0xe0, 0x80, 0x80, - /* 'q' */ 5, 7, 0, 5, 6, + /* 'q' */ 4, 7, 0, 5, 5, 0x00, 0x70, 0x90, 0x90, 0x70, 0x10, 0x10, - /* 'r' */ 5, 5, 0, 5, 6, + /* 'r' */ 4, 5, 0, 5, 5, 0x00, 0x70, 0x80, 0x80, 0x80, 0x00, 0x00, - /* 's' */ 5, 5, 0, 5, 6, + /* 's' */ 4, 5, 0, 5, 5, 0x00, 0x70, 0xc0, 0x30, 0xe0, 0x00, 0x00, - /* 't' */ 5, 5, 0, 5, 6, + /* 't' */ 4, 5, 0, 5, 5, 0x40, 0xf0, 0x40, 0x40, 0x30, 0x00, 0x00, - /* 'u' */ 5, 5, 0, 5, 6, + /* 'u' */ 4, 5, 0, 5, 5, 0x00, 0x90, 0x90, 0x90, 0x70, 0x00, 0x00, - /* 'v' */ 5, 5, 0, 5, 6, + /* 'v' */ 4, 5, 0, 5, 5, 0x00, 0x90, 0x90, 0x90, 0x60, 0x00, 0x00, /* 'w' */ 5, 5, 0, 5, 6, 0x00, 0x88, 0xa8, 0xa8, 0x50, 0x00, 0x00, - /* 'x' */ 5, 5, 0, 5, 6, + /* 'x' */ 4, 5, 0, 5, 5, 0x00, 0x90, 0x60, 0x60, 0x90, 0x00, 0x00, - /* 'y' */ 5, 7, 0, 5, 6, + /* 'y' */ 4, 7, 0, 5, 5, 0x00, 0x90, 0x90, 0x90, 0x70, 0x10, 0x60, - /* 'z' */ 5, 5, 0, 5, 6, + /* 'z' */ 4, 5, 0, 5, 5, 0x00, 0xf0, 0x20, 0x40, 0xf0, 0x00, 0x00, - /* '{' */ 5, 5, 0, 5, 6, - 0x30, 0x40, 0x20, 0x40, 0x30, 0x00, 0x00, - /* '|' */ 5, 5, 0, 5, 6, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, - /* '}' */ 5, 5, 0, 5, 6, - 0x60, 0x10, 0x20, 0x10, 0x60, 0x00, 0x00, - /* '~' */ 5, 5, 0, 5, 6, + /* '{' */ 3, 5, 0, 5, 4, + 0x60, 0x80, 0x40, 0x80, 0x60, 0x00, 0x00, + /* '|' */ 1, 5, 0, 5, 2, + 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, + /* '}' */ 3, 5, 0, 5, 4, + 0xc0, 0x20, 0x40, 0x20, 0xc0, 0x00, 0x00, + /* '~' */ 4, 5, 0, 5, 5, 0x00, 0x50, 0xa0, 0x00, 0x00, 0x00, 0x00, }; -static struct GP_FontFace tiny_mono = { +static struct GP_FontFace tiny = { .family_name = "Tiny", - .style_name = "Mono", + .style_name = "", .charset = GP_CHARSET_7BIT, .ascend = 5, .descend = 3, .max_glyph_width = 5, .max_glyph_advance = 6, .glyph_bitmap_format = GP_FONT_BITMAP_1BPP, - .glyphs = tiny_mono_glyphs, + .glyphs = tiny_glyphs, .glyph_offsets = {12}, }; -struct GP_FontFace *GP_FontTinyMono = &tiny_mono; +struct GP_FontFace *GP_FontTiny = &tiny; diff --git a/libs/text/GP_FontTinyMono.c b/libs/text/GP_FontTinyMono.c index 5ff283e..2859472 100644 --- a/libs/text/GP_FontTinyMono.c +++ b/libs/text/GP_FontTinyMono.c @@ -32,7 +32,7 @@ static int8_t tiny_mono_glyphs[] = { /* '#' */ 5, 5, 0, 5, 6, 0x50, 0xf8, 0x50, 0xf8, 0x50, 0x00, 0x00, /* '$' */ 5, 5, 0, 5, 6, - 0x20, 0x70, 0x02, 0x70, 0x20, 0x00, 0x00, + 0x20, 0x70, 0x20, 0x70, 0x20, 0x00, 0x00, /* '%' */ 5, 5, 0, 5, 6, 0xd0, 0x90, 0x20, 0x48, 0x58, 0x00, 0x00, /* '&' */ 5, 5, 0, 5, 6, @@ -140,7 +140,7 @@ static int8_t tiny_mono_glyphs[] = { /* 'Y' */ 5, 5, 0, 5, 6, 0x90, 0x90, 0x70, 0x10, 0x60, 0x00, 0x00, /* 'Z' */ 5, 5, 0, 5, 6, - 0xf0, 0x10, 0x20, 0xc0, 0xf0, 0x00, 0x00, + 0xf0, 0x10, 0x60, 0x80, 0xf0, 0x00, 0x00, /* '[' */ 5, 5, 0, 5, 6, 0x60, 0x40, 0x40, 0x40, 0x60, 0x00, 0x00, /* '' */ 5, 5, 0, 5, 6, http://repo.or.cz/w/gfxprim.git/commit/670966c1d27848e937e3e72806ebb83d8a4c2... commit 670966c1d27848e937e3e72806ebb83d8a4c264c Author: Cyril Hrubis <metan@ucw.cz> Date: Fri Feb 15 20:39:29 2013 +0100 build: Add forgotten symbol to Input symbols. diff --git a/build/syms/Input_symbols.txt b/build/syms/Input_symbols.txt index c52e2e3..0368dc2 100644 --- a/build/syms/Input_symbols.txt +++ b/build/syms/Input_symbols.txt @@ -17,6 +17,7 @@ GP_EventQueueInit GP_EventQueueFree GP_EventQueueAlloc +GP_EventQueuePut GP_EventQueuePutEvent GP_EventQueuePushRelTo GP_EventQueuePushRel http://repo.or.cz/w/gfxprim.git/commit/4004e53d7506d44299808e28fb578b0bdfbce... commit 4004e53d7506d44299808e28fb578b0bdfbce3d4 Author: Cyril Hrubis <metan@ucw.cz> Date: Fri Feb 15 20:38:18 2013 +0100 build: Fix check_symbols.sh script. Fix regular expression passed to grep. diff --git a/build/check_symbols.sh b/build/check_symbols.sh index 31231cb..a229912 100755 --- a/build/check_symbols.sh +++ b/build/check_symbols.sh @@ -37,7 +37,7 @@ function check_symbols shift for i in `cat $symfile`; do - if ! grep $i $@ 2>&1 > /dev/null; then + if ! grep "^$i$" $@ 2>&1 > /dev/null; then find_symbol "$i" fi done http://repo.or.cz/w/gfxprim.git/commit/f6010aa98ae98c4e01c5f9a0c0c4ae15a44a3... commit f6010aa98ae98c4e01c5f9a0c0c4ae15a44a32d0 Author: Cyril Hrubis <metan@ucw.cz> Date: Fri Feb 15 19:47:36 2013 +0100 build: Update text exported syms. diff --git a/build/syms/Text_symbols.txt b/build/syms/Text_symbols.txt index 8dc7ca1..fe608d3 100644 --- a/build/syms/Text_symbols.txt +++ b/build/syms/Text_symbols.txt @@ -1,19 +1,23 @@ GP_FontFaceLoad +GP_FontFaceFree + GP_Text_Raw -GP_GetGlyphCount GP_TextAscent GP_TextMaxStrWidth GP_DefaultTextStyle -GP_DefaultProportionalFont -GP_DefaultConsoleFont +GP_GetGlyphCount GP_GetGlyphBitmap GP_TextClear GP_TextMaxWidth GP_TextHeight GP_TextWidth GP_TextDescent -GP_Text GP_TextClearStr +GP_Text GP_Print -GP_FontFaceFree + GP_DefaultStyle + +GP_FontTinyMono +GP_DefaultProportionalFont +GP_DefaultConsoleFont ----------------------------------------------------------------------- Summary of changes: build/check_symbols.sh | 2 +- build/syms/Input_symbols.txt | 1 + build/syms/Text_symbols.txt | 15 +- demos/c_simple/fileview.c | 7 +- demos/c_simple/fonttest.c | 11 +- include/text/GP_Fonts.h | 5 + libs/text/{GP_FontTinyMono.c => GP_FontTiny.c} | 240 ++++++++++++------------ libs/text/GP_FontTinyMono.c | 4 +- tests/runtests.py | 2 +- 9 files changed, 152 insertions(+), 135 deletions(-) copy libs/text/{GP_FontTinyMono.c => GP_FontTiny.c} (57%) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")