From 561428fb848ae8ac9fe02f7218fa72c5c02625e2 Mon Sep 17 00:00:00 2001 From: Alin Jerpelea Date: Tue, 23 Feb 2021 20:23:56 +0100 Subject: [PATCH] libs: nxstyle fixes nxstyle fixes to pass the CI Signed-off-by: Alin Jerpelea --- libs/libnx/nx/nx_drawcircle.c | 4 +- libs/libnx/nx/nx_drawline.c | 4 +- libs/libnx/nx/nx_fillcircle.c | 6 +- libs/libnx/nxfonts/nxfonts_bitmaps.c | 1062 +++++++++-------- libs/libnx/nxfonts/nxfonts_convert.c | 18 +- libs/libnx/nxfonts/nxfonts_getfont.c | 22 +- .../libnx/nxfonts/nxfonts_pixel-lcd-machine.h | 53 +- libs/libnx/nxfonts/nxfonts_pixel-unicode.h | 2 +- libs/libnx/nxfonts/nxfonts_sans17x22.h | 5 +- libs/libnx/nxfonts/nxfonts_sans17x23b.h | 5 +- libs/libnx/nxfonts/nxfonts_sans20x26.h | 5 +- libs/libnx/nxfonts/nxfonts_sans20x27b.h | 5 +- libs/libnx/nxfonts/nxfonts_sans22x29.h | 5 +- libs/libnx/nxfonts/nxfonts_sans22x29b.h | 5 +- libs/libnx/nxfonts/nxfonts_sans23x27.h | 7 +- libs/libnx/nxfonts/nxfonts_sans28x37.h | 5 +- libs/libnx/nxfonts/nxfonts_sans28x37b.h | 5 +- libs/libnx/nxfonts/nxfonts_sans39x48.h | 120 +- libs/libnx/nxfonts/nxfonts_sans40x49b.h | 137 ++- libs/libnx/nxfonts/nxfonts_serif22x28b.h | 5 +- libs/libnx/nxfonts/nxfonts_serif22x29.h | 5 +- libs/libnx/nxfonts/nxfonts_serif27x38b.h | 5 +- libs/libnx/nxfonts/nxfonts_serif29x37.h | 5 +- libs/libnx/nxfonts/nxfonts_serif38x48.h | 66 +- libs/libnx/nxfonts/nxfonts_serif38x49b.h | 86 +- .../nxfonts/nxfonts_x11-misc-fixed-10x20.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-4x6.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-5x7.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-5x8.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-6x10.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-6x12.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-6x13.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-6x13b.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-6x13o.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-6x9.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-7x13.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-7x13b.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-7x13o.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-7x14.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-7x14b.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-8x13.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-8x13b.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-8x13o.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-9x15.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-9x15b.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-9x18.h | 5 +- .../nxfonts/nxfonts_x11-misc-fixed-9x18b.h | 5 +- libs/libnx/nxglib/nxglib_circlepts.c | 4 +- libs/libnx/nxglib/nxglib_circletraps.c | 4 +- libs/libnx/nxglib/nxglib_rectintersect.c | 2 +- libs/libnx/nxglib/nxglib_rgb2yuv.c | 9 +- libs/libnx/nxglib/nxglib_rgbblend.c | 11 +- libs/libnx/nxglib/nxglib_runcopy.c | 3 +- libs/libnx/nxglib/nxglib_vectsubtract.c | 3 +- libs/libnx/nxglib/nxglib_yuv2rgb.c | 6 +- libs/libnx/nxmu/nx_bitmap.c | 9 +- libs/libnx/nxmu/nx_block.c | 23 +- libs/libnx/nxmu/nx_closewindow.c | 3 +- libs/libnx/nxmu/nx_constructwindow.c | 22 +- libs/libnx/nxmu/nx_cursor.c | 3 +- libs/libnx/nxmu/nx_eventnotify.c | 4 +- libs/libnx/nxmu/nx_filltrapezoid.c | 10 +- libs/libnx/nxmu/nx_getposition.c | 11 +- libs/libnx/nxmu/nx_getrectangle.c | 7 +- libs/libnx/nxmu/nx_kbdin.c | 4 +- libs/libnx/nxmu/nx_mousein.c | 7 +- libs/libnx/nxmu/nx_openwindow.c | 3 +- libs/libnx/nxmu/nx_releasebkgd.c | 3 +- libs/libnx/nxmu/nx_requestbkgd.c | 3 +- libs/libnx/nxmu/nx_setbgcolor.c | 3 +- libs/libnx/nxmu/nx_setpixel.c | 3 +- libs/libnx/nxmu/nx_setposition.c | 3 +- libs/libnx/nxmu/nx_setvisibility.c | 3 +- libs/libnx/nxtk/nxtk.h | 8 +- libs/libnx/nxtk/nxtk_bitmaptoolbar.c | 14 +- libs/libnx/nxtk/nxtk_bitmapwindow.c | 7 +- libs/libnx/nxtk/nxtk_block.c | 8 +- libs/libnx/nxtk/nxtk_containerclip.c | 5 +- libs/libnx/nxtk/nxtk_drawcircletoolbar.c | 13 +- libs/libnx/nxtk/nxtk_drawcirclewindow.c | 13 +- libs/libnx/nxtk/nxtk_drawframe.c | 11 +- libs/libnx/nxtk/nxtk_drawlinetoolbar.c | 14 +- libs/libnx/nxtk/nxtk_drawlinewindow.c | 11 +- libs/libnx/nxtk/nxtk_events.c | 41 +- libs/libnx/nxtk/nxtk_fillcircletoolbar.c | 3 +- libs/libnx/nxtk/nxtk_fillcirclewindow.c | 3 +- libs/libnx/nxtk/nxtk_filltoolbar.c | 6 +- libs/libnx/nxtk/nxtk_filltraptoolbar.c | 3 +- libs/libnx/nxtk/nxtk_filltrapwindow.c | 6 +- libs/libnx/nxtk/nxtk_fillwindow.c | 6 +- libs/libnx/nxtk/nxtk_gettoolbar.c | 3 +- libs/libnx/nxtk/nxtk_getwindow.c | 3 +- libs/libnx/nxtk/nxtk_movetoolbar.c | 6 +- libs/libnx/nxtk/nxtk_movewindow.c | 6 +- libs/libnx/nxtk/nxtk_setposition.c | 7 +- libs/libnx/nxtk/nxtk_setsubwindows.c | 2 +- libs/libnx/nxtk/nxtk_subwindowclip.c | 8 +- libs/libnx/nxtk/nxtk_subwindowmove.c | 8 +- libs/libnx/nxtk/nxtk_toolbarbounds.c | 7 +- 99 files changed, 1245 insertions(+), 900 deletions(-) diff --git a/libs/libnx/nx/nx_drawcircle.c b/libs/libnx/nx/nx_drawcircle.c index 9ee084039e..3588e7011e 100644 --- a/libs/libnx/nx/nx_drawcircle.c +++ b/libs/libnx/nx/nx_drawcircle.c @@ -98,8 +98,8 @@ int nx_drawcircle(NXWINDOW hwnd, FAR const struct nxgl_point_s *center, vector.pt1.x = pts[i].x; vector.pt1.y = pts[i].y; - vector.pt2.x = pts[i+1].x; - vector.pt2.y = pts[i+1].y; + vector.pt2.x = pts[i + 1].x; + vector.pt2.y = pts[i + 1].y; ret = nx_drawline(hwnd, &vector, width, color, NX_LINECAP_PT1); if (ret != OK) diff --git a/libs/libnx/nx/nx_drawline.c b/libs/libnx/nx/nx_drawline.c index ac71a4030e..54ec606ce6 100644 --- a/libs/libnx/nx/nx_drawline.c +++ b/libs/libnx/nx/nx_drawline.c @@ -116,7 +116,9 @@ int nx_drawline(NXWINDOW hwnd, FAR struct nxgl_vector_s *vector, return ERROR; } - /* Draw circular caps at each end of the line to support better line joins */ + /* Draw circular caps at each end of the line to support better line + * joins + */ if (caps != NX_LINECAP_NONE && width >= 3) { diff --git a/libs/libnx/nx/nx_fillcircle.c b/libs/libnx/nx/nx_fillcircle.c index 34a81a5d39..3493a38cf4 100644 --- a/libs/libnx/nx/nx_fillcircle.c +++ b/libs/libnx/nx/nx_fillcircle.c @@ -58,8 +58,10 @@ * ****************************************************************************/ -int nx_fillcircle(NXWINDOW hwnd, FAR const struct nxgl_point_s *center, - nxgl_coord_t radius, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]) +int nx_fillcircle(NXWINDOW hwnd, + FAR const struct nxgl_point_s *center, + nxgl_coord_t radius, + nxgl_mxpixel_t color[CONFIG_NX_NPLANES]) { FAR struct nxgl_trapezoid_s traps[NCIRCLE_TRAPS]; int i; diff --git a/libs/libnx/nxfonts/nxfonts_bitmaps.c b/libs/libnx/nxfonts/nxfonts_bitmaps.c index 1b98bb6954..f022eec1d2 100644 --- a/libs/libnx/nxfonts/nxfonts_bitmaps.c +++ b/libs/libnx/nxfonts/nxfonts_bitmaps.c @@ -140,1551 +140,1553 @@ static const uint8_t NXFONT_CONCAT(g_bitmap_,n)[] = NXFONT_CONCAT(NXFONT_BITMAP_ ****************************************************************************/ #if NXFONT_MIN7BIT <= 0 && NXFONT_MAX7BIT >= 0 -NXFONT_DEFBITMAP(0); + NXFONT_DEFBITMAP(0); #endif #if NXFONT_MIN7BIT <= 1 && NXFONT_MAX7BIT >= 1 -NXFONT_DEFBITMAP(1); + NXFONT_DEFBITMAP(1); #endif #if NXFONT_MIN7BIT <= 2 && NXFONT_MAX7BIT >= 2 -NXFONT_DEFBITMAP(2); + NXFONT_DEFBITMAP(2); #endif #if NXFONT_MIN7BIT <= 3 && NXFONT_MAX7BIT >= 3 -NXFONT_DEFBITMAP(3); + NXFONT_DEFBITMAP(3); #endif #if NXFONT_MIN7BIT <= 4 && NXFONT_MAX7BIT >= 4 -NXFONT_DEFBITMAP(4); + NXFONT_DEFBITMAP(4); #endif #if NXFONT_MIN7BIT <= 5 && NXFONT_MAX7BIT >= 5 -NXFONT_DEFBITMAP(5); + NXFONT_DEFBITMAP(5); #endif #if NXFONT_MIN7BIT <= 6 && NXFONT_MAX7BIT >= 6 -NXFONT_DEFBITMAP(6); + NXFONT_DEFBITMAP(6); #endif #if NXFONT_MIN7BIT <= 7 && NXFONT_MAX7BIT >= 7 -NXFONT_DEFBITMAP(7); + NXFONT_DEFBITMAP(7); #endif #if NXFONT_MIN7BIT <= 8 && NXFONT_MAX7BIT >= 8 -NXFONT_DEFBITMAP(8); + NXFONT_DEFBITMAP(8); #endif #if NXFONT_MIN7BIT <= 9 && NXFONT_MAX7BIT >= 9 -NXFONT_DEFBITMAP(9); + NXFONT_DEFBITMAP(9); #endif #if NXFONT_MIN7BIT <= 10 && NXFONT_MAX7BIT >= 10 -NXFONT_DEFBITMAP(10); + NXFONT_DEFBITMAP(10); #endif #if NXFONT_MIN7BIT <= 11 && NXFONT_MAX7BIT >= 11 -NXFONT_DEFBITMAP(11); + NXFONT_DEFBITMAP(11); #endif #if NXFONT_MIN7BIT <= 12 && NXFONT_MAX7BIT >= 12 -NXFONT_DEFBITMAP(12); + NXFONT_DEFBITMAP(12); #endif #if NXFONT_MIN7BIT <= 13 && NXFONT_MAX7BIT >= 13 -NXFONT_DEFBITMAP(13); + NXFONT_DEFBITMAP(13); #endif #if NXFONT_MIN7BIT <= 14 && NXFONT_MAX7BIT >= 14 -NXFONT_DEFBITMAP(14); + NXFONT_DEFBITMAP(14); #endif #if NXFONT_MIN7BIT <= 15 && NXFONT_MAX7BIT >= 15 -NXFONT_DEFBITMAP(15); + NXFONT_DEFBITMAP(15); #endif #if NXFONT_MIN7BIT <= 16 && NXFONT_MAX7BIT >= 16 -NXFONT_DEFBITMAP(16); + NXFONT_DEFBITMAP(16); #endif #if NXFONT_MIN7BIT <= 17 && NXFONT_MAX7BIT >= 17 -NXFONT_DEFBITMAP(17); + NXFONT_DEFBITMAP(17); #endif #if NXFONT_MIN7BIT <= 18 && NXFONT_MAX7BIT >= 18 -NXFONT_DEFBITMAP(18); + NXFONT_DEFBITMAP(18); #endif #if NXFONT_MIN7BIT <= 19 && NXFONT_MAX7BIT >= 19 -NXFONT_DEFBITMAP(19); + NXFONT_DEFBITMAP(19); #endif #if NXFONT_MIN7BIT <= 20 && NXFONT_MAX7BIT >= 20 -NXFONT_DEFBITMAP(20); + NXFONT_DEFBITMAP(20); #endif #if NXFONT_MIN7BIT <= 21 && NXFONT_MAX7BIT >= 21 -NXFONT_DEFBITMAP(21); + NXFONT_DEFBITMAP(21); #endif #if NXFONT_MIN7BIT <= 22 && NXFONT_MAX7BIT >= 22 -NXFONT_DEFBITMAP(22); + NXFONT_DEFBITMAP(22); #endif #if NXFONT_MIN7BIT <= 23 && NXFONT_MAX7BIT >= 23 -NXFONT_DEFBITMAP(23); + NXFONT_DEFBITMAP(23); #endif #if NXFONT_MIN7BIT <= 24 && NXFONT_MAX7BIT >= 24 -NXFONT_DEFBITMAP(24); + NXFONT_DEFBITMAP(24); #endif #if NXFONT_MIN7BIT <= 25 && NXFONT_MAX7BIT >= 25 -NXFONT_DEFBITMAP(25); + NXFONT_DEFBITMAP(25); #endif #if NXFONT_MIN7BIT <= 26 && NXFONT_MAX7BIT >= 26 -NXFONT_DEFBITMAP(26); + NXFONT_DEFBITMAP(26); #endif #if NXFONT_MIN7BIT <= 27 && NXFONT_MAX7BIT >= 27 -NXFONT_DEFBITMAP(27); + NXFONT_DEFBITMAP(27); #endif #if NXFONT_MIN7BIT <= 28 && NXFONT_MAX7BIT >= 28 -NXFONT_DEFBITMAP(28); + NXFONT_DEFBITMAP(28); #endif #if NXFONT_MIN7BIT <= 29 && NXFONT_MAX7BIT >= 29 -NXFONT_DEFBITMAP(29); + NXFONT_DEFBITMAP(29); #endif #if NXFONT_MIN7BIT <= 30 && NXFONT_MAX7BIT >= 30 -NXFONT_DEFBITMAP(30); + NXFONT_DEFBITMAP(30); #endif #if NXFONT_MIN7BIT <= 31 && NXFONT_MAX7BIT >= 31 -NXFONT_DEFBITMAP(31); + NXFONT_DEFBITMAP(31); #endif #if NXFONT_MIN7BIT <= 32 && NXFONT_MAX7BIT >= 32 -NXFONT_DEFBITMAP(32); + NXFONT_DEFBITMAP(32); #endif #if NXFONT_MIN7BIT <= 33 && NXFONT_MAX7BIT >= 33 -NXFONT_DEFBITMAP(33); + NXFONT_DEFBITMAP(33); #endif #if NXFONT_MIN7BIT <= 34 && NXFONT_MAX7BIT >= 34 -NXFONT_DEFBITMAP(34); + NXFONT_DEFBITMAP(34); #endif #if NXFONT_MIN7BIT <= 35 && NXFONT_MAX7BIT >= 35 -NXFONT_DEFBITMAP(35); + NXFONT_DEFBITMAP(35); #endif #if NXFONT_MIN7BIT <= 36 && NXFONT_MAX7BIT >= 36 -NXFONT_DEFBITMAP(36); + NXFONT_DEFBITMAP(36); #endif #if NXFONT_MIN7BIT <= 37 && NXFONT_MAX7BIT >= 37 -NXFONT_DEFBITMAP(37); + NXFONT_DEFBITMAP(37); #endif #if NXFONT_MIN7BIT <= 38 && NXFONT_MAX7BIT >= 38 -NXFONT_DEFBITMAP(38); + NXFONT_DEFBITMAP(38); #endif #if NXFONT_MIN7BIT <= 39 && NXFONT_MAX7BIT >= 39 -NXFONT_DEFBITMAP(39); + NXFONT_DEFBITMAP(39); #endif #if NXFONT_MIN7BIT <= 40 && NXFONT_MAX7BIT >= 40 -NXFONT_DEFBITMAP(40); + NXFONT_DEFBITMAP(40); #endif #if NXFONT_MIN7BIT <= 41 && NXFONT_MAX7BIT >= 41 -NXFONT_DEFBITMAP(41); + NXFONT_DEFBITMAP(41); #endif #if NXFONT_MIN7BIT <= 42 && NXFONT_MAX7BIT >= 42 -NXFONT_DEFBITMAP(42); + NXFONT_DEFBITMAP(42); #endif #if NXFONT_MIN7BIT <= 43 && NXFONT_MAX7BIT >= 43 -NXFONT_DEFBITMAP(43); + NXFONT_DEFBITMAP(43); #endif #if NXFONT_MIN7BIT <= 44 && NXFONT_MAX7BIT >= 44 -NXFONT_DEFBITMAP(44); + NXFONT_DEFBITMAP(44); #endif #if NXFONT_MIN7BIT <= 45 && NXFONT_MAX7BIT >= 45 -NXFONT_DEFBITMAP(45); + NXFONT_DEFBITMAP(45); #endif #if NXFONT_MIN7BIT <= 46 && NXFONT_MAX7BIT >= 46 -NXFONT_DEFBITMAP(46); + NXFONT_DEFBITMAP(46); #endif #if NXFONT_MIN7BIT <= 47 && NXFONT_MAX7BIT >= 47 -NXFONT_DEFBITMAP(47); + NXFONT_DEFBITMAP(47); #endif #if NXFONT_MIN7BIT <= 48 && NXFONT_MAX7BIT >= 48 -NXFONT_DEFBITMAP(48); + NXFONT_DEFBITMAP(48); #endif #if NXFONT_MIN7BIT <= 49 && NXFONT_MAX7BIT >= 49 -NXFONT_DEFBITMAP(49); + NXFONT_DEFBITMAP(49); #endif #if NXFONT_MIN7BIT <= 50 && NXFONT_MAX7BIT >= 50 -NXFONT_DEFBITMAP(50); + NXFONT_DEFBITMAP(50); #endif #if NXFONT_MIN7BIT <= 51 && NXFONT_MAX7BIT >= 51 -NXFONT_DEFBITMAP(51); + NXFONT_DEFBITMAP(51); #endif #if NXFONT_MIN7BIT <= 52 && NXFONT_MAX7BIT >= 52 -NXFONT_DEFBITMAP(52); + NXFONT_DEFBITMAP(52); #endif #if NXFONT_MIN7BIT <= 53 && NXFONT_MAX7BIT >= 53 -NXFONT_DEFBITMAP(53); + NXFONT_DEFBITMAP(53); #endif #if NXFONT_MIN7BIT <= 54 && NXFONT_MAX7BIT >= 54 -NXFONT_DEFBITMAP(54); + NXFONT_DEFBITMAP(54); #endif #if NXFONT_MIN7BIT <= 55 && NXFONT_MAX7BIT >= 55 -NXFONT_DEFBITMAP(55); + NXFONT_DEFBITMAP(55); #endif #if NXFONT_MIN7BIT <= 56 && NXFONT_MAX7BIT >= 56 -NXFONT_DEFBITMAP(56); + NXFONT_DEFBITMAP(56); #endif #if NXFONT_MIN7BIT <= 57 && NXFONT_MAX7BIT >= 57 -NXFONT_DEFBITMAP(57); + NXFONT_DEFBITMAP(57); #endif #if NXFONT_MIN7BIT <= 58 && NXFONT_MAX7BIT >= 58 -NXFONT_DEFBITMAP(58); + NXFONT_DEFBITMAP(58); #endif #if NXFONT_MIN7BIT <= 59 && NXFONT_MAX7BIT >= 59 -NXFONT_DEFBITMAP(59); + NXFONT_DEFBITMAP(59); #endif #if NXFONT_MIN7BIT <= 60 && NXFONT_MAX7BIT >= 60 -NXFONT_DEFBITMAP(60); + NXFONT_DEFBITMAP(60); #endif #if NXFONT_MIN7BIT <= 61 && NXFONT_MAX7BIT >= 61 -NXFONT_DEFBITMAP(61); + NXFONT_DEFBITMAP(61); #endif #if NXFONT_MIN7BIT <= 62 && NXFONT_MAX7BIT >= 62 -NXFONT_DEFBITMAP(62); + NXFONT_DEFBITMAP(62); #endif #if NXFONT_MIN7BIT <= 63 && NXFONT_MAX7BIT >= 63 -NXFONT_DEFBITMAP(63); + NXFONT_DEFBITMAP(63); #endif #if NXFONT_MIN7BIT <= 64 && NXFONT_MAX7BIT >= 64 -NXFONT_DEFBITMAP(64); + NXFONT_DEFBITMAP(64); #endif #if NXFONT_MIN7BIT <= 65 && NXFONT_MAX7BIT >= 65 -NXFONT_DEFBITMAP(65); + NXFONT_DEFBITMAP(65); #endif #if NXFONT_MIN7BIT <= 66 && NXFONT_MAX7BIT >= 66 -NXFONT_DEFBITMAP(66); + NXFONT_DEFBITMAP(66); #endif #if NXFONT_MIN7BIT <= 67 && NXFONT_MAX7BIT >= 67 -NXFONT_DEFBITMAP(67); + NXFONT_DEFBITMAP(67); #endif #if NXFONT_MIN7BIT <= 68 && NXFONT_MAX7BIT >= 68 -NXFONT_DEFBITMAP(68); + NXFONT_DEFBITMAP(68); #endif #if NXFONT_MIN7BIT <= 69 && NXFONT_MAX7BIT >= 69 -NXFONT_DEFBITMAP(69); + NXFONT_DEFBITMAP(69); #endif #if NXFONT_MIN7BIT <= 70 && NXFONT_MAX7BIT >= 70 -NXFONT_DEFBITMAP(70); + NXFONT_DEFBITMAP(70); #endif #if NXFONT_MIN7BIT <= 71 && NXFONT_MAX7BIT >= 71 -NXFONT_DEFBITMAP(71); + NXFONT_DEFBITMAP(71); #endif #if NXFONT_MIN7BIT <= 72 && NXFONT_MAX7BIT >= 72 -NXFONT_DEFBITMAP(72); + NXFONT_DEFBITMAP(72); #endif #if NXFONT_MIN7BIT <= 73 && NXFONT_MAX7BIT >= 73 -NXFONT_DEFBITMAP(73); + NXFONT_DEFBITMAP(73); #endif #if NXFONT_MIN7BIT <= 74 && NXFONT_MAX7BIT >= 74 -NXFONT_DEFBITMAP(74); + NXFONT_DEFBITMAP(74); #endif #if NXFONT_MIN7BIT <= 75 && NXFONT_MAX7BIT >= 75 -NXFONT_DEFBITMAP(75); + NXFONT_DEFBITMAP(75); #endif #if NXFONT_MIN7BIT <= 76 && NXFONT_MAX7BIT >= 76 -NXFONT_DEFBITMAP(76); + NXFONT_DEFBITMAP(76); #endif #if NXFONT_MIN7BIT <= 77 && NXFONT_MAX7BIT >= 77 -NXFONT_DEFBITMAP(77); + NXFONT_DEFBITMAP(77); #endif #if NXFONT_MIN7BIT <= 78 && NXFONT_MAX7BIT >= 78 -NXFONT_DEFBITMAP(78); + NXFONT_DEFBITMAP(78); #endif #if NXFONT_MIN7BIT <= 79 && NXFONT_MAX7BIT >= 79 -NXFONT_DEFBITMAP(79); + NXFONT_DEFBITMAP(79); #endif #if NXFONT_MIN7BIT <= 80 && NXFONT_MAX7BIT >= 80 -NXFONT_DEFBITMAP(80); + NXFONT_DEFBITMAP(80); #endif #if NXFONT_MIN7BIT <= 81 && NXFONT_MAX7BIT >= 81 -NXFONT_DEFBITMAP(81); + NXFONT_DEFBITMAP(81); #endif #if NXFONT_MIN7BIT <= 82 && NXFONT_MAX7BIT >= 82 -NXFONT_DEFBITMAP(82); + NXFONT_DEFBITMAP(82); #endif #if NXFONT_MIN7BIT <= 83 && NXFONT_MAX7BIT >= 83 -NXFONT_DEFBITMAP(83); + NXFONT_DEFBITMAP(83); #endif #if NXFONT_MIN7BIT <= 84 && NXFONT_MAX7BIT >= 84 -NXFONT_DEFBITMAP(84); + NXFONT_DEFBITMAP(84); #endif #if NXFONT_MIN7BIT <= 85 && NXFONT_MAX7BIT >= 85 -NXFONT_DEFBITMAP(85); + NXFONT_DEFBITMAP(85); #endif #if NXFONT_MIN7BIT <= 86 && NXFONT_MAX7BIT >= 86 -NXFONT_DEFBITMAP(86); + NXFONT_DEFBITMAP(86); #endif #if NXFONT_MIN7BIT <= 87 && NXFONT_MAX7BIT >= 87 -NXFONT_DEFBITMAP(87); + NXFONT_DEFBITMAP(87); #endif #if NXFONT_MIN7BIT <= 88 && NXFONT_MAX7BIT >= 88 -NXFONT_DEFBITMAP(88); + NXFONT_DEFBITMAP(88); #endif #if NXFONT_MIN7BIT <= 89 && NXFONT_MAX7BIT >= 89 -NXFONT_DEFBITMAP(89); + NXFONT_DEFBITMAP(89); #endif #if NXFONT_MIN7BIT <= 90 && NXFONT_MAX7BIT >= 90 -NXFONT_DEFBITMAP(90); + NXFONT_DEFBITMAP(90); #endif #if NXFONT_MIN7BIT <= 91 && NXFONT_MAX7BIT >= 91 -NXFONT_DEFBITMAP(91); + NXFONT_DEFBITMAP(91); #endif #if NXFONT_MIN7BIT <= 92 && NXFONT_MAX7BIT >= 92 -NXFONT_DEFBITMAP(92); + NXFONT_DEFBITMAP(92); #endif #if NXFONT_MIN7BIT <= 93 && NXFONT_MAX7BIT >= 93 -NXFONT_DEFBITMAP(93); + NXFONT_DEFBITMAP(93); #endif #if NXFONT_MIN7BIT <= 94 && NXFONT_MAX7BIT >= 94 -NXFONT_DEFBITMAP(94); + NXFONT_DEFBITMAP(94); #endif #if NXFONT_MIN7BIT <= 95 && NXFONT_MAX7BIT >= 95 -NXFONT_DEFBITMAP(95); + NXFONT_DEFBITMAP(95); #endif #if NXFONT_MIN7BIT <= 96 && NXFONT_MAX7BIT >= 96 -NXFONT_DEFBITMAP(96); + NXFONT_DEFBITMAP(96); #endif #if NXFONT_MIN7BIT <= 97 && NXFONT_MAX7BIT >= 97 -NXFONT_DEFBITMAP(97); + NXFONT_DEFBITMAP(97); #endif #if NXFONT_MIN7BIT <= 98 && NXFONT_MAX7BIT >= 98 -NXFONT_DEFBITMAP(98); + NXFONT_DEFBITMAP(98); #endif #if NXFONT_MIN7BIT <= 99 && NXFONT_MAX7BIT >= 99 -NXFONT_DEFBITMAP(99); + NXFONT_DEFBITMAP(99); #endif #if NXFONT_MIN7BIT <= 100 && NXFONT_MAX7BIT >= 100 -NXFONT_DEFBITMAP(100); + NXFONT_DEFBITMAP(100); #endif #if NXFONT_MIN7BIT <= 101 && NXFONT_MAX7BIT >= 101 -NXFONT_DEFBITMAP(101); + NXFONT_DEFBITMAP(101); #endif #if NXFONT_MIN7BIT <= 102 && NXFONT_MAX7BIT >= 102 -NXFONT_DEFBITMAP(102); + NXFONT_DEFBITMAP(102); #endif #if NXFONT_MIN7BIT <= 103 && NXFONT_MAX7BIT >= 103 -NXFONT_DEFBITMAP(103); + NXFONT_DEFBITMAP(103); #endif #if NXFONT_MIN7BIT <= 104 && NXFONT_MAX7BIT >= 104 -NXFONT_DEFBITMAP(104); + NXFONT_DEFBITMAP(104); #endif #if NXFONT_MIN7BIT <= 105 && NXFONT_MAX7BIT >= 105 -NXFONT_DEFBITMAP(105); + NXFONT_DEFBITMAP(105); #endif #if NXFONT_MIN7BIT <= 106 && NXFONT_MAX7BIT >= 106 -NXFONT_DEFBITMAP(106); + NXFONT_DEFBITMAP(106); #endif #if NXFONT_MIN7BIT <= 107 && NXFONT_MAX7BIT >= 107 -NXFONT_DEFBITMAP(107); + NXFONT_DEFBITMAP(107); #endif #if NXFONT_MIN7BIT <= 108 && NXFONT_MAX7BIT >= 108 -NXFONT_DEFBITMAP(108); + NXFONT_DEFBITMAP(108); #endif #if NXFONT_MIN7BIT <= 109 && NXFONT_MAX7BIT >= 109 -NXFONT_DEFBITMAP(109); + NXFONT_DEFBITMAP(109); #endif #if NXFONT_MIN7BIT <= 110 && NXFONT_MAX7BIT >= 110 -NXFONT_DEFBITMAP(110); + NXFONT_DEFBITMAP(110); #endif #if NXFONT_MIN7BIT <= 111 && NXFONT_MAX7BIT >= 111 -NXFONT_DEFBITMAP(111); + NXFONT_DEFBITMAP(111); #endif #if NXFONT_MIN7BIT <= 112 && NXFONT_MAX7BIT >= 112 -NXFONT_DEFBITMAP(112); + NXFONT_DEFBITMAP(112); #endif #if NXFONT_MIN7BIT <= 113 && NXFONT_MAX7BIT >= 113 -NXFONT_DEFBITMAP(113); + NXFONT_DEFBITMAP(113); #endif #if NXFONT_MIN7BIT <= 114 && NXFONT_MAX7BIT >= 114 -NXFONT_DEFBITMAP(114); + NXFONT_DEFBITMAP(114); #endif #if NXFONT_MIN7BIT <= 115 && NXFONT_MAX7BIT >= 115 -NXFONT_DEFBITMAP(115); + NXFONT_DEFBITMAP(115); #endif #if NXFONT_MIN7BIT <= 116 && NXFONT_MAX7BIT >= 116 -NXFONT_DEFBITMAP(116); + NXFONT_DEFBITMAP(116); #endif #if NXFONT_MIN7BIT <= 117 && NXFONT_MAX7BIT >= 117 -NXFONT_DEFBITMAP(117); + NXFONT_DEFBITMAP(117); #endif #if NXFONT_MIN7BIT <= 118 && NXFONT_MAX7BIT >= 118 -NXFONT_DEFBITMAP(118); + NXFONT_DEFBITMAP(118); #endif #if NXFONT_MIN7BIT <= 119 && NXFONT_MAX7BIT >= 119 -NXFONT_DEFBITMAP(119); + NXFONT_DEFBITMAP(119); #endif #if NXFONT_MIN7BIT <= 120 && NXFONT_MAX7BIT >= 120 -NXFONT_DEFBITMAP(120); + NXFONT_DEFBITMAP(120); #endif #if NXFONT_MIN7BIT <= 121 && NXFONT_MAX7BIT >= 121 -NXFONT_DEFBITMAP(121); + NXFONT_DEFBITMAP(121); #endif #if NXFONT_MIN7BIT <= 122 && NXFONT_MAX7BIT >= 122 -NXFONT_DEFBITMAP(122); + NXFONT_DEFBITMAP(122); #endif #if NXFONT_MIN7BIT <= 123 && NXFONT_MAX7BIT >= 123 -NXFONT_DEFBITMAP(123); + NXFONT_DEFBITMAP(123); #endif #if NXFONT_MIN7BIT <= 124 && NXFONT_MAX7BIT >= 124 -NXFONT_DEFBITMAP(124); + NXFONT_DEFBITMAP(124); #endif #if NXFONT_MIN7BIT <= 125 && NXFONT_MAX7BIT >= 125 -NXFONT_DEFBITMAP(125); + NXFONT_DEFBITMAP(125); #endif #if NXFONT_MIN7BIT <= 126 && NXFONT_MAX7BIT >= 126 -NXFONT_DEFBITMAP(126); + NXFONT_DEFBITMAP(126); #endif #if NXFONT_MIN7BIT <= 127 && NXFONT_MAX7BIT >= 127 -NXFONT_DEFBITMAP(127); + NXFONT_DEFBITMAP(127); #endif #if CONFIG_NXFONTS_CHARBITS >= 8 #if NXFONT_MIN8BIT <= 128 && NXFONT_MAX8BIT >= 128 -NXFONT_DEFBITMAP(128); + NXFONT_DEFBITMAP(128); #endif #if NXFONT_MIN8BIT <= 129 && NXFONT_MAX8BIT >= 129 -NXFONT_DEFBITMAP(129); + NXFONT_DEFBITMAP(129); #endif #if NXFONT_MIN8BIT <= 130 && NXFONT_MAX8BIT >= 130 -NXFONT_DEFBITMAP(130); + NXFONT_DEFBITMAP(130); #endif #if NXFONT_MIN8BIT <= 131 && NXFONT_MAX8BIT >= 131 -NXFONT_DEFBITMAP(131); + NXFONT_DEFBITMAP(131); #endif #if NXFONT_MIN8BIT <= 132 && NXFONT_MAX8BIT >= 132 -NXFONT_DEFBITMAP(132); + NXFONT_DEFBITMAP(132); #endif #if NXFONT_MIN8BIT <= 133 && NXFONT_MAX8BIT >= 133 -NXFONT_DEFBITMAP(133); + NXFONT_DEFBITMAP(133); #endif #if NXFONT_MIN8BIT <= 134 && NXFONT_MAX8BIT >= 134 -NXFONT_DEFBITMAP(134); + NXFONT_DEFBITMAP(134); #endif #if NXFONT_MIN8BIT <= 135 && NXFONT_MAX8BIT >= 135 -NXFONT_DEFBITMAP(135); + NXFONT_DEFBITMAP(135); #endif #if NXFONT_MIN8BIT <= 136 && NXFONT_MAX8BIT >= 136 -NXFONT_DEFBITMAP(136); + NXFONT_DEFBITMAP(136); #endif #if NXFONT_MIN8BIT <= 137 && NXFONT_MAX8BIT >= 137 -NXFONT_DEFBITMAP(137); + NXFONT_DEFBITMAP(137); #endif #if NXFONT_MIN8BIT <= 138 && NXFONT_MAX8BIT >= 138 -NXFONT_DEFBITMAP(138); + NXFONT_DEFBITMAP(138); #endif #if NXFONT_MIN8BIT <= 139 && NXFONT_MAX8BIT >= 139 -NXFONT_DEFBITMAP(139); + NXFONT_DEFBITMAP(139); #endif #if NXFONT_MIN8BIT <= 140 && NXFONT_MAX8BIT >= 140 -NXFONT_DEFBITMAP(140); + NXFONT_DEFBITMAP(140); #endif #if NXFONT_MIN8BIT <= 141 && NXFONT_MAX8BIT >= 141 -NXFONT_DEFBITMAP(141); + NXFONT_DEFBITMAP(141); #endif #if NXFONT_MIN8BIT <= 142 && NXFONT_MAX8BIT >= 142 -NXFONT_DEFBITMAP(142); + NXFONT_DEFBITMAP(142); #endif #if NXFONT_MIN8BIT <= 143 && NXFONT_MAX8BIT >= 143 -NXFONT_DEFBITMAP(143); + NXFONT_DEFBITMAP(143); #endif #if NXFONT_MIN8BIT <= 144 && NXFONT_MAX8BIT >= 144 -NXFONT_DEFBITMAP(144); + NXFONT_DEFBITMAP(144); #endif #if NXFONT_MIN8BIT <= 145 && NXFONT_MAX8BIT >= 145 -NXFONT_DEFBITMAP(145); + NXFONT_DEFBITMAP(145); #endif #if NXFONT_MIN8BIT <= 146 && NXFONT_MAX8BIT >= 146 -NXFONT_DEFBITMAP(146); + NXFONT_DEFBITMAP(146); #endif #if NXFONT_MIN8BIT <= 147 && NXFONT_MAX8BIT >= 147 -NXFONT_DEFBITMAP(147); + NXFONT_DEFBITMAP(147); #endif #if NXFONT_MIN8BIT <= 148 && NXFONT_MAX8BIT >= 148 -NXFONT_DEFBITMAP(148); + NXFONT_DEFBITMAP(148); #endif #if NXFONT_MIN8BIT <= 149 && NXFONT_MAX8BIT >= 149 -NXFONT_DEFBITMAP(149); + NXFONT_DEFBITMAP(149); #endif #if NXFONT_MIN8BIT <= 150 && NXFONT_MAX8BIT >= 150 -NXFONT_DEFBITMAP(150); + NXFONT_DEFBITMAP(150); #endif #if NXFONT_MIN8BIT <= 151 && NXFONT_MAX8BIT >= 151 -NXFONT_DEFBITMAP(151); + NXFONT_DEFBITMAP(151); #endif #if NXFONT_MIN8BIT <= 152 && NXFONT_MAX8BIT >= 152 -NXFONT_DEFBITMAP(152); + NXFONT_DEFBITMAP(152); #endif #if NXFONT_MIN8BIT <= 153 && NXFONT_MAX8BIT >= 153 -NXFONT_DEFBITMAP(153); + NXFONT_DEFBITMAP(153); #endif #if NXFONT_MIN8BIT <= 154 && NXFONT_MAX8BIT >= 154 -NXFONT_DEFBITMAP(154); + NXFONT_DEFBITMAP(154); #endif #if NXFONT_MIN8BIT <= 155 && NXFONT_MAX8BIT >= 155 -NXFONT_DEFBITMAP(155); + NXFONT_DEFBITMAP(155); #endif #if NXFONT_MIN8BIT <= 156 && NXFONT_MAX8BIT >= 156 -NXFONT_DEFBITMAP(156); + NXFONT_DEFBITMAP(156); #endif #if NXFONT_MIN8BIT <= 157 && NXFONT_MAX8BIT >= 157 -NXFONT_DEFBITMAP(157); + NXFONT_DEFBITMAP(157); #endif #if NXFONT_MIN8BIT <= 158 && NXFONT_MAX8BIT >= 158 -NXFONT_DEFBITMAP(158); + NXFONT_DEFBITMAP(158); #endif #if NXFONT_MIN8BIT <= 159 && NXFONT_MAX8BIT >= 159 -NXFONT_DEFBITMAP(159); + NXFONT_DEFBITMAP(159); #endif #if NXFONT_MIN8BIT <= 160 && NXFONT_MAX8BIT >= 160 -NXFONT_DEFBITMAP(160); + NXFONT_DEFBITMAP(160); #endif #if NXFONT_MIN8BIT <= 161 && NXFONT_MAX8BIT >= 161 -NXFONT_DEFBITMAP(161); + NXFONT_DEFBITMAP(161); #endif #if NXFONT_MIN8BIT <= 162 && NXFONT_MAX8BIT >= 162 -NXFONT_DEFBITMAP(162); + NXFONT_DEFBITMAP(162); #endif #if NXFONT_MIN8BIT <= 163 && NXFONT_MAX8BIT >= 163 -NXFONT_DEFBITMAP(163); + NXFONT_DEFBITMAP(163); #endif #if NXFONT_MIN8BIT <= 164 && NXFONT_MAX8BIT >= 164 -NXFONT_DEFBITMAP(164); + NXFONT_DEFBITMAP(164); #endif #if NXFONT_MIN8BIT <= 165 && NXFONT_MAX8BIT >= 165 -NXFONT_DEFBITMAP(165); + NXFONT_DEFBITMAP(165); #endif #if NXFONT_MIN8BIT <= 166 && NXFONT_MAX8BIT >= 166 -NXFONT_DEFBITMAP(166); + NXFONT_DEFBITMAP(166); #endif #if NXFONT_MIN8BIT <= 167 && NXFONT_MAX8BIT >= 167 -NXFONT_DEFBITMAP(167); + NXFONT_DEFBITMAP(167); #endif #if NXFONT_MIN8BIT <= 168 && NXFONT_MAX8BIT >= 168 -NXFONT_DEFBITMAP(168); + NXFONT_DEFBITMAP(168); #endif #if NXFONT_MIN8BIT <= 169 && NXFONT_MAX8BIT >= 169 -NXFONT_DEFBITMAP(169); + NXFONT_DEFBITMAP(169); #endif #if NXFONT_MIN8BIT <= 170 && NXFONT_MAX8BIT >= 170 -NXFONT_DEFBITMAP(170); + NXFONT_DEFBITMAP(170); #endif #if NXFONT_MIN8BIT <= 171 && NXFONT_MAX8BIT >= 171 -NXFONT_DEFBITMAP(171); + NXFONT_DEFBITMAP(171); #endif #if NXFONT_MIN8BIT <= 172 && NXFONT_MAX8BIT >= 172 -NXFONT_DEFBITMAP(172); + NXFONT_DEFBITMAP(172); #endif #if NXFONT_MIN8BIT <= 173 && NXFONT_MAX8BIT >= 173 -NXFONT_DEFBITMAP(173); + NXFONT_DEFBITMAP(173); #endif #if NXFONT_MIN8BIT <= 174 && NXFONT_MAX8BIT >= 174 -NXFONT_DEFBITMAP(174); + NXFONT_DEFBITMAP(174); #endif #if NXFONT_MIN8BIT <= 175 && NXFONT_MAX8BIT >= 175 -NXFONT_DEFBITMAP(175); + NXFONT_DEFBITMAP(175); #endif #if NXFONT_MIN8BIT <= 176 && NXFONT_MAX8BIT >= 176 -NXFONT_DEFBITMAP(176); + NXFONT_DEFBITMAP(176); #endif #if NXFONT_MIN8BIT <= 177 && NXFONT_MAX8BIT >= 177 -NXFONT_DEFBITMAP(177); + NXFONT_DEFBITMAP(177); #endif #if NXFONT_MIN8BIT <= 178 && NXFONT_MAX8BIT >= 178 -NXFONT_DEFBITMAP(178); + NXFONT_DEFBITMAP(178); #endif #if NXFONT_MIN8BIT <= 179 && NXFONT_MAX8BIT >= 179 -NXFONT_DEFBITMAP(179); + NXFONT_DEFBITMAP(179); #endif #if NXFONT_MIN8BIT <= 180 && NXFONT_MAX8BIT >= 180 -NXFONT_DEFBITMAP(180); + NXFONT_DEFBITMAP(180); #endif #if NXFONT_MIN8BIT <= 181 && NXFONT_MAX8BIT >= 181 -NXFONT_DEFBITMAP(181); + NXFONT_DEFBITMAP(181); #endif #if NXFONT_MIN8BIT <= 182 && NXFONT_MAX8BIT >= 182 -NXFONT_DEFBITMAP(182); + NXFONT_DEFBITMAP(182); #endif #if NXFONT_MIN8BIT <= 183 && NXFONT_MAX8BIT >= 183 -NXFONT_DEFBITMAP(183); + NXFONT_DEFBITMAP(183); #endif #if NXFONT_MIN8BIT <= 184 && NXFONT_MAX8BIT >= 184 -NXFONT_DEFBITMAP(184); + NXFONT_DEFBITMAP(184); #endif #if NXFONT_MIN8BIT <= 185 && NXFONT_MAX8BIT >= 185 -NXFONT_DEFBITMAP(185); + NXFONT_DEFBITMAP(185); #endif #if NXFONT_MIN8BIT <= 186 && NXFONT_MAX8BIT >= 186 -NXFONT_DEFBITMAP(186); + NXFONT_DEFBITMAP(186); #endif #if NXFONT_MIN8BIT <= 187 && NXFONT_MAX8BIT >= 187 -NXFONT_DEFBITMAP(187); + NXFONT_DEFBITMAP(187); #endif #if NXFONT_MIN8BIT <= 188 && NXFONT_MAX8BIT >= 188 -NXFONT_DEFBITMAP(188); + NXFONT_DEFBITMAP(188); #endif #if NXFONT_MIN8BIT <= 189 && NXFONT_MAX8BIT >= 189 -NXFONT_DEFBITMAP(189); + NXFONT_DEFBITMAP(189); #endif #if NXFONT_MIN8BIT <= 190 && NXFONT_MAX8BIT >= 190 -NXFONT_DEFBITMAP(190); + NXFONT_DEFBITMAP(190); #endif #if NXFONT_MIN8BIT <= 191 && NXFONT_MAX8BIT >= 191 -NXFONT_DEFBITMAP(191); + NXFONT_DEFBITMAP(191); #endif #if NXFONT_MIN8BIT <= 192 && NXFONT_MAX8BIT >= 192 -NXFONT_DEFBITMAP(192); + NXFONT_DEFBITMAP(192); #endif #if NXFONT_MIN8BIT <= 193 && NXFONT_MAX8BIT >= 193 -NXFONT_DEFBITMAP(193); + NXFONT_DEFBITMAP(193); #endif #if NXFONT_MIN8BIT <= 194 && NXFONT_MAX8BIT >= 194 -NXFONT_DEFBITMAP(194); + NXFONT_DEFBITMAP(194); #endif #if NXFONT_MIN8BIT <= 195 && NXFONT_MAX8BIT >= 195 -NXFONT_DEFBITMAP(195); + NXFONT_DEFBITMAP(195); #endif #if NXFONT_MIN8BIT <= 196 && NXFONT_MAX8BIT >= 196 -NXFONT_DEFBITMAP(196); + NXFONT_DEFBITMAP(196); #endif #if NXFONT_MIN8BIT <= 197 && NXFONT_MAX8BIT >= 197 -NXFONT_DEFBITMAP(197); + NXFONT_DEFBITMAP(197); #endif #if NXFONT_MIN8BIT <= 198 && NXFONT_MAX8BIT >= 198 -NXFONT_DEFBITMAP(198); + NXFONT_DEFBITMAP(198); #endif #if NXFONT_MIN8BIT <= 199 && NXFONT_MAX8BIT >= 199 -NXFONT_DEFBITMAP(199); + NXFONT_DEFBITMAP(199); #endif #if NXFONT_MIN8BIT <= 200 && NXFONT_MAX8BIT >= 200 -NXFONT_DEFBITMAP(200); + NXFONT_DEFBITMAP(200); #endif #if NXFONT_MIN8BIT <= 201 && NXFONT_MAX8BIT >= 201 -NXFONT_DEFBITMAP(201); + NXFONT_DEFBITMAP(201); #endif #if NXFONT_MIN8BIT <= 202 && NXFONT_MAX8BIT >= 202 -NXFONT_DEFBITMAP(202); + NXFONT_DEFBITMAP(202); #endif #if NXFONT_MIN8BIT <= 203 && NXFONT_MAX8BIT >= 203 -NXFONT_DEFBITMAP(203); + NXFONT_DEFBITMAP(203); #endif #if NXFONT_MIN8BIT <= 204 && NXFONT_MAX8BIT >= 204 -NXFONT_DEFBITMAP(204); + NXFONT_DEFBITMAP(204); #endif #if NXFONT_MIN8BIT <= 205 && NXFONT_MAX8BIT >= 205 -NXFONT_DEFBITMAP(205); + NXFONT_DEFBITMAP(205); #endif #if NXFONT_MIN8BIT <= 206 && NXFONT_MAX8BIT >= 206 -NXFONT_DEFBITMAP(206); + NXFONT_DEFBITMAP(206); #endif #if NXFONT_MIN8BIT <= 207 && NXFONT_MAX8BIT >= 207 -NXFONT_DEFBITMAP(207); + NXFONT_DEFBITMAP(207); #endif #if NXFONT_MIN8BIT <= 208 && NXFONT_MAX8BIT >= 208 -NXFONT_DEFBITMAP(208); + NXFONT_DEFBITMAP(208); #endif #if NXFONT_MIN8BIT <= 209 && NXFONT_MAX8BIT >= 209 -NXFONT_DEFBITMAP(209); + NXFONT_DEFBITMAP(209); #endif #if NXFONT_MIN8BIT <= 210 && NXFONT_MAX8BIT >= 210 -NXFONT_DEFBITMAP(210); + NXFONT_DEFBITMAP(210); #endif #if NXFONT_MIN8BIT <= 211 && NXFONT_MAX8BIT >= 211 -NXFONT_DEFBITMAP(211); + NXFONT_DEFBITMAP(211); #endif #if NXFONT_MIN8BIT <= 212 && NXFONT_MAX8BIT >= 212 -NXFONT_DEFBITMAP(212); + NXFONT_DEFBITMAP(212); #endif #if NXFONT_MIN8BIT <= 213 && NXFONT_MAX8BIT >= 213 -NXFONT_DEFBITMAP(213); + NXFONT_DEFBITMAP(213); #endif #if NXFONT_MIN8BIT <= 214 && NXFONT_MAX8BIT >= 214 -NXFONT_DEFBITMAP(214); + NXFONT_DEFBITMAP(214); #endif #if NXFONT_MIN8BIT <= 215 && NXFONT_MAX8BIT >= 215 -NXFONT_DEFBITMAP(215); + NXFONT_DEFBITMAP(215); #endif #if NXFONT_MIN8BIT <= 216 && NXFONT_MAX8BIT >= 216 -NXFONT_DEFBITMAP(216); + NXFONT_DEFBITMAP(216); #endif #if NXFONT_MIN8BIT <= 217 && NXFONT_MAX8BIT >= 217 -NXFONT_DEFBITMAP(217); + NXFONT_DEFBITMAP(217); #endif #if NXFONT_MIN8BIT <= 218 && NXFONT_MAX8BIT >= 218 -NXFONT_DEFBITMAP(218); + NXFONT_DEFBITMAP(218); #endif #if NXFONT_MIN8BIT <= 219 && NXFONT_MAX8BIT >= 219 -NXFONT_DEFBITMAP(219); + NXFONT_DEFBITMAP(219); #endif #if NXFONT_MIN8BIT <= 220 && NXFONT_MAX8BIT >= 220 -NXFONT_DEFBITMAP(220); + NXFONT_DEFBITMAP(220); #endif #if NXFONT_MIN8BIT <= 221 && NXFONT_MAX8BIT >= 221 -NXFONT_DEFBITMAP(221); + NXFONT_DEFBITMAP(221); #endif #if NXFONT_MIN8BIT <= 222 && NXFONT_MAX8BIT >= 222 -NXFONT_DEFBITMAP(222); + NXFONT_DEFBITMAP(222); #endif #if NXFONT_MIN8BIT <= 223 && NXFONT_MAX8BIT >= 223 -NXFONT_DEFBITMAP(223); + NXFONT_DEFBITMAP(223); #endif #if NXFONT_MIN8BIT <= 224 && NXFONT_MAX8BIT >= 224 -NXFONT_DEFBITMAP(224); + NXFONT_DEFBITMAP(224); #endif #if NXFONT_MIN8BIT <= 225 && NXFONT_MAX8BIT >= 225 -NXFONT_DEFBITMAP(225); + NXFONT_DEFBITMAP(225); #endif #if NXFONT_MIN8BIT <= 226 && NXFONT_MAX8BIT >= 226 -NXFONT_DEFBITMAP(226); + NXFONT_DEFBITMAP(226); #endif #if NXFONT_MIN8BIT <= 227 && NXFONT_MAX8BIT >= 227 -NXFONT_DEFBITMAP(227); + NXFONT_DEFBITMAP(227); #endif #if NXFONT_MIN8BIT <= 228 && NXFONT_MAX8BIT >= 228 -NXFONT_DEFBITMAP(228); + NXFONT_DEFBITMAP(228); #endif #if NXFONT_MIN8BIT <= 229 && NXFONT_MAX8BIT >= 229 -NXFONT_DEFBITMAP(229); + NXFONT_DEFBITMAP(229); #endif #if NXFONT_MIN8BIT <= 230 && NXFONT_MAX8BIT >= 230 -NXFONT_DEFBITMAP(230); + NXFONT_DEFBITMAP(230); #endif #if NXFONT_MIN8BIT <= 231 && NXFONT_MAX8BIT >= 231 -NXFONT_DEFBITMAP(231); + NXFONT_DEFBITMAP(231); #endif #if NXFONT_MIN8BIT <= 232 && NXFONT_MAX8BIT >= 232 -NXFONT_DEFBITMAP(232); + NXFONT_DEFBITMAP(232); #endif #if NXFONT_MIN8BIT <= 233 && NXFONT_MAX8BIT >= 233 -NXFONT_DEFBITMAP(233); + NXFONT_DEFBITMAP(233); #endif #if NXFONT_MIN8BIT <= 234 && NXFONT_MAX8BIT >= 234 -NXFONT_DEFBITMAP(234); + NXFONT_DEFBITMAP(234); #endif #if NXFONT_MIN8BIT <= 235 && NXFONT_MAX8BIT >= 235 -NXFONT_DEFBITMAP(235); + NXFONT_DEFBITMAP(235); #endif #if NXFONT_MIN8BIT <= 236 && NXFONT_MAX8BIT >= 236 -NXFONT_DEFBITMAP(236); + NXFONT_DEFBITMAP(236); #endif #if NXFONT_MIN8BIT <= 237 && NXFONT_MAX8BIT >= 237 -NXFONT_DEFBITMAP(237); + NXFONT_DEFBITMAP(237); #endif #if NXFONT_MIN8BIT <= 238 && NXFONT_MAX8BIT >= 238 -NXFONT_DEFBITMAP(238); + NXFONT_DEFBITMAP(238); #endif #if NXFONT_MIN8BIT <= 239 && NXFONT_MAX8BIT >= 239 -NXFONT_DEFBITMAP(239); + NXFONT_DEFBITMAP(239); #endif #if NXFONT_MIN8BIT <= 240 && NXFONT_MAX8BIT >= 240 -NXFONT_DEFBITMAP(240); + NXFONT_DEFBITMAP(240); #endif #if NXFONT_MIN8BIT <= 241 && NXFONT_MAX8BIT >= 241 -NXFONT_DEFBITMAP(241); + NXFONT_DEFBITMAP(241); #endif #if NXFONT_MIN8BIT <= 242 && NXFONT_MAX8BIT >= 242 -NXFONT_DEFBITMAP(242); + NXFONT_DEFBITMAP(242); #endif #if NXFONT_MIN8BIT <= 243 && NXFONT_MAX8BIT >= 243 -NXFONT_DEFBITMAP(243); + NXFONT_DEFBITMAP(243); #endif #if NXFONT_MIN8BIT <= 244 && NXFONT_MAX8BIT >= 244 -NXFONT_DEFBITMAP(244); + NXFONT_DEFBITMAP(244); #endif #if NXFONT_MIN8BIT <= 245 && NXFONT_MAX8BIT >= 245 -NXFONT_DEFBITMAP(245); + NXFONT_DEFBITMAP(245); #endif #if NXFONT_MIN8BIT <= 246 && NXFONT_MAX8BIT >= 246 -NXFONT_DEFBITMAP(246); + NXFONT_DEFBITMAP(246); #endif #if NXFONT_MIN8BIT <= 247 && NXFONT_MAX8BIT >= 247 -NXFONT_DEFBITMAP(247); + NXFONT_DEFBITMAP(247); #endif #if NXFONT_MIN8BIT <= 248 && NXFONT_MAX8BIT >= 248 -NXFONT_DEFBITMAP(248); + NXFONT_DEFBITMAP(248); #endif #if NXFONT_MIN8BIT <= 249 && NXFONT_MAX8BIT >= 249 -NXFONT_DEFBITMAP(249); + NXFONT_DEFBITMAP(249); #endif #if NXFONT_MIN8BIT <= 250 && NXFONT_MAX8BIT >= 250 -NXFONT_DEFBITMAP(250); + NXFONT_DEFBITMAP(250); #endif #if NXFONT_MIN8BIT <= 251 && NXFONT_MAX8BIT >= 251 -NXFONT_DEFBITMAP(251); + NXFONT_DEFBITMAP(251); #endif #if NXFONT_MIN8BIT <= 252 && NXFONT_MAX8BIT >= 252 -NXFONT_DEFBITMAP(252); + NXFONT_DEFBITMAP(252); #endif #if NXFONT_MIN8BIT <= 253 && NXFONT_MAX8BIT >= 253 -NXFONT_DEFBITMAP(253); + NXFONT_DEFBITMAP(253); #endif #if NXFONT_MIN8BIT <= 254 && NXFONT_MAX8BIT >= 254 -NXFONT_DEFBITMAP(254); + NXFONT_DEFBITMAP(254); #endif #if NXFONT_MIN8BIT <= 255 && NXFONT_MAX8BIT >= 255 -NXFONT_DEFBITMAP(255); + NXFONT_DEFBITMAP(255); #endif #endif -static const struct nx_fontbitmap_s NXF_SYMNAME(NXFONTS_PREFIX,7bitmaps)[NXFONT_N7BITFONTS] = +static const struct +nx_fontbitmap_s NXF_SYMNAME(NXFONTS_PREFIX, 7bitmaps)[NXFONT_N7BITFONTS] = { #if NXFONT_MIN7BIT <= 0 && NXFONT_MAX7BIT >= 0 -NXFONT_DEFMETRIC(0), + NXFONT_DEFMETRIC(0), #endif #if NXFONT_MIN7BIT <= 1 && NXFONT_MAX7BIT >= 1 -NXFONT_DEFMETRIC(1), + NXFONT_DEFMETRIC(1), #endif #if NXFONT_MIN7BIT <= 2 && NXFONT_MAX7BIT >= 2 -NXFONT_DEFMETRIC(2), + NXFONT_DEFMETRIC(2), #endif #if NXFONT_MIN7BIT <= 3 && NXFONT_MAX7BIT >= 3 -NXFONT_DEFMETRIC(3), + NXFONT_DEFMETRIC(3), #endif #if NXFONT_MIN7BIT <= 4 && NXFONT_MAX7BIT >= 4 -NXFONT_DEFMETRIC(4), + NXFONT_DEFMETRIC(4), #endif #if NXFONT_MIN7BIT <= 5 && NXFONT_MAX7BIT >= 5 -NXFONT_DEFMETRIC(5), + NXFONT_DEFMETRIC(5), #endif #if NXFONT_MIN7BIT <= 6 && NXFONT_MAX7BIT >= 6 -NXFONT_DEFMETRIC(6), + NXFONT_DEFMETRIC(6), #endif #if NXFONT_MIN7BIT <= 7 && NXFONT_MAX7BIT >= 7 -NXFONT_DEFMETRIC(7), + NXFONT_DEFMETRIC(7), #endif #if NXFONT_MIN7BIT <= 8 && NXFONT_MAX7BIT >= 8 -NXFONT_DEFMETRIC(8), + NXFONT_DEFMETRIC(8), #endif #if NXFONT_MIN7BIT <= 9 && NXFONT_MAX7BIT >= 9 -NXFONT_DEFMETRIC(9), + NXFONT_DEFMETRIC(9), #endif #if NXFONT_MIN7BIT <= 10 && NXFONT_MAX7BIT >= 10 -NXFONT_DEFMETRIC(10), + NXFONT_DEFMETRIC(10), #endif #if NXFONT_MIN7BIT <= 11 && NXFONT_MAX7BIT >= 11 -NXFONT_DEFMETRIC(11), + NXFONT_DEFMETRIC(11), #endif #if NXFONT_MIN7BIT <= 12 && NXFONT_MAX7BIT >= 12 -NXFONT_DEFMETRIC(12), + NXFONT_DEFMETRIC(12), #endif #if NXFONT_MIN7BIT <= 13 && NXFONT_MAX7BIT >= 13 -NXFONT_DEFMETRIC(13), + NXFONT_DEFMETRIC(13), #endif #if NXFONT_MIN7BIT <= 14 && NXFONT_MAX7BIT >= 14 -NXFONT_DEFMETRIC(14), + NXFONT_DEFMETRIC(14), #endif #if NXFONT_MIN7BIT <= 15 && NXFONT_MAX7BIT >= 15 -NXFONT_DEFMETRIC(15), + NXFONT_DEFMETRIC(15), #endif #if NXFONT_MIN7BIT <= 16 && NXFONT_MAX7BIT >= 16 -NXFONT_DEFMETRIC(16), + NXFONT_DEFMETRIC(16), #endif #if NXFONT_MIN7BIT <= 17 && NXFONT_MAX7BIT >= 17 -NXFONT_DEFMETRIC(17), + NXFONT_DEFMETRIC(17), #endif #if NXFONT_MIN7BIT <= 18 && NXFONT_MAX7BIT >= 18 -NXFONT_DEFMETRIC(18), + NXFONT_DEFMETRIC(18), #endif #if NXFONT_MIN7BIT <= 19 && NXFONT_MAX7BIT >= 19 -NXFONT_DEFMETRIC(19), + NXFONT_DEFMETRIC(19), #endif #if NXFONT_MIN7BIT <= 20 && NXFONT_MAX7BIT >= 20 -NXFONT_DEFMETRIC(20), + NXFONT_DEFMETRIC(20), #endif #if NXFONT_MIN7BIT <= 21 && NXFONT_MAX7BIT >= 21 -NXFONT_DEFMETRIC(21), + NXFONT_DEFMETRIC(21), #endif #if NXFONT_MIN7BIT <= 22 && NXFONT_MAX7BIT >= 22 -NXFONT_DEFMETRIC(22), + NXFONT_DEFMETRIC(22), #endif #if NXFONT_MIN7BIT <= 23 && NXFONT_MAX7BIT >= 23 -NXFONT_DEFMETRIC(23), + NXFONT_DEFMETRIC(23), #endif #if NXFONT_MIN7BIT <= 24 && NXFONT_MAX7BIT >= 24 -NXFONT_DEFMETRIC(24), + NXFONT_DEFMETRIC(24), #endif #if NXFONT_MIN7BIT <= 25 && NXFONT_MAX7BIT >= 25 -NXFONT_DEFMETRIC(25), + NXFONT_DEFMETRIC(25), #endif #if NXFONT_MIN7BIT <= 26 && NXFONT_MAX7BIT >= 26 -NXFONT_DEFMETRIC(26), + NXFONT_DEFMETRIC(26), #endif #if NXFONT_MIN7BIT <= 27 && NXFONT_MAX7BIT >= 27 -NXFONT_DEFMETRIC(27), + NXFONT_DEFMETRIC(27), #endif #if NXFONT_MIN7BIT <= 28 && NXFONT_MAX7BIT >= 28 -NXFONT_DEFMETRIC(28), + NXFONT_DEFMETRIC(28), #endif #if NXFONT_MIN7BIT <= 29 && NXFONT_MAX7BIT >= 29 -NXFONT_DEFMETRIC(29), + NXFONT_DEFMETRIC(29), #endif #if NXFONT_MIN7BIT <= 30 && NXFONT_MAX7BIT >= 30 -NXFONT_DEFMETRIC(30), + NXFONT_DEFMETRIC(30), #endif #if NXFONT_MIN7BIT <= 31 && NXFONT_MAX7BIT >= 31 -NXFONT_DEFMETRIC(31), + NXFONT_DEFMETRIC(31), #endif #if NXFONT_MIN7BIT <= 32 && NXFONT_MAX7BIT >= 32 -NXFONT_DEFMETRIC(32), + NXFONT_DEFMETRIC(32), #endif #if NXFONT_MIN7BIT <= 33 && NXFONT_MAX7BIT >= 33 -NXFONT_DEFMETRIC(33), + NXFONT_DEFMETRIC(33), #endif #if NXFONT_MIN7BIT <= 34 && NXFONT_MAX7BIT >= 34 -NXFONT_DEFMETRIC(34), + NXFONT_DEFMETRIC(34), #endif #if NXFONT_MIN7BIT <= 35 && NXFONT_MAX7BIT >= 35 -NXFONT_DEFMETRIC(35), + NXFONT_DEFMETRIC(35), #endif #if NXFONT_MIN7BIT <= 36 && NXFONT_MAX7BIT >= 36 -NXFONT_DEFMETRIC(36), + NXFONT_DEFMETRIC(36), #endif #if NXFONT_MIN7BIT <= 37 && NXFONT_MAX7BIT >= 37 -NXFONT_DEFMETRIC(37), + NXFONT_DEFMETRIC(37), #endif #if NXFONT_MIN7BIT <= 38 && NXFONT_MAX7BIT >= 38 -NXFONT_DEFMETRIC(38), + NXFONT_DEFMETRIC(38), #endif #if NXFONT_MIN7BIT <= 39 && NXFONT_MAX7BIT >= 39 -NXFONT_DEFMETRIC(39), + NXFONT_DEFMETRIC(39), #endif #if NXFONT_MIN7BIT <= 40 && NXFONT_MAX7BIT >= 40 -NXFONT_DEFMETRIC(40), + NXFONT_DEFMETRIC(40), #endif #if NXFONT_MIN7BIT <= 41 && NXFONT_MAX7BIT >= 41 -NXFONT_DEFMETRIC(41), + NXFONT_DEFMETRIC(41), #endif #if NXFONT_MIN7BIT <= 42 && NXFONT_MAX7BIT >= 42 -NXFONT_DEFMETRIC(42), + NXFONT_DEFMETRIC(42), #endif #if NXFONT_MIN7BIT <= 43 && NXFONT_MAX7BIT >= 43 -NXFONT_DEFMETRIC(43), + NXFONT_DEFMETRIC(43), #endif #if NXFONT_MIN7BIT <= 44 && NXFONT_MAX7BIT >= 44 -NXFONT_DEFMETRIC(44), + NXFONT_DEFMETRIC(44), #endif #if NXFONT_MIN7BIT <= 45 && NXFONT_MAX7BIT >= 45 -NXFONT_DEFMETRIC(45), + NXFONT_DEFMETRIC(45), #endif #if NXFONT_MIN7BIT <= 46 && NXFONT_MAX7BIT >= 46 -NXFONT_DEFMETRIC(46), + NXFONT_DEFMETRIC(46), #endif #if NXFONT_MIN7BIT <= 47 && NXFONT_MAX7BIT >= 47 -NXFONT_DEFMETRIC(47), + NXFONT_DEFMETRIC(47), #endif #if NXFONT_MIN7BIT <= 48 && NXFONT_MAX7BIT >= 48 -NXFONT_DEFMETRIC(48), + NXFONT_DEFMETRIC(48), #endif #if NXFONT_MIN7BIT <= 49 && NXFONT_MAX7BIT >= 49 -NXFONT_DEFMETRIC(49), + NXFONT_DEFMETRIC(49), #endif #if NXFONT_MIN7BIT <= 50 && NXFONT_MAX7BIT >= 50 -NXFONT_DEFMETRIC(50), + NXFONT_DEFMETRIC(50), #endif #if NXFONT_MIN7BIT <= 51 && NXFONT_MAX7BIT >= 51 -NXFONT_DEFMETRIC(51), + NXFONT_DEFMETRIC(51), #endif #if NXFONT_MIN7BIT <= 52 && NXFONT_MAX7BIT >= 52 -NXFONT_DEFMETRIC(52), + NXFONT_DEFMETRIC(52), #endif #if NXFONT_MIN7BIT <= 53 && NXFONT_MAX7BIT >= 53 -NXFONT_DEFMETRIC(53), + NXFONT_DEFMETRIC(53), #endif #if NXFONT_MIN7BIT <= 54 && NXFONT_MAX7BIT >= 54 -NXFONT_DEFMETRIC(54), + NXFONT_DEFMETRIC(54), #endif #if NXFONT_MIN7BIT <= 55 && NXFONT_MAX7BIT >= 55 -NXFONT_DEFMETRIC(55), + NXFONT_DEFMETRIC(55), #endif #if NXFONT_MIN7BIT <= 56 && NXFONT_MAX7BIT >= 56 -NXFONT_DEFMETRIC(56), + NXFONT_DEFMETRIC(56), #endif #if NXFONT_MIN7BIT <= 57 && NXFONT_MAX7BIT >= 57 -NXFONT_DEFMETRIC(57), + NXFONT_DEFMETRIC(57), #endif #if NXFONT_MIN7BIT <= 58 && NXFONT_MAX7BIT >= 58 -NXFONT_DEFMETRIC(58), + NXFONT_DEFMETRIC(58), #endif #if NXFONT_MIN7BIT <= 59 && NXFONT_MAX7BIT >= 59 -NXFONT_DEFMETRIC(59), + NXFONT_DEFMETRIC(59), #endif #if NXFONT_MIN7BIT <= 60 && NXFONT_MAX7BIT >= 60 -NXFONT_DEFMETRIC(60), + NXFONT_DEFMETRIC(60), #endif #if NXFONT_MIN7BIT <= 61 && NXFONT_MAX7BIT >= 61 -NXFONT_DEFMETRIC(61), + NXFONT_DEFMETRIC(61), #endif #if NXFONT_MIN7BIT <= 62 && NXFONT_MAX7BIT >= 62 -NXFONT_DEFMETRIC(62), + NXFONT_DEFMETRIC(62), #endif #if NXFONT_MIN7BIT <= 63 && NXFONT_MAX7BIT >= 63 -NXFONT_DEFMETRIC(63), + NXFONT_DEFMETRIC(63), #endif #if NXFONT_MIN7BIT <= 64 && NXFONT_MAX7BIT >= 64 -NXFONT_DEFMETRIC(64), + NXFONT_DEFMETRIC(64), #endif #if NXFONT_MIN7BIT <= 65 && NXFONT_MAX7BIT >= 65 -NXFONT_DEFMETRIC(65), + NXFONT_DEFMETRIC(65), #endif #if NXFONT_MIN7BIT <= 66 && NXFONT_MAX7BIT >= 66 -NXFONT_DEFMETRIC(66), + NXFONT_DEFMETRIC(66), #endif #if NXFONT_MIN7BIT <= 67 && NXFONT_MAX7BIT >= 67 -NXFONT_DEFMETRIC(67), + NXFONT_DEFMETRIC(67), #endif #if NXFONT_MIN7BIT <= 68 && NXFONT_MAX7BIT >= 68 -NXFONT_DEFMETRIC(68), + NXFONT_DEFMETRIC(68), #endif #if NXFONT_MIN7BIT <= 69 && NXFONT_MAX7BIT >= 69 -NXFONT_DEFMETRIC(69), + NXFONT_DEFMETRIC(69), #endif #if NXFONT_MIN7BIT <= 70 && NXFONT_MAX7BIT >= 70 -NXFONT_DEFMETRIC(70), + NXFONT_DEFMETRIC(70), #endif #if NXFONT_MIN7BIT <= 71 && NXFONT_MAX7BIT >= 71 -NXFONT_DEFMETRIC(71), + NXFONT_DEFMETRIC(71), #endif #if NXFONT_MIN7BIT <= 72 && NXFONT_MAX7BIT >= 72 -NXFONT_DEFMETRIC(72), + NXFONT_DEFMETRIC(72), #endif #if NXFONT_MIN7BIT <= 73 && NXFONT_MAX7BIT >= 73 -NXFONT_DEFMETRIC(73), + NXFONT_DEFMETRIC(73), #endif #if NXFONT_MIN7BIT <= 74 && NXFONT_MAX7BIT >= 74 -NXFONT_DEFMETRIC(74), + NXFONT_DEFMETRIC(74), #endif #if NXFONT_MIN7BIT <= 75 && NXFONT_MAX7BIT >= 75 -NXFONT_DEFMETRIC(75), + NXFONT_DEFMETRIC(75), #endif #if NXFONT_MIN7BIT <= 76 && NXFONT_MAX7BIT >= 76 -NXFONT_DEFMETRIC(76), + NXFONT_DEFMETRIC(76), #endif #if NXFONT_MIN7BIT <= 77 && NXFONT_MAX7BIT >= 77 -NXFONT_DEFMETRIC(77), + NXFONT_DEFMETRIC(77), #endif #if NXFONT_MIN7BIT <= 78 && NXFONT_MAX7BIT >= 78 -NXFONT_DEFMETRIC(78), + NXFONT_DEFMETRIC(78), #endif #if NXFONT_MIN7BIT <= 79 && NXFONT_MAX7BIT >= 79 -NXFONT_DEFMETRIC(79), + NXFONT_DEFMETRIC(79), #endif #if NXFONT_MIN7BIT <= 80 && NXFONT_MAX7BIT >= 80 -NXFONT_DEFMETRIC(80), + NXFONT_DEFMETRIC(80), #endif #if NXFONT_MIN7BIT <= 81 && NXFONT_MAX7BIT >= 81 -NXFONT_DEFMETRIC(81), + NXFONT_DEFMETRIC(81), #endif #if NXFONT_MIN7BIT <= 82 && NXFONT_MAX7BIT >= 82 -NXFONT_DEFMETRIC(82), + NXFONT_DEFMETRIC(82), #endif #if NXFONT_MIN7BIT <= 83 && NXFONT_MAX7BIT >= 83 -NXFONT_DEFMETRIC(83), + NXFONT_DEFMETRIC(83), #endif #if NXFONT_MIN7BIT <= 84 && NXFONT_MAX7BIT >= 84 -NXFONT_DEFMETRIC(84), + NXFONT_DEFMETRIC(84), #endif #if NXFONT_MIN7BIT <= 85 && NXFONT_MAX7BIT >= 85 -NXFONT_DEFMETRIC(85), + NXFONT_DEFMETRIC(85), #endif #if NXFONT_MIN7BIT <= 86 && NXFONT_MAX7BIT >= 86 -NXFONT_DEFMETRIC(86), + NXFONT_DEFMETRIC(86), #endif #if NXFONT_MIN7BIT <= 87 && NXFONT_MAX7BIT >= 87 -NXFONT_DEFMETRIC(87), + NXFONT_DEFMETRIC(87), #endif #if NXFONT_MIN7BIT <= 88 && NXFONT_MAX7BIT >= 88 -NXFONT_DEFMETRIC(88), + NXFONT_DEFMETRIC(88), #endif #if NXFONT_MIN7BIT <= 89 && NXFONT_MAX7BIT >= 89 -NXFONT_DEFMETRIC(89), + NXFONT_DEFMETRIC(89), #endif #if NXFONT_MIN7BIT <= 90 && NXFONT_MAX7BIT >= 90 -NXFONT_DEFMETRIC(90), + NXFONT_DEFMETRIC(90), #endif #if NXFONT_MIN7BIT <= 91 && NXFONT_MAX7BIT >= 91 -NXFONT_DEFMETRIC(91), + NXFONT_DEFMETRIC(91), #endif #if NXFONT_MIN7BIT <= 92 && NXFONT_MAX7BIT >= 92 -NXFONT_DEFMETRIC(92), + NXFONT_DEFMETRIC(92), #endif #if NXFONT_MIN7BIT <= 93 && NXFONT_MAX7BIT >= 93 -NXFONT_DEFMETRIC(93), + NXFONT_DEFMETRIC(93), #endif #if NXFONT_MIN7BIT <= 94 && NXFONT_MAX7BIT >= 94 -NXFONT_DEFMETRIC(94), + NXFONT_DEFMETRIC(94), #endif #if NXFONT_MIN7BIT <= 95 && NXFONT_MAX7BIT >= 95 -NXFONT_DEFMETRIC(95), + NXFONT_DEFMETRIC(95), #endif #if NXFONT_MIN7BIT <= 96 && NXFONT_MAX7BIT >= 96 -NXFONT_DEFMETRIC(96), + NXFONT_DEFMETRIC(96), #endif #if NXFONT_MIN7BIT <= 97 && NXFONT_MAX7BIT >= 97 -NXFONT_DEFMETRIC(97), + NXFONT_DEFMETRIC(97), #endif #if NXFONT_MIN7BIT <= 98 && NXFONT_MAX7BIT >= 98 -NXFONT_DEFMETRIC(98), + NXFONT_DEFMETRIC(98), #endif #if NXFONT_MIN7BIT <= 99 && NXFONT_MAX7BIT >= 99 -NXFONT_DEFMETRIC(99), + NXFONT_DEFMETRIC(99), #endif #if NXFONT_MIN7BIT <= 100 && NXFONT_MAX7BIT >= 100 -NXFONT_DEFMETRIC(100), + NXFONT_DEFMETRIC(100), #endif #if NXFONT_MIN7BIT <= 101 && NXFONT_MAX7BIT >= 101 -NXFONT_DEFMETRIC(101), + NXFONT_DEFMETRIC(101), #endif #if NXFONT_MIN7BIT <= 102 && NXFONT_MAX7BIT >= 102 -NXFONT_DEFMETRIC(102), + NXFONT_DEFMETRIC(102), #endif #if NXFONT_MIN7BIT <= 103 && NXFONT_MAX7BIT >= 103 -NXFONT_DEFMETRIC(103), + NXFONT_DEFMETRIC(103), #endif #if NXFONT_MIN7BIT <= 104 && NXFONT_MAX7BIT >= 104 -NXFONT_DEFMETRIC(104), + NXFONT_DEFMETRIC(104), #endif #if NXFONT_MIN7BIT <= 105 && NXFONT_MAX7BIT >= 105 -NXFONT_DEFMETRIC(105), + NXFONT_DEFMETRIC(105), #endif #if NXFONT_MIN7BIT <= 106 && NXFONT_MAX7BIT >= 106 -NXFONT_DEFMETRIC(106), + NXFONT_DEFMETRIC(106), #endif #if NXFONT_MIN7BIT <= 107 && NXFONT_MAX7BIT >= 107 -NXFONT_DEFMETRIC(107), + NXFONT_DEFMETRIC(107), #endif #if NXFONT_MIN7BIT <= 108 && NXFONT_MAX7BIT >= 108 -NXFONT_DEFMETRIC(108), + NXFONT_DEFMETRIC(108), #endif #if NXFONT_MIN7BIT <= 109 && NXFONT_MAX7BIT >= 109 -NXFONT_DEFMETRIC(109), + NXFONT_DEFMETRIC(109), #endif #if NXFONT_MIN7BIT <= 110 && NXFONT_MAX7BIT >= 110 -NXFONT_DEFMETRIC(110), + NXFONT_DEFMETRIC(110), #endif #if NXFONT_MIN7BIT <= 111 && NXFONT_MAX7BIT >= 111 -NXFONT_DEFMETRIC(111), + NXFONT_DEFMETRIC(111), #endif #if NXFONT_MIN7BIT <= 112 && NXFONT_MAX7BIT >= 112 -NXFONT_DEFMETRIC(112), + NXFONT_DEFMETRIC(112), #endif #if NXFONT_MIN7BIT <= 113 && NXFONT_MAX7BIT >= 113 -NXFONT_DEFMETRIC(113), + NXFONT_DEFMETRIC(113), #endif #if NXFONT_MIN7BIT <= 114 && NXFONT_MAX7BIT >= 114 -NXFONT_DEFMETRIC(114), + NXFONT_DEFMETRIC(114), #endif #if NXFONT_MIN7BIT <= 115 && NXFONT_MAX7BIT >= 115 -NXFONT_DEFMETRIC(115), + NXFONT_DEFMETRIC(115), #endif #if NXFONT_MIN7BIT <= 116 && NXFONT_MAX7BIT >= 116 -NXFONT_DEFMETRIC(116), + NXFONT_DEFMETRIC(116), #endif #if NXFONT_MIN7BIT <= 117 && NXFONT_MAX7BIT >= 117 -NXFONT_DEFMETRIC(117), + NXFONT_DEFMETRIC(117), #endif #if NXFONT_MIN7BIT <= 118 && NXFONT_MAX7BIT >= 118 -NXFONT_DEFMETRIC(118), + NXFONT_DEFMETRIC(118), #endif #if NXFONT_MIN7BIT <= 119 && NXFONT_MAX7BIT >= 119 -NXFONT_DEFMETRIC(119), + NXFONT_DEFMETRIC(119), #endif #if NXFONT_MIN7BIT <= 120 && NXFONT_MAX7BIT >= 120 -NXFONT_DEFMETRIC(120), + NXFONT_DEFMETRIC(120), #endif #if NXFONT_MIN7BIT <= 121 && NXFONT_MAX7BIT >= 121 -NXFONT_DEFMETRIC(121), + NXFONT_DEFMETRIC(121), #endif #if NXFONT_MIN7BIT <= 122 && NXFONT_MAX7BIT >= 122 -NXFONT_DEFMETRIC(122), + NXFONT_DEFMETRIC(122), #endif #if NXFONT_MIN7BIT <= 123 && NXFONT_MAX7BIT >= 123 -NXFONT_DEFMETRIC(123), + NXFONT_DEFMETRIC(123), #endif #if NXFONT_MIN7BIT <= 124 && NXFONT_MAX7BIT >= 124 -NXFONT_DEFMETRIC(124), + NXFONT_DEFMETRIC(124), #endif #if NXFONT_MIN7BIT <= 125 && NXFONT_MAX7BIT >= 125 -NXFONT_DEFMETRIC(125), + NXFONT_DEFMETRIC(125), #endif #if NXFONT_MIN7BIT <= 126 && NXFONT_MAX7BIT >= 126 -NXFONT_DEFMETRIC(126), + NXFONT_DEFMETRIC(126), #endif #if NXFONT_MIN7BIT <= 127 && NXFONT_MAX7BIT >= 127 -NXFONT_DEFMETRIC(127), + NXFONT_DEFMETRIC(127), #endif }; #if CONFIG_NXFONTS_CHARBITS >= 8 -static const struct nx_fontbitmap_s NXF_SYMNAME(NXFONTS_PREFIX,8bitmaps)[NXFONT_N8BITFONTS] = +static const struct +nx_fontbitmap_s NXF_SYMNAME(NXFONTS_PREFIX, 8bitmaps)[NXFONT_N8BITFONTS] = { #if NXFONT_MIN8BIT <= 128 && NXFONT_MAX8BIT >= 128 -NXFONT_DEFMETRIC(128), + NXFONT_DEFMETRIC(128), #endif #if NXFONT_MIN8BIT <= 129 && NXFONT_MAX8BIT >= 129 -NXFONT_DEFMETRIC(129), + NXFONT_DEFMETRIC(129), #endif #if NXFONT_MIN8BIT <= 130 && NXFONT_MAX8BIT >= 130 -NXFONT_DEFMETRIC(130), + NXFONT_DEFMETRIC(130), #endif #if NXFONT_MIN8BIT <= 131 && NXFONT_MAX8BIT >= 131 -NXFONT_DEFMETRIC(131), + NXFONT_DEFMETRIC(131), #endif #if NXFONT_MIN8BIT <= 132 && NXFONT_MAX8BIT >= 132 -NXFONT_DEFMETRIC(132), + NXFONT_DEFMETRIC(132), #endif #if NXFONT_MIN8BIT <= 133 && NXFONT_MAX8BIT >= 133 -NXFONT_DEFMETRIC(133), + NXFONT_DEFMETRIC(133), #endif #if NXFONT_MIN8BIT <= 134 && NXFONT_MAX8BIT >= 134 -NXFONT_DEFMETRIC(134), + NXFONT_DEFMETRIC(134), #endif #if NXFONT_MIN8BIT <= 135 && NXFONT_MAX8BIT >= 135 -NXFONT_DEFMETRIC(135), + NXFONT_DEFMETRIC(135), #endif #if NXFONT_MIN8BIT <= 136 && NXFONT_MAX8BIT >= 136 -NXFONT_DEFMETRIC(136), + NXFONT_DEFMETRIC(136), #endif #if NXFONT_MIN8BIT <= 137 && NXFONT_MAX8BIT >= 137 -NXFONT_DEFMETRIC(137), + NXFONT_DEFMETRIC(137), #endif #if NXFONT_MIN8BIT <= 138 && NXFONT_MAX8BIT >= 138 -NXFONT_DEFMETRIC(138), + NXFONT_DEFMETRIC(138), #endif #if NXFONT_MIN8BIT <= 139 && NXFONT_MAX8BIT >= 139 -NXFONT_DEFMETRIC(139), + NXFONT_DEFMETRIC(139), #endif #if NXFONT_MIN8BIT <= 140 && NXFONT_MAX8BIT >= 140 -NXFONT_DEFMETRIC(140), + NXFONT_DEFMETRIC(140), #endif #if NXFONT_MIN8BIT <= 141 && NXFONT_MAX8BIT >= 141 -NXFONT_DEFMETRIC(141), + NXFONT_DEFMETRIC(141), #endif #if NXFONT_MIN8BIT <= 142 && NXFONT_MAX8BIT >= 142 -NXFONT_DEFMETRIC(142), + NXFONT_DEFMETRIC(142), #endif #if NXFONT_MIN8BIT <= 143 && NXFONT_MAX8BIT >= 143 -NXFONT_DEFMETRIC(143), + NXFONT_DEFMETRIC(143), #endif #if NXFONT_MIN8BIT <= 144 && NXFONT_MAX8BIT >= 144 -NXFONT_DEFMETRIC(144), + NXFONT_DEFMETRIC(144), #endif #if NXFONT_MIN8BIT <= 145 && NXFONT_MAX8BIT >= 145 -NXFONT_DEFMETRIC(145), + NXFONT_DEFMETRIC(145), #endif #if NXFONT_MIN8BIT <= 146 && NXFONT_MAX8BIT >= 146 -NXFONT_DEFMETRIC(146), + NXFONT_DEFMETRIC(146), #endif #if NXFONT_MIN8BIT <= 147 && NXFONT_MAX8BIT >= 147 -NXFONT_DEFMETRIC(147), + NXFONT_DEFMETRIC(147), #endif #if NXFONT_MIN8BIT <= 148 && NXFONT_MAX8BIT >= 148 -NXFONT_DEFMETRIC(148), + NXFONT_DEFMETRIC(148), #endif #if NXFONT_MIN8BIT <= 149 && NXFONT_MAX8BIT >= 149 -NXFONT_DEFMETRIC(149), + NXFONT_DEFMETRIC(149), #endif #if NXFONT_MIN8BIT <= 150 && NXFONT_MAX8BIT >= 150 -NXFONT_DEFMETRIC(150), + NXFONT_DEFMETRIC(150), #endif #if NXFONT_MIN8BIT <= 151 && NXFONT_MAX8BIT >= 151 -NXFONT_DEFMETRIC(151), + NXFONT_DEFMETRIC(151), #endif #if NXFONT_MIN8BIT <= 152 && NXFONT_MAX8BIT >= 152 -NXFONT_DEFMETRIC(152), + NXFONT_DEFMETRIC(152), #endif #if NXFONT_MIN8BIT <= 153 && NXFONT_MAX8BIT >= 153 -NXFONT_DEFMETRIC(153), + NXFONT_DEFMETRIC(153), #endif #if NXFONT_MIN8BIT <= 154 && NXFONT_MAX8BIT >= 154 -NXFONT_DEFMETRIC(154), + NXFONT_DEFMETRIC(154), #endif #if NXFONT_MIN8BIT <= 155 && NXFONT_MAX8BIT >= 155 -NXFONT_DEFMETRIC(155), + NXFONT_DEFMETRIC(155), #endif #if NXFONT_MIN8BIT <= 156 && NXFONT_MAX8BIT >= 156 -NXFONT_DEFMETRIC(156), + NXFONT_DEFMETRIC(156), #endif #if NXFONT_MIN8BIT <= 157 && NXFONT_MAX8BIT >= 157 -NXFONT_DEFMETRIC(157), + NXFONT_DEFMETRIC(157), #endif #if NXFONT_MIN8BIT <= 158 && NXFONT_MAX8BIT >= 158 -NXFONT_DEFMETRIC(158), + NXFONT_DEFMETRIC(158), #endif #if NXFONT_MIN8BIT <= 159 && NXFONT_MAX8BIT >= 159 -NXFONT_DEFMETRIC(159), + NXFONT_DEFMETRIC(159), #endif #if NXFONT_MIN8BIT <= 160 && NXFONT_MAX8BIT >= 160 -NXFONT_DEFMETRIC(160), + NXFONT_DEFMETRIC(160), #endif #if NXFONT_MIN8BIT <= 161 && NXFONT_MAX8BIT >= 161 -NXFONT_DEFMETRIC(161), + NXFONT_DEFMETRIC(161), #endif #if NXFONT_MIN8BIT <= 162 && NXFONT_MAX8BIT >= 162 -NXFONT_DEFMETRIC(162), + NXFONT_DEFMETRIC(162), #endif #if NXFONT_MIN8BIT <= 163 && NXFONT_MAX8BIT >= 163 -NXFONT_DEFMETRIC(163), + NXFONT_DEFMETRIC(163), #endif #if NXFONT_MIN8BIT <= 164 && NXFONT_MAX8BIT >= 164 -NXFONT_DEFMETRIC(164), + NXFONT_DEFMETRIC(164), #endif #if NXFONT_MIN8BIT <= 165 && NXFONT_MAX8BIT >= 165 -NXFONT_DEFMETRIC(165), + NXFONT_DEFMETRIC(165), #endif #if NXFONT_MIN8BIT <= 166 && NXFONT_MAX8BIT >= 166 -NXFONT_DEFMETRIC(166), + NXFONT_DEFMETRIC(166), #endif #if NXFONT_MIN8BIT <= 167 && NXFONT_MAX8BIT >= 167 -NXFONT_DEFMETRIC(167), + NXFONT_DEFMETRIC(167), #endif #if NXFONT_MIN8BIT <= 168 && NXFONT_MAX8BIT >= 168 -NXFONT_DEFMETRIC(168), + NXFONT_DEFMETRIC(168), #endif #if NXFONT_MIN8BIT <= 169 && NXFONT_MAX8BIT >= 169 -NXFONT_DEFMETRIC(169), + NXFONT_DEFMETRIC(169), #endif #if NXFONT_MIN8BIT <= 170 && NXFONT_MAX8BIT >= 170 -NXFONT_DEFMETRIC(170), + NXFONT_DEFMETRIC(170), #endif #if NXFONT_MIN8BIT <= 171 && NXFONT_MAX8BIT >= 171 -NXFONT_DEFMETRIC(171), + NXFONT_DEFMETRIC(171), #endif #if NXFONT_MIN8BIT <= 172 && NXFONT_MAX8BIT >= 172 -NXFONT_DEFMETRIC(172), + NXFONT_DEFMETRIC(172), #endif #if NXFONT_MIN8BIT <= 173 && NXFONT_MAX8BIT >= 173 -NXFONT_DEFMETRIC(173), + NXFONT_DEFMETRIC(173), #endif #if NXFONT_MIN8BIT <= 174 && NXFONT_MAX8BIT >= 174 -NXFONT_DEFMETRIC(174), + NXFONT_DEFMETRIC(174), #endif #if NXFONT_MIN8BIT <= 175 && NXFONT_MAX8BIT >= 175 -NXFONT_DEFMETRIC(175), + NXFONT_DEFMETRIC(175), #endif #if NXFONT_MIN8BIT <= 176 && NXFONT_MAX8BIT >= 176 -NXFONT_DEFMETRIC(176), + NXFONT_DEFMETRIC(176), #endif #if NXFONT_MIN8BIT <= 177 && NXFONT_MAX8BIT >= 177 -NXFONT_DEFMETRIC(177), + NXFONT_DEFMETRIC(177), #endif #if NXFONT_MIN8BIT <= 178 && NXFONT_MAX8BIT >= 178 -NXFONT_DEFMETRIC(178), + NXFONT_DEFMETRIC(178), #endif #if NXFONT_MIN8BIT <= 179 && NXFONT_MAX8BIT >= 179 -NXFONT_DEFMETRIC(179), + NXFONT_DEFMETRIC(179), #endif #if NXFONT_MIN8BIT <= 180 && NXFONT_MAX8BIT >= 180 -NXFONT_DEFMETRIC(180), + NXFONT_DEFMETRIC(180), #endif #if NXFONT_MIN8BIT <= 181 && NXFONT_MAX8BIT >= 181 -NXFONT_DEFMETRIC(181), + NXFONT_DEFMETRIC(181), #endif #if NXFONT_MIN8BIT <= 182 && NXFONT_MAX8BIT >= 182 -NXFONT_DEFMETRIC(182), + NXFONT_DEFMETRIC(182), #endif #if NXFONT_MIN8BIT <= 183 && NXFONT_MAX8BIT >= 183 -NXFONT_DEFMETRIC(183), + NXFONT_DEFMETRIC(183), #endif #if NXFONT_MIN8BIT <= 184 && NXFONT_MAX8BIT >= 184 -NXFONT_DEFMETRIC(184), + NXFONT_DEFMETRIC(184), #endif #if NXFONT_MIN8BIT <= 185 && NXFONT_MAX8BIT >= 185 -NXFONT_DEFMETRIC(185), + NXFONT_DEFMETRIC(185), #endif #if NXFONT_MIN8BIT <= 186 && NXFONT_MAX8BIT >= 186 -NXFONT_DEFMETRIC(186), + NXFONT_DEFMETRIC(186), #endif #if NXFONT_MIN8BIT <= 187 && NXFONT_MAX8BIT >= 187 -NXFONT_DEFMETRIC(187), + NXFONT_DEFMETRIC(187), #endif #if NXFONT_MIN8BIT <= 188 && NXFONT_MAX8BIT >= 188 -NXFONT_DEFMETRIC(188), + NXFONT_DEFMETRIC(188), #endif #if NXFONT_MIN8BIT <= 189 && NXFONT_MAX8BIT >= 189 -NXFONT_DEFMETRIC(189), + NXFONT_DEFMETRIC(189), #endif #if NXFONT_MIN8BIT <= 190 && NXFONT_MAX8BIT >= 190 -NXFONT_DEFMETRIC(190), + NXFONT_DEFMETRIC(190), #endif #if NXFONT_MIN8BIT <= 191 && NXFONT_MAX8BIT >= 191 -NXFONT_DEFMETRIC(191), + NXFONT_DEFMETRIC(191), #endif #if NXFONT_MIN8BIT <= 192 && NXFONT_MAX8BIT >= 192 -NXFONT_DEFMETRIC(192), + NXFONT_DEFMETRIC(192), #endif #if NXFONT_MIN8BIT <= 193 && NXFONT_MAX8BIT >= 193 -NXFONT_DEFMETRIC(193), + NXFONT_DEFMETRIC(193), #endif #if NXFONT_MIN8BIT <= 194 && NXFONT_MAX8BIT >= 194 -NXFONT_DEFMETRIC(194), + NXFONT_DEFMETRIC(194), #endif #if NXFONT_MIN8BIT <= 195 && NXFONT_MAX8BIT >= 195 -NXFONT_DEFMETRIC(195), + NXFONT_DEFMETRIC(195), #endif #if NXFONT_MIN8BIT <= 196 && NXFONT_MAX8BIT >= 196 -NXFONT_DEFMETRIC(196), + NXFONT_DEFMETRIC(196), #endif #if NXFONT_MIN8BIT <= 197 && NXFONT_MAX8BIT >= 197 -NXFONT_DEFMETRIC(197), + NXFONT_DEFMETRIC(197), #endif #if NXFONT_MIN8BIT <= 198 && NXFONT_MAX8BIT >= 198 -NXFONT_DEFMETRIC(198), + NXFONT_DEFMETRIC(198), #endif #if NXFONT_MIN8BIT <= 199 && NXFONT_MAX8BIT >= 199 -NXFONT_DEFMETRIC(199), + NXFONT_DEFMETRIC(199), #endif #if NXFONT_MIN8BIT <= 200 && NXFONT_MAX8BIT >= 200 -NXFONT_DEFMETRIC(200), + NXFONT_DEFMETRIC(200), #endif #if NXFONT_MIN8BIT <= 201 && NXFONT_MAX8BIT >= 201 -NXFONT_DEFMETRIC(201), + NXFONT_DEFMETRIC(201), #endif #if NXFONT_MIN8BIT <= 202 && NXFONT_MAX8BIT >= 202 -NXFONT_DEFMETRIC(202), + NXFONT_DEFMETRIC(202), #endif #if NXFONT_MIN8BIT <= 203 && NXFONT_MAX8BIT >= 203 -NXFONT_DEFMETRIC(203), + NXFONT_DEFMETRIC(203), #endif #if NXFONT_MIN8BIT <= 204 && NXFONT_MAX8BIT >= 204 -NXFONT_DEFMETRIC(204), + NXFONT_DEFMETRIC(204), #endif #if NXFONT_MIN8BIT <= 205 && NXFONT_MAX8BIT >= 205 -NXFONT_DEFMETRIC(205), + NXFONT_DEFMETRIC(205), #endif #if NXFONT_MIN8BIT <= 206 && NXFONT_MAX8BIT >= 206 -NXFONT_DEFMETRIC(206), + NXFONT_DEFMETRIC(206), #endif #if NXFONT_MIN8BIT <= 207 && NXFONT_MAX8BIT >= 207 -NXFONT_DEFMETRIC(207), + NXFONT_DEFMETRIC(207), #endif #if NXFONT_MIN8BIT <= 208 && NXFONT_MAX8BIT >= 208 -NXFONT_DEFMETRIC(208), + NXFONT_DEFMETRIC(208), #endif #if NXFONT_MIN8BIT <= 209 && NXFONT_MAX8BIT >= 209 -NXFONT_DEFMETRIC(209), + NXFONT_DEFMETRIC(209), #endif #if NXFONT_MIN8BIT <= 210 && NXFONT_MAX8BIT >= 210 -NXFONT_DEFMETRIC(210), + NXFONT_DEFMETRIC(210), #endif #if NXFONT_MIN8BIT <= 211 && NXFONT_MAX8BIT >= 211 -NXFONT_DEFMETRIC(211), + NXFONT_DEFMETRIC(211), #endif #if NXFONT_MIN8BIT <= 212 && NXFONT_MAX8BIT >= 212 -NXFONT_DEFMETRIC(212), + NXFONT_DEFMETRIC(212), #endif #if NXFONT_MIN8BIT <= 213 && NXFONT_MAX8BIT >= 213 -NXFONT_DEFMETRIC(213), + NXFONT_DEFMETRIC(213), #endif #if NXFONT_MIN8BIT <= 214 && NXFONT_MAX8BIT >= 214 -NXFONT_DEFMETRIC(214), + NXFONT_DEFMETRIC(214), #endif #if NXFONT_MIN8BIT <= 215 && NXFONT_MAX8BIT >= 215 -NXFONT_DEFMETRIC(215), + NXFONT_DEFMETRIC(215), #endif #if NXFONT_MIN8BIT <= 216 && NXFONT_MAX8BIT >= 216 -NXFONT_DEFMETRIC(216), + NXFONT_DEFMETRIC(216), #endif #if NXFONT_MIN8BIT <= 217 && NXFONT_MAX8BIT >= 217 -NXFONT_DEFMETRIC(217), + NXFONT_DEFMETRIC(217), #endif #if NXFONT_MIN8BIT <= 218 && NXFONT_MAX8BIT >= 218 -NXFONT_DEFMETRIC(218), + NXFONT_DEFMETRIC(218), #endif #if NXFONT_MIN8BIT <= 219 && NXFONT_MAX8BIT >= 219 -NXFONT_DEFMETRIC(219), + NXFONT_DEFMETRIC(219), #endif #if NXFONT_MIN8BIT <= 220 && NXFONT_MAX8BIT >= 220 -NXFONT_DEFMETRIC(220), + NXFONT_DEFMETRIC(220), #endif #if NXFONT_MIN8BIT <= 221 && NXFONT_MAX8BIT >= 221 -NXFONT_DEFMETRIC(221), + NXFONT_DEFMETRIC(221), #endif #if NXFONT_MIN8BIT <= 222 && NXFONT_MAX8BIT >= 222 -NXFONT_DEFMETRIC(222), + NXFONT_DEFMETRIC(222), #endif #if NXFONT_MIN8BIT <= 223 && NXFONT_MAX8BIT >= 223 -NXFONT_DEFMETRIC(223), + NXFONT_DEFMETRIC(223), #endif #if NXFONT_MIN8BIT <= 224 && NXFONT_MAX8BIT >= 224 -NXFONT_DEFMETRIC(224), + NXFONT_DEFMETRIC(224), #endif #if NXFONT_MIN8BIT <= 225 && NXFONT_MAX8BIT >= 225 -NXFONT_DEFMETRIC(225), + NXFONT_DEFMETRIC(225), #endif #if NXFONT_MIN8BIT <= 226 && NXFONT_MAX8BIT >= 226 -NXFONT_DEFMETRIC(226), + NXFONT_DEFMETRIC(226), #endif #if NXFONT_MIN8BIT <= 227 && NXFONT_MAX8BIT >= 227 -NXFONT_DEFMETRIC(227), + NXFONT_DEFMETRIC(227), #endif #if NXFONT_MIN8BIT <= 228 && NXFONT_MAX8BIT >= 228 -NXFONT_DEFMETRIC(228), + NXFONT_DEFMETRIC(228), #endif #if NXFONT_MIN8BIT <= 229 && NXFONT_MAX8BIT >= 229 -NXFONT_DEFMETRIC(229), + NXFONT_DEFMETRIC(229), #endif #if NXFONT_MIN8BIT <= 230 && NXFONT_MAX8BIT >= 230 -NXFONT_DEFMETRIC(230), + NXFONT_DEFMETRIC(230), #endif #if NXFONT_MIN8BIT <= 231 && NXFONT_MAX8BIT >= 231 -NXFONT_DEFMETRIC(231), + NXFONT_DEFMETRIC(231), #endif #if NXFONT_MIN8BIT <= 232 && NXFONT_MAX8BIT >= 232 -NXFONT_DEFMETRIC(232), + NXFONT_DEFMETRIC(232), #endif #if NXFONT_MIN8BIT <= 233 && NXFONT_MAX8BIT >= 233 -NXFONT_DEFMETRIC(233), + NXFONT_DEFMETRIC(233), #endif #if NXFONT_MIN8BIT <= 234 && NXFONT_MAX8BIT >= 234 -NXFONT_DEFMETRIC(234), + NXFONT_DEFMETRIC(234), #endif #if NXFONT_MIN8BIT <= 235 && NXFONT_MAX8BIT >= 235 -NXFONT_DEFMETRIC(235), + NXFONT_DEFMETRIC(235), #endif #if NXFONT_MIN8BIT <= 236 && NXFONT_MAX8BIT >= 236 -NXFONT_DEFMETRIC(236), + NXFONT_DEFMETRIC(236), #endif #if NXFONT_MIN8BIT <= 237 && NXFONT_MAX8BIT >= 237 -NXFONT_DEFMETRIC(237), + NXFONT_DEFMETRIC(237), #endif #if NXFONT_MIN8BIT <= 238 && NXFONT_MAX8BIT >= 238 -NXFONT_DEFMETRIC(238), + NXFONT_DEFMETRIC(238), #endif #if NXFONT_MIN8BIT <= 239 && NXFONT_MAX8BIT >= 239 -NXFONT_DEFMETRIC(239), + NXFONT_DEFMETRIC(239), #endif #if NXFONT_MIN8BIT <= 240 && NXFONT_MAX8BIT >= 240 -NXFONT_DEFMETRIC(240), + NXFONT_DEFMETRIC(240), #endif #if NXFONT_MIN8BIT <= 241 && NXFONT_MAX8BIT >= 241 -NXFONT_DEFMETRIC(241), + NXFONT_DEFMETRIC(241), #endif #if NXFONT_MIN8BIT <= 242 && NXFONT_MAX8BIT >= 242 -NXFONT_DEFMETRIC(242), + NXFONT_DEFMETRIC(242), #endif #if NXFONT_MIN8BIT <= 243 && NXFONT_MAX8BIT >= 243 -NXFONT_DEFMETRIC(243), + NXFONT_DEFMETRIC(243), #endif #if NXFONT_MIN8BIT <= 244 && NXFONT_MAX8BIT >= 244 -NXFONT_DEFMETRIC(244), + NXFONT_DEFMETRIC(244), #endif #if NXFONT_MIN8BIT <= 245 && NXFONT_MAX8BIT >= 245 -NXFONT_DEFMETRIC(245), + NXFONT_DEFMETRIC(245), #endif #if NXFONT_MIN8BIT <= 246 && NXFONT_MAX8BIT >= 246 -NXFONT_DEFMETRIC(246), + NXFONT_DEFMETRIC(246), #endif #if NXFONT_MIN8BIT <= 247 && NXFONT_MAX8BIT >= 247 -NXFONT_DEFMETRIC(247), + NXFONT_DEFMETRIC(247), #endif #if NXFONT_MIN8BIT <= 248 && NXFONT_MAX8BIT >= 248 -NXFONT_DEFMETRIC(248), + NXFONT_DEFMETRIC(248), #endif #if NXFONT_MIN8BIT <= 249 && NXFONT_MAX8BIT >= 249 -NXFONT_DEFMETRIC(249), + NXFONT_DEFMETRIC(249), #endif #if NXFONT_MIN8BIT <= 250 && NXFONT_MAX8BIT >= 250 -NXFONT_DEFMETRIC(250), + NXFONT_DEFMETRIC(250), #endif #if NXFONT_MIN8BIT <= 251 && NXFONT_MAX8BIT >= 251 -NXFONT_DEFMETRIC(251), + NXFONT_DEFMETRIC(251), #endif #if NXFONT_MIN8BIT <= 252 && NXFONT_MAX8BIT >= 252 -NXFONT_DEFMETRIC(252), + NXFONT_DEFMETRIC(252), #endif #if NXFONT_MIN8BIT <= 253 && NXFONT_MAX8BIT >= 253 -NXFONT_DEFMETRIC(253), + NXFONT_DEFMETRIC(253), #endif #if NXFONT_MIN8BIT <= 254 && NXFONT_MAX8BIT >= 254 -NXFONT_DEFMETRIC(254), + NXFONT_DEFMETRIC(254), #endif #if NXFONT_MIN8BIT <= 255 && NXFONT_MAX8BIT >= 255 -NXFONT_DEFMETRIC(255), + NXFONT_DEFMETRIC(255), #endif }; #endif @@ -1693,25 +1695,25 @@ NXFONT_DEFMETRIC(255), * Public Data ****************************************************************************/ -const struct nx_fontpackage_s NXF_SYMNAME(NXFONTS_PREFIX,package) = +const struct nx_fontpackage_s NXF_SYMNAME(NXFONTS_PREFIX, package) = { - NXFONT_ID, /* The font ID */ - { /* Font set metrics: */ - NXFONT_MAXHEIGHT, /* Max. height of a glyph in rows */ - NXFONT_MAXWIDTH, /* Max. width of a glyph in pixels */ - CONFIG_NXFONTS_CHARBITS, /* Max number of bits per character code */ - NXFONT_SPACEWIDTH, /* The width of a space in pixels */ + NXFONT_ID, /* The font ID */ + { /* Font set metrics: */ + NXFONT_MAXHEIGHT, /* Max. height of a glyph in rows */ + NXFONT_MAXWIDTH, /* Max. width of a glyph in pixels */ + CONFIG_NXFONTS_CHARBITS, /* Max number of bits per character code */ + NXFONT_SPACEWIDTH, /* The width of a space in pixels */ + }, + { /* Fonts for 7-bit encoding */ + NXFONT_MIN7BIT, /* First glyph code */ + NXFONT_N7BITFONTS, /* Number of bitmap glyphs */ + NXF_SYMNAME(NXFONTS_PREFIX, 7bitmaps) /* List of glyphs */ }, - { /* Fonts for 7-bit encoding */ - NXFONT_MIN7BIT, /* First glyph code */ - NXFONT_N7BITFONTS, /* Number of bitmap glyphs */ - NXF_SYMNAME(NXFONTS_PREFIX,7bitmaps) /* List of glyphs */ - } #if CONFIG_NXFONTS_CHARBITS >= 8 -, { /* Fonts for 8-bit encoding */ - NXFONT_MIN8BIT, /* First glyph code */ - NXFONT_N8BITFONTS, /* Number of bitmap glyphs */ - NXF_SYMNAME(NXFONTS_PREFIX,8bitmaps) /* List of glyphs */ + { /* Fonts for 8-bit encoding */ + NXFONT_MIN8BIT, /* First glyph code */ + NXFONT_N8BITFONTS, /* Number of bitmap glyphs */ + NXF_SYMNAME(NXFONTS_PREFIX, 8bitmaps) /* List of glyphs */ } #endif }; diff --git a/libs/libnx/nxfonts/nxfonts_convert.c b/libs/libnx/nxfonts/nxfonts_convert.c index 2764f260ad..0837624277 100644 --- a/libs/libnx/nxfonts/nxfonts_convert.c +++ b/libs/libnx/nxfonts/nxfonts_convert.c @@ -138,9 +138,9 @@ * ****************************************************************************/ -int NXF_FUNCNAME(nxf_convert,NXFONTS_SUFFIX) +int NXF_FUNCNAME(nxf_convert, NXFONTS_SUFFIX) (FAR NXF_PIXEL_T *dest, uint16_t height, uint16_t width, uint16_t stride, - FAR const struct nx_fontbitmap_s *bm, nxgl_mxpixel_t color) + FAR const struct nx_fontbitmap_s *bm, nxgl_mxpixel_t color) { FAR uint8_t *line; FAR NXF_PIXEL_T *dptr; @@ -160,7 +160,8 @@ int NXF_FUNCNAME(nxf_convert,NXFONTS_SUFFIX) /* Get the starting position */ - line = (uint8_t*)dest + bm->metric.yoffset * stride + NXF_SCALEX(bm->metric.xoffset); + line = (uint8_t *)dest + bm->metric.yoffset * stride + + NXF_SCALEX(bm->metric.xoffset); /* Then copy the font */ @@ -180,7 +181,7 @@ int NXF_FUNCNAME(nxf_convert,NXFONTS_SUFFIX) /* Process each byte in the glyph row */ col = 0; - dptr = (FAR NXF_PIXEL_T*)line; + dptr = (FAR NXF_PIXEL_T *)line; pixel = *dptr; mask = NXF_INITMASK; nbits = 0; @@ -218,8 +219,8 @@ int NXF_FUNCNAME(nxf_convert,NXFONTS_SUFFIX) } } - /* The entire glyph row has been rendered. Handle any fractional bytes at - * the end of the row + /* The entire glyph row has been rendered. + * Handle any fractional bytes at the end of the row */ if (nbits > 0) @@ -239,7 +240,7 @@ int NXF_FUNCNAME(nxf_convert,NXFONTS_SUFFIX) /* Process each byte in the glyph */ col = 0; - dptr = (FAR NXF_PIXEL_T*)line; + dptr = (FAR NXF_PIXEL_T *)line; for (bmndx = 0; bmndx < bm->metric.stride && col < width; bmndx++) { @@ -248,7 +249,7 @@ int NXF_FUNCNAME(nxf_convert,NXFONTS_SUFFIX) /* Process each bit in the byte */ for (bmbit = 7; bmbit >= 0 && col < width; bmbit--, col++) - { + { /* Is the bit set? */ if (bmbyte & (1 << bmbit)) @@ -270,6 +271,7 @@ int NXF_FUNCNAME(nxf_convert,NXFONTS_SUFFIX) line += stride; } + #endif return OK; } diff --git a/libs/libnx/nxfonts/nxfonts_getfont.c b/libs/libnx/nxfonts/nxfonts_getfont.c index 99301c0b52..3bf1ab5b9b 100644 --- a/libs/libnx/nxfonts/nxfonts_getfont.c +++ b/libs/libnx/nxfonts/nxfonts_getfont.c @@ -229,13 +229,13 @@ extern const struct nx_fontpackage_s g_tom_thumb_4x6_package; static FAR const struct nx_fontpackage_s *g_fontpackages[] = { -/* MONO */ + /* MONO */ #ifdef CONFIG_NXFONT_MONO5X8 &g_mono5x8_package, #endif -/* SANS */ + /* SANS */ #ifdef CONFIG_NXFONT_SANS17X22 &g_sans17x22_package, @@ -261,7 +261,7 @@ static FAR const struct nx_fontpackage_s *g_fontpackages[] = &g_sans39x48_package, #endif -/* SANS-BOLD */ + /* SANS-BOLD */ #ifdef CONFIG_NXFONT_SANS17X23B &g_sans17x23b_package, @@ -283,7 +283,7 @@ static FAR const struct nx_fontpackage_s *g_fontpackages[] = &g_sans40x49b_package, #endif -/* SERIF */ + /* SERIF */ #ifdef CONFIG_NXFONT_SERIF22X29 &g_serif22x29_package, @@ -297,7 +297,7 @@ static FAR const struct nx_fontpackage_s *g_fontpackages[] = &g_serif38x48_package, #endif -/* SERIF-BOLD */ + /* SERIF-BOLD */ #ifdef CONFIG_NXFONT_SERIF22X28B &g_serif22x28b_package, @@ -311,7 +311,7 @@ static FAR const struct nx_fontpackage_s *g_fontpackages[] = &g_serif38x49b_package, #endif -/* Pixel fonts */ + /* Pixel fonts */ #ifdef CONFIG_NXFONT_PIXEL_UNICODE &g_pixel_unicode_package, @@ -321,7 +321,7 @@ static FAR const struct nx_fontpackage_s *g_fontpackages[] = &g_pixel_lcd_machine_package, #endif -/* X11 misc fixed fonts */ + /* X11 misc fixed fonts */ #ifdef CONFIG_NXFONT_X11_MISC_FIXED_4X6 &g_x11_misc_fixed_4x6_package, @@ -411,7 +411,7 @@ static FAR const struct nx_fontpackage_s *g_fontpackages[] = &g_x11_misc_fixed_10x20_package, #endif -/* Tom Thumb mono-space 4x6 font */ + /* Tom Thumb mono-space 4x6 font */ #ifdef CONFIG_NXFONT_TOM_THUMB_4X6 &g_tom_thumb_4x6_package, @@ -513,9 +513,9 @@ NXHANDLE nxf_getfonthandle(enum nx_fontid_e fontid) /* Handle the default font package */ if (fontid == FONTID_DEFAULT) - { - fontid = NXFONT_DEFAULT; - } + { + fontid = NXFONT_DEFAULT; + } /* Then search for the font package with this ID */ diff --git a/libs/libnx/nxfonts/nxfonts_pixel-lcd-machine.h b/libs/libnx/nxfonts/nxfonts_pixel-lcd-machine.h index bff40c8b9b..f42b963894 100644 --- a/libs/libnx/nxfonts/nxfonts_pixel-lcd-machine.h +++ b/libs/libnx/nxfonts/nxfonts_pixel-lcd-machine.h @@ -93,10 +93,11 @@ #define NXFONT_METRICS_39 {1, 1, 4, 0, 0, 0} #define NXFONT_BITMAP_39 {0x80, 0x80, 0x80, 0x80} -/* 0028 (40) Empty*/ +/* 0028 (40) Empty */ #define NXFONT_METRICS_40 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_40 {0x00} -/* 0029 (41) Empty*/ + +/* 0029 (41) Empty */ #define NXFONT_METRICS_41 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_41 {0x00} @@ -104,7 +105,7 @@ #define NXFONT_METRICS_42 {1, 5, 5, 0, 0, 0} #define NXFONT_BITMAP_42 {0x70, 0x88, 0x88, 0x88, 0x70} -/* 002B (43) Empty*/ +/* 002B (43) Empty */ #define NXFONT_METRICS_43 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_43 {0x00} @@ -112,7 +113,7 @@ #define NXFONT_METRICS_44 {1, 1, 4, 0, 5, 0} #define NXFONT_BITMAP_44 {0x80, 0x80, 0x80, 0x80} -/* 002D (45) Empty*/ +/* 002D (45) Empty */ #define NXFONT_METRICS_45 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_45 {0x00} @@ -120,7 +121,7 @@ #define NXFONT_METRICS_46 {1, 5, 5, 0, 0, 0} #define NXFONT_BITMAP_46 {0x70, 0x88, 0x88, 0x88, 0x70} -/* 002F (47) Empty*/ +/* 002F (47) Empty */ #define NXFONT_METRICS_47 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_47 {0x00} @@ -164,15 +165,15 @@ #define NXFONT_METRICS_57 {1, 5, 9, 0, 0, 0} #define NXFONT_BITMAP_57 {0x70, 0x88, 0x88, 0x88, 0x70, 0x8, 0x8, 0x8, 0x8} -/* 003A (58) Empty*/ +/* 003A (58) Empty */ #define NXFONT_METRICS_58 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_58 {0x00} -/* 003B (59) Empty*/ +/* 003B (59) Empty */ #define NXFONT_METRICS_59 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_59 {0x00} -/* 003C (60) Empty*/ +/* 003C (60) Empty */ #define NXFONT_METRICS_60 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_60 {0x00} @@ -180,7 +181,7 @@ #define NXFONT_METRICS_61 {1, 5, 5, 0, 4, 0} #define NXFONT_BITMAP_61 {0xf8, 0x0, 0x0, 0x0, 0xf8} -/* 003E (62) Empty*/ +/* 003E (62) Empty */ #define NXFONT_METRICS_62 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_62 {0x00} @@ -296,19 +297,19 @@ #define NXFONT_METRICS_90 {1, 5, 9, 0, 0, 0} #define NXFONT_BITMAP_90 {0xf0, 0x8, 0x8, 0x8, 0x70, 0x80, 0x80, 0x80, 0x78} -/* 005B (91) Empty*/ +/* 005B (91) Empty */ #define NXFONT_METRICS_91 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_91 {0x00} -/* 005C (92) Empty*/ +/* 005C (92) Empty */ #define NXFONT_METRICS_92 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_92 {0x00} -/* 005D (93) Empty*/ +/* 005D (93) Empty */ #define NXFONT_METRICS_93 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_93 {0x00} -/* 005E (94) Empty*/ +/* 005E (94) Empty */ #define NXFONT_METRICS_94 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_94 {0x00} @@ -316,7 +317,7 @@ #define NXFONT_METRICS_95 {1, 3, 1, 0, 8, 0} #define NXFONT_BITMAP_95 {0xe0} -/* 0060 (96) Empty*/ +/* 0060 (96) Empty */ #define NXFONT_METRICS_96 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_96 {0x00} @@ -448,7 +449,7 @@ #define NXFONT_METRICS_197 {1, 5, 9, 0, 0, 0} #define NXFONT_BITMAP_197 {0x70, 0x88, 0x88, 0x88, 0x70, 0x88, 0x88, 0x88, 0x88} -/* 00C6 (198) Empty*/ +/* 00C6 (198) Empty */ #define NXFONT_METRICS_198 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_198 {0x00} @@ -488,7 +489,7 @@ #define NXFONT_METRICS_207 {1, 1, 9, 0, 0, 0} #define NXFONT_BITMAP_207 {0x80, 0x80, 0x80, 0x80, 0x0, 0x80, 0x80, 0x80, 0x80} -/* 00D0 (208) Empty*/ +/* 00D0 (208) Empty */ #define NXFONT_METRICS_208 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_208 {0x00} @@ -516,7 +517,7 @@ #define NXFONT_METRICS_214 {1, 5, 9, 0, 0, 0} #define NXFONT_BITMAP_214 {0x70, 0x88, 0x88, 0x88, 0x0, 0x88, 0x88, 0x88, 0x70} -/* 00D7 (215) Empty*/ +/* 00D7 (215) Empty */ #define NXFONT_METRICS_215 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_215 {0x00} @@ -540,15 +541,15 @@ #define NXFONT_METRICS_220 {1, 5, 9, 0, 0, 0} #define NXFONT_BITMAP_220 {0x88, 0x88, 0x88, 0x88, 0x0, 0x88, 0x88, 0x88, 0x70} -/* 00DD (221) Empty*/ +/* 00DD (221) Empty */ #define NXFONT_METRICS_221 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_221 {0x00} -/* 00DE (222) Empty*/ +/* 00DE (222) Empty */ #define NXFONT_METRICS_222 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_222 {0x00} -/* 00DF (223) Empty*/ +/* 00DF (223) Empty */ #define NXFONT_METRICS_223 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_223 {0x00} @@ -576,7 +577,7 @@ #define NXFONT_METRICS_229 {1, 5, 9, 0, 0, 0} #define NXFONT_BITMAP_229 {0x70, 0x88, 0x88, 0x88, 0x70, 0x88, 0x88, 0x88, 0x88} -/* 00E6 (230) Empty*/ +/* 00E6 (230) Empty */ #define NXFONT_METRICS_230 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_230 {0x00} @@ -616,7 +617,7 @@ #define NXFONT_METRICS_239 {1, 1, 9, 0, 0, 0} #define NXFONT_BITMAP_239 {0x80, 0x80, 0x80, 0x80, 0x0, 0x80, 0x80, 0x80, 0x80} -/* 00F0 (240) Empty*/ +/* 00F0 (240) Empty */ #define NXFONT_METRICS_240 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_240 {0x00} @@ -644,7 +645,7 @@ #define NXFONT_METRICS_246 {1, 5, 5, 0, 4, 0} #define NXFONT_BITMAP_246 {0x70, 0x88, 0x88, 0x88, 0x70} -/* 00F7 (247) Empty*/ +/* 00F7 (247) Empty */ #define NXFONT_METRICS_247 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_247 {0x00} @@ -668,11 +669,11 @@ #define NXFONT_METRICS_252 {1, 5, 5, 0, 4, 0} #define NXFONT_BITMAP_252 {0x88, 0x88, 0x88, 0x88, 0x70} -/* 00FD (253) Empty*/ +/* 00FD (253) Empty */ #define NXFONT_METRICS_253 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_253 {0x00} -/* 00FE (254) Empty*/ +/* 00FE (254) Empty */ #define NXFONT_METRICS_254 {1, 4, 1, 0, 8, 0} #define NXFONT_BITMAP_254 {0x00} @@ -698,7 +699,7 @@ extern "C" #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_pixel-unicode.h b/libs/libnx/nxfonts/nxfonts_pixel-unicode.h index d5bb290e3e..64b0f1e7e9 100644 --- a/libs/libnx/nxfonts/nxfonts_pixel-unicode.h +++ b/libs/libnx/nxfonts/nxfonts_pixel-unicode.h @@ -839,7 +839,7 @@ extern "C" #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_sans17x22.h b/libs/libnx/nxfonts/nxfonts_sans17x22.h index 1112444c63..039f7139a7 100644 --- a/libs/libnx/nxfonts/nxfonts_sans17x22.h +++ b/libs/libnx/nxfonts/nxfonts_sans17x22.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_sans17x23b.h b/libs/libnx/nxfonts/nxfonts_sans17x23b.h index cead902045..73b063084f 100644 --- a/libs/libnx/nxfonts/nxfonts_sans17x23b.h +++ b/libs/libnx/nxfonts/nxfonts_sans17x23b.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_sans20x26.h b/libs/libnx/nxfonts/nxfonts_sans20x26.h index 5eab38c271..1a60df5d7c 100644 --- a/libs/libnx/nxfonts/nxfonts_sans20x26.h +++ b/libs/libnx/nxfonts/nxfonts_sans20x26.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_sans20x27b.h b/libs/libnx/nxfonts/nxfonts_sans20x27b.h index baad0e3585..6a50ce7688 100644 --- a/libs/libnx/nxfonts/nxfonts_sans20x27b.h +++ b/libs/libnx/nxfonts/nxfonts_sans20x27b.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_sans22x29.h b/libs/libnx/nxfonts/nxfonts_sans22x29.h index 0b5ec38040..9ac5902056 100644 --- a/libs/libnx/nxfonts/nxfonts_sans22x29.h +++ b/libs/libnx/nxfonts/nxfonts_sans22x29.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_sans22x29b.h b/libs/libnx/nxfonts/nxfonts_sans22x29b.h index 5cc933c56b..5e8cc4fbed 100644 --- a/libs/libnx/nxfonts/nxfonts_sans22x29b.h +++ b/libs/libnx/nxfonts/nxfonts_sans22x29b.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_sans23x27.h b/libs/libnx/nxfonts/nxfonts_sans23x27.h index 05714955ba..78e2e005e1 100644 --- a/libs/libnx/nxfonts/nxfonts_sans23x27.h +++ b/libs/libnx/nxfonts/nxfonts_sans23x27.h @@ -660,7 +660,7 @@ #define NXFONT_METRICS_216 {1, 7, 9, 1, 5, 0} #define NXFONT_BITMAP_216 {0x3a, 0x44, 0x8a, 0x8a, 0x92, 0xa2, 0xa2, 0x44, 0xb8} -/*'U' grave (217) */ +/* 'U' grave (217) */ #define NXFONT_METRICS_217 {1, 6, 12, 1, 2, 0} #define NXFONT_BITMAP_217 {0x60, 0x10, 0x00, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x48, 0x30} @@ -827,13 +827,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_sans28x37.h b/libs/libnx/nxfonts/nxfonts_sans28x37.h index 10708f461b..fe52a9521f 100644 --- a/libs/libnx/nxfonts/nxfonts_sans28x37.h +++ b/libs/libnx/nxfonts/nxfonts_sans28x37.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_sans28x37b.h b/libs/libnx/nxfonts/nxfonts_sans28x37b.h index 00428f5687..8f366e4f23 100644 --- a/libs/libnx/nxfonts/nxfonts_sans28x37b.h +++ b/libs/libnx/nxfonts/nxfonts_sans28x37b.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_sans39x48.h b/libs/libnx/nxfonts/nxfonts_sans39x48.h index 2bb63b6abd..3c2ce63fc4 100644 --- a/libs/libnx/nxfonts/nxfonts_sans39x48.h +++ b/libs/libnx/nxfonts/nxfonts_sans39x48.h @@ -83,7 +83,10 @@ /* percent (37) */ #define NXFONT_METRICS_37 {4, 26, 24, 1, 13, 0} -#define NXFONT_BITMAP_37 {0x0, 0x0, 0x30, 0x0, 0x1f, 0x0, 0x70, 0x0, 0x7f, 0x80, 0x60, 0x0, 0x73, 0xc0, 0xe0, 0x0, 0xe0, 0xc0, 0xc0, 0x0, 0xc0, 0xe1, 0xc0, 0x0, 0xc0, 0xe1, 0x80, 0x0, 0xc0, 0xe3, 0x80, 0x0, 0xe0, 0xc3, 0x0, 0x0, 0x73, 0xc7, 0x0, 0x0, 0x7f, 0x86, 0x0, 0x0, 0x1f, 0xe, 0x0, 0x0, 0x0, 0xc, 0x0, 0x0, 0x0, 0x1c, 0x3e, 0x0, 0x0, 0x18, 0x7f, 0x80, 0x0, 0x38, 0xf3, 0x80, 0x0, 0x30, 0xc1, 0xc0, 0x0, 0x71, 0xc0, 0xc0, 0x0, 0x61, 0xc0, 0xc0, 0x0, 0xe1, 0xc0, 0xc0, 0x0, 0xc0, 0xc1, 0xc0, 0x1, 0xc0, 0xe3, 0x80, 0x1, 0x80, 0x7f, 0x80, 0x3, 0x80, 0x3e, 0x0} +#define NXFONT_BITMAP_37 {0x0, 0x0, 0x30, 0x0, 0x1f, 0x0, 0x70, 0x0, 0x7f, 0x80, 0x60, 0x0, 0x73, 0xc0, 0xe0, 0x0, 0xe0, 0xc0, 0xc0, 0x0, 0xc0, 0xe1, 0xc0, 0x0, 0xc0, 0xe1, 0x80,\ + 0x0, 0xc0, 0xe3, 0x80, 0x0, 0xe0, 0xc3, 0x0, 0x0, 0x73, 0xc7, 0x0, 0x0, 0x7f, 0x86, 0x0, 0x0, 0x1f, 0xe, 0x0, 0x0, 0x0, 0xc, 0x0, 0x0, 0x0, 0x1c,\ + 0x3e, 0x0, 0x0, 0x18, 0x7f, 0x80, 0x0, 0x38, 0xf3, 0x80, 0x0, 0x30, 0xc1, 0xc0, 0x0, 0x71, 0xc0, 0xc0, 0x0, 0x61, 0xc0, 0xc0, 0x0, 0xe1, 0xc0, 0xc0, 0x0,\ + 0xc0, 0xc1, 0xc0, 0x1, 0xc0, 0xe3, 0x80, 0x1, 0x80, 0x7f, 0x80, 0x3, 0x80, 0x3e, 0x0} /* ampersand (38) */ #define NXFONT_METRICS_38 {3, 18, 23, 2, 14, 0} @@ -191,7 +194,10 @@ /* at (64) */ #define NXFONT_METRICS_64 {4, 29, 30, 1, 12, 0} -#define NXFONT_BITMAP_64 {0x0, 0x7, 0xc0, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0xff, 0xfe, 0x0, 0x3, 0xf0, 0x3f, 0x80, 0x7, 0xc0, 0x7, 0xc0, 0xf, 0x0, 0x3, 0xe0, 0x1e, 0x0, 0x1, 0xe0, 0x1c, 0x0, 0x0, 0xf0, 0x38, 0xf, 0x8c, 0x70, 0x38, 0x1f, 0xdc, 0x38, 0x70, 0x3c, 0xfc, 0x38, 0x70, 0x70, 0x7c, 0x38, 0x60, 0xe0, 0x38, 0x18, 0xe0, 0xe0, 0x38, 0x18, 0xe1, 0xe0, 0x38, 0x18, 0xe1, 0xc0, 0x70, 0x38, 0xe1, 0xc0, 0x70, 0x38, 0xe1, 0xc0, 0x70, 0x70, 0xe1, 0xc0, 0xe0, 0x70, 0xe1, 0xe0, 0xe0, 0xe0, 0x70, 0xf3, 0xf3, 0xc0, 0x70, 0xff, 0x7f, 0x80, 0x78, 0x3e, 0x7f, 0x0, 0x3c, 0x0, 0x0, 0x0, 0x1e, 0x0, 0x0, 0x0, 0x1f, 0x0, 0x0, 0x0, 0xf, 0x80, 0x0, 0x0, 0x3, 0xe0, 0x78, 0x0, 0x1, 0xff, 0xf8, 0x0, 0x0, 0x7f, 0xe0, 0x0} +#define NXFONT_BITMAP_64 {0x0, 0x7, 0xc0, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0xff, 0xfe, 0x0, 0x3, 0xf0, 0x3f, 0x80, 0x7, 0xc0, 0x7, 0xc0, 0xf, 0x0, 0x3, 0xe0, 0x1e, 0x0, 0x1, 0xe0, 0x1c, 0x0, 0x0, 0xf0,\ + 0x38, 0xf, 0x8c, 0x70, 0x38, 0x1f, 0xdc, 0x38, 0x70, 0x3c, 0xfc, 0x38, 0x70, 0x70, 0x7c, 0x38, 0x60, 0xe0, 0x38, 0x18, 0xe0, 0xe0, 0x38, 0x18, 0xe1, 0xe0, 0x38, 0x18, 0xe1, 0xc0, 0x70, 0x38,\ + 0xe1, 0xc0, 0x70, 0x38, 0xe1, 0xc0, 0x70, 0x70, 0xe1, 0xc0, 0xe0, 0x70, 0xe1, 0xe0, 0xe0, 0xe0, 0x70, 0xf3, 0xf3, 0xc0, 0x70, 0xff, 0x7f, 0x80, 0x78, 0x3e, 0x7f, 0x0, 0x3c, 0x0, 0x0, 0x0,\ + 0x1e, 0x0, 0x0, 0x0, 0x1f, 0x0, 0x0, 0x0, 0xf, 0x80, 0x0, 0x0, 0x3, 0xe0, 0x78, 0x0, 0x1, 0xff, 0xf8, 0x0, 0x0, 0x7f, 0xe0, 0x0} /* A (65) */ #define NXFONT_METRICS_65 {3, 20, 25, 1, 12, 0} @@ -283,7 +289,10 @@ /* W (87) */ #define NXFONT_METRICS_87 {4, 29, 25, 1, 12, 0} -#define NXFONT_BITMAP_87 {0xf0, 0x7, 0x0, 0x78, 0xf0, 0x7, 0x0, 0x78, 0xf0, 0xf, 0x80, 0x78, 0x70, 0xf, 0x80, 0x70, 0x70, 0xf, 0x80, 0x70, 0x78, 0x1d, 0xc0, 0xf0, 0x78, 0x1d, 0xc0, 0xf0, 0x38, 0x1d, 0xc0, 0xe0, 0x38, 0x1d, 0xc0, 0xe0, 0x38, 0x38, 0xe0, 0xe0, 0x3c, 0x38, 0xe1, 0xe0, 0x1c, 0x38, 0xe1, 0xc0, 0x1c, 0x30, 0xe1, 0xc0, 0x1c, 0x70, 0x71, 0xc0, 0x1c, 0x70, 0x71, 0xc0, 0xe, 0x70, 0x73, 0x80, 0xe, 0xe0, 0x3b, 0x80, 0xe, 0xe0, 0x3b, 0x80, 0xe, 0xe0, 0x3b, 0x80, 0x7, 0xe0, 0x3f, 0x80, 0x7, 0xc0, 0x1f, 0x0, 0x7, 0xc0, 0x1f, 0x0, 0x7, 0xc0, 0x1f, 0x0, 0x3, 0x80, 0xe, 0x0, 0x3, 0x80, 0xe, 0x0} +#define NXFONT_BITMAP_87 {0xf0, 0x7, 0x0, 0x78, 0xf0, 0x7, 0x0, 0x78, 0xf0, 0xf, 0x80, 0x78, 0x70, 0xf, 0x80, 0x70, 0x70, 0xf, 0x80, 0x70, 0x78, 0x1d, 0xc0, 0xf0, 0x78, 0x1d, 0xc0, 0xf0, 0x38, 0x1d, 0xc0,\ + 0xe0, 0x38, 0x1d, 0xc0, 0xe0, 0x38, 0x38, 0xe0, 0xe0, 0x3c, 0x38, 0xe1, 0xe0, 0x1c, 0x38, 0xe1, 0xc0, 0x1c, 0x30, 0xe1, 0xc0, 0x1c, 0x70, 0x71, 0xc0, 0x1c, 0x70, 0x71, 0xc0, 0xe, 0x70,\ + 0x73, 0x80, 0xe, 0xe0, 0x3b, 0x80, 0xe, 0xe0, 0x3b, 0x80, 0xe, 0xe0, 0x3b, 0x80, 0x7, 0xe0, 0x3f, 0x80, 0x7, 0xc0, 0x1f, 0x0, 0x7, 0xc0, 0x1f, 0x0, 0x7, 0xc0, 0x1f, 0x0, 0x3,\ + 0x80, 0xe, 0x0, 0x3, 0x80, 0xe, 0x0} /* X (88) */ #define NXFONT_METRICS_88 {3, 20, 25, 1, 12, 0} @@ -551,15 +560,21 @@ /* onequarter (188) */ #define NXFONT_METRICS_188 {4, 25, 25, 1, 12, 0} -#define NXFONT_BITMAP_188 {0x0, 0x0, 0x30, 0x0, 0x18, 0x0, 0x70, 0x0, 0x38, 0x0, 0x60, 0x0, 0xf8, 0x0, 0xe0, 0x0, 0xf8, 0x1, 0xc0, 0x0, 0x18, 0x1, 0x80, 0x0, 0x18, 0x3, 0x80, 0x0, 0x18, 0x3, 0x0, 0x0, 0x18, 0x7, 0x0, 0x0, 0x18, 0xe, 0x0, 0x0, 0x18, 0xc, 0x0, 0x0, 0x18, 0x1c, 0x6, 0x0, 0x18, 0x18, 0xe, 0x0, 0x18, 0x38, 0x1e, 0x0, 0x18, 0x70, 0x3e, 0x0, 0x18, 0x60, 0x76, 0x0, 0x0, 0xe0, 0x66, 0x0, 0x1, 0xc0, 0xc6, 0x0, 0x1, 0x81, 0xc6, 0x0, 0x3, 0x83, 0x86, 0x0, 0x3, 0x3, 0xff, 0x80, 0x7, 0x3, 0xff, 0x80, 0x6, 0x0, 0x6, 0x0, 0xe, 0x0, 0x6, 0x0, 0xc, 0x0, 0x6, 0x0} +#define NXFONT_BITMAP_188 {0x0, 0x0, 0x30, 0x0, 0x18, 0x0, 0x70, 0x0, 0x38, 0x0, 0x60, 0x0, 0xf8, 0x0, 0xe0, 0x0, 0xf8, 0x1, 0xc0, 0x0, 0x18, 0x1, 0x80, 0x0, 0x18, 0x3, 0x80, 0x0, 0x18, 0x3, 0x0, 0x0, 0x18,\ + 0x7, 0x0, 0x0, 0x18, 0xe, 0x0, 0x0, 0x18, 0xc, 0x0, 0x0, 0x18, 0x1c, 0x6, 0x0, 0x18, 0x18, 0xe, 0x0, 0x18, 0x38, 0x1e, 0x0, 0x18, 0x70, 0x3e, 0x0, 0x18, 0x60, 0x76, 0x0, 0x0, 0xe0,\ + 0x66, 0x0, 0x1, 0xc0, 0xc6, 0x0, 0x1, 0x81, 0xc6, 0x0, 0x3, 0x83, 0x86, 0x0, 0x3, 0x3, 0xff, 0x80, 0x7, 0x3, 0xff, 0x80, 0x6, 0x0, 0x6, 0x0, 0xe, 0x0, 0x6, 0x0, 0xc, 0x0, 0x6, 0x0} /* onehalf (189) */ #define NXFONT_METRICS_189 {4, 25, 25, 1, 12, 0} -#define NXFONT_BITMAP_189 {0x0, 0x0, 0x60, 0x0, 0x18, 0x0, 0xe0, 0x0, 0x38, 0x0, 0xc0, 0x0, 0xf8, 0x1, 0x80, 0x0, 0xf8, 0x3, 0x80, 0x0, 0x18, 0x3, 0x0, 0x0, 0x18, 0x6, 0x0, 0x0, 0x18, 0xe, 0x0, 0x0, 0x18, 0xc, 0x0, 0x0, 0x18, 0x1c, 0x0, 0x0, 0x18, 0x18, 0x0, 0x0, 0x18, 0x38, 0x3c, 0x0, 0x18, 0x30, 0xff, 0x0, 0x18, 0x70, 0xc3, 0x80, 0x18, 0x61, 0x81, 0x80, 0x18, 0xc1, 0x81, 0x80, 0x1, 0xc0, 0x3, 0x80, 0x1, 0x80, 0x7, 0x0, 0x3, 0x80, 0xe, 0x0, 0x3, 0x0, 0x3c, 0x0, 0x6, 0x0, 0x70, 0x0, 0xe, 0x0, 0xe0, 0x0, 0xc, 0x1, 0xc0, 0x0, 0x1c, 0x1, 0xff, 0x80, 0x18, 0x1, 0xff, 0x80} +#define NXFONT_BITMAP_189 {0x0, 0x0, 0x60, 0x0, 0x18, 0x0, 0xe0, 0x0, 0x38, 0x0, 0xc0, 0x0, 0xf8, 0x1, 0x80, 0x0, 0xf8, 0x3, 0x80, 0x0, 0x18, 0x3, 0x0, 0x0, 0x18, 0x6, 0x0, 0x0, 0x18, 0xe, 0x0, 0x0, 0x18,\ + 0xc, 0x0, 0x0, 0x18, 0x1c, 0x0, 0x0, 0x18, 0x18, 0x0, 0x0, 0x18, 0x38, 0x3c, 0x0, 0x18, 0x30, 0xff, 0x0, 0x18, 0x70, 0xc3, 0x80, 0x18, 0x61, 0x81, 0x80, 0x18, 0xc1, 0x81, 0x80, 0x1, 0xc0,\ + 0x3, 0x80, 0x1, 0x80, 0x7, 0x0, 0x3, 0x80, 0xe, 0x0, 0x3, 0x0, 0x3c, 0x0, 0x6, 0x0, 0x70, 0x0, 0xe, 0x0, 0xe0, 0x0, 0xc, 0x1, 0xc0, 0x0, 0x1c, 0x1, 0xff, 0x80, 0x18, 0x1, 0xff, 0x80} /* threequarters (190) */ #define NXFONT_METRICS_190 {4, 25, 24, 1, 13, 0} -#define NXFONT_BITMAP_190 {0x3e, 0x0, 0xe, 0x0, 0x7f, 0x0, 0xc, 0x0, 0x63, 0x80, 0x18, 0x0, 0xc1, 0x80, 0x38, 0x0, 0xc1, 0x80, 0x30, 0x0, 0x3, 0x80, 0x60, 0x0, 0xf, 0x0, 0xe0, 0x0, 0xf, 0x80, 0xc0, 0x0, 0x1, 0xc1, 0x80, 0x0, 0x0, 0xc3, 0x80, 0x0, 0xc0, 0xc3, 0x6, 0x0, 0xc0, 0xc7, 0xe, 0x0, 0x61, 0xce, 0x1e, 0x0, 0x7f, 0x8c, 0x3e, 0x0, 0x1e, 0x18, 0x76, 0x0, 0x0, 0x38, 0x66, 0x0, 0x0, 0x30, 0xc6, 0x0, 0x0, 0x61, 0xc6, 0x0, 0x0, 0xe3, 0x86, 0x0, 0x1, 0xc3, 0xff, 0x80, 0x1, 0x83, 0xff, 0x80, 0x3, 0x0, 0x6, 0x0, 0x7, 0x0, 0x6, 0x0, 0x6, 0x0, 0x6, 0x0} +#define NXFONT_BITMAP_190 {0x3e, 0x0, 0xe, 0x0, 0x7f, 0x0, 0xc, 0x0, 0x63, 0x80, 0x18, 0x0, 0xc1, 0x80, 0x38, 0x0, 0xc1, 0x80, 0x30, 0x0, 0x3, 0x80, 0x60, 0x0, 0xf, 0x0, 0xe0, 0x0, 0xf, 0x80, 0xc0, 0x0, 0x1,\ + 0xc1, 0x80, 0x0, 0x0, 0xc3, 0x80, 0x0, 0xc0, 0xc3, 0x6, 0x0, 0xc0, 0xc7, 0xe, 0x0, 0x61, 0xce, 0x1e, 0x0, 0x7f, 0x8c, 0x3e, 0x0, 0x1e, 0x18, 0x76, 0x0, 0x0, 0x38, 0x66, 0x0, 0x0, 0x30,\ + 0xc6, 0x0, 0x0, 0x61, 0xc6, 0x0, 0x0, 0xe3, 0x86, 0x0, 0x1, 0xc3, 0xff, 0x80, 0x1, 0x83, 0xff, 0x80, 0x3, 0x0, 0x6, 0x0, 0x7, 0x0, 0x6, 0x0, 0x6, 0x0, 0x6, 0x0} /* questiondown (191) */ #define NXFONT_METRICS_191 {2, 14, 25, 3, 19, 0} @@ -567,51 +582,75 @@ /* Agrave (192) */ #define NXFONT_METRICS_192 {3, 20, 31, 1, 6, 0} -#define NXFONT_BITMAP_192 {0x3, 0xc0, 0x0, 0x1, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0x70, 0x0, 0x0, 0x38, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x3, 0xfc, 0x0, 0x3, 0x9c, 0x0, 0x3, 0x9c, 0x0, 0x7, 0x9e, 0x0, 0x7, 0xe, 0x0, 0x7, 0xe, 0x0, 0xf, 0xf, 0x0, 0xe, 0xf, 0x0, 0xe, 0x7, 0x0, 0x1e, 0x7, 0x80, 0x1f, 0xff, 0x80, 0x1f, 0xff, 0x80, 0x3f, 0xff, 0xc0, 0x3c, 0x3, 0xc0, 0x38, 0x1, 0xc0, 0x78, 0x1, 0xe0, 0x78, 0x1, 0xe0, 0x70, 0x0, 0xe0, 0xf0, 0x0, 0xf0, 0xf0, 0x0, 0xf0} +#define NXFONT_BITMAP_192 {0x3, 0xc0, 0x0, 0x1, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0x70, 0x0, 0x0, 0x38, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x3, 0xfc,\ + 0x0, 0x3, 0x9c, 0x0, 0x3, 0x9c, 0x0, 0x7, 0x9e, 0x0, 0x7, 0xe, 0x0, 0x7, 0xe, 0x0, 0xf, 0xf, 0x0, 0xe, 0xf, 0x0, 0xe, 0x7, 0x0, 0x1e, 0x7, 0x80, 0x1f, 0xff, 0x80, 0x1f, 0xff, 0x80, 0x3f,\ + 0xff, 0xc0, 0x3c, 0x3, 0xc0, 0x38, 0x1, 0xc0, 0x78, 0x1, 0xe0, 0x78, 0x1, 0xe0, 0x70, 0x0, 0xe0, 0xf0, 0x0, 0xf0, 0xf0, 0x0, 0xf0} /* Aacute (193) */ #define NXFONT_METRICS_193 {3, 20, 31, 1, 6, 0} -#define NXFONT_BITMAP_193 {0x0, 0x3c, 0x0, 0x0, 0x78, 0x0, 0x0, 0x70, 0x0, 0x0, 0xe0, 0x0, 0x1, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x3, 0xfc, 0x0, 0x3, 0x9c, 0x0, 0x3, 0x9c, 0x0, 0x7, 0x9e, 0x0, 0x7, 0xe, 0x0, 0x7, 0xe, 0x0, 0xf, 0xf, 0x0, 0xf, 0xf, 0x0, 0xe, 0x7, 0x0, 0x1e, 0x7, 0x80, 0x1f, 0xff, 0x80, 0x1f, 0xff, 0x80, 0x3f, 0xff, 0xc0, 0x3c, 0x3, 0xc0, 0x78, 0x1, 0xc0, 0x78, 0x1, 0xe0, 0x78, 0x1, 0xe0, 0x70, 0x0, 0xe0, 0xf0, 0x0, 0xf0, 0xf0, 0x0, 0xf0} +#define NXFONT_BITMAP_193 {0x0, 0x3c, 0x0, 0x0, 0x78, 0x0, 0x0, 0x70, 0x0, 0x0, 0xe0, 0x0, 0x1, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x3, 0xfc, 0x0,\ + 0x3, 0x9c, 0x0, 0x3, 0x9c, 0x0, 0x7, 0x9e, 0x0, 0x7, 0xe, 0x0, 0x7, 0xe, 0x0, 0xf, 0xf, 0x0, 0xf, 0xf, 0x0, 0xe, 0x7, 0x0, 0x1e, 0x7, 0x80, 0x1f, 0xff, 0x80, 0x1f, 0xff, 0x80, 0x3f, 0xff, 0xc0,\ + 0x3c, 0x3, 0xc0, 0x78, 0x1, 0xc0, 0x78, 0x1, 0xe0, 0x78, 0x1, 0xe0, 0x70, 0x0, 0xe0, 0xf0, 0x0, 0xf0, 0xf0, 0x0, 0xf0} /* Acircumflex (194) */ #define NXFONT_METRICS_194 {3, 20, 31, 1, 6, 0} -#define NXFONT_BITMAP_194 {0x0, 0x40, 0x0, 0x0, 0xe0, 0x0, 0x1, 0xf0, 0x0, 0x3, 0xb8, 0x0, 0x7, 0x1c, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x3, 0xfc, 0x0, 0x3, 0x9c, 0x0, 0x3, 0x9c, 0x0, 0x7, 0x9e, 0x0, 0x7, 0xe, 0x0, 0x7, 0xe, 0x0, 0xf, 0xf, 0x0, 0xf, 0xf, 0x0, 0xe, 0x7, 0x0, 0x1e, 0x7, 0x80, 0x1f, 0xff, 0x80, 0x1f, 0xff, 0x80, 0x3f, 0xff, 0xc0, 0x3c, 0x3, 0xc0, 0x38, 0x1, 0xc0, 0x78, 0x1, 0xe0, 0x78, 0x1, 0xe0, 0x70, 0x0, 0xe0, 0xf0, 0x0, 0xf0, 0xf0, 0x0, 0xf0} +#define NXFONT_BITMAP_194 {0x0, 0x40, 0x0, 0x0, 0xe0, 0x0, 0x1, 0xf0, 0x0, 0x3, 0xb8, 0x0, 0x7, 0x1c, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x3,\ + 0xfc, 0x0, 0x3, 0x9c, 0x0, 0x3, 0x9c, 0x0, 0x7, 0x9e, 0x0, 0x7, 0xe, 0x0, 0x7, 0xe, 0x0, 0xf, 0xf, 0x0, 0xf, 0xf, 0x0, 0xe, 0x7, 0x0, 0x1e, 0x7, 0x80, 0x1f, 0xff, 0x80, 0x1f, 0xff,\ + 0x80, 0x3f, 0xff, 0xc0, 0x3c, 0x3, 0xc0, 0x38, 0x1, 0xc0, 0x78, 0x1, 0xe0, 0x78, 0x1, 0xe0, 0x70, 0x0, 0xe0, 0xf0, 0x0, 0xf0, 0xf0, 0x0, 0xf0} /* Atilde (195) */ #define NXFONT_METRICS_195 {3, 20, 30, 1, 7, 0} -#define NXFONT_BITMAP_195 {0x1, 0xc6, 0x0, 0x3, 0xfe, 0x0, 0x7, 0xfc, 0x0, 0x6, 0x38, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x3, 0xfc, 0x0, 0x3, 0x9c, 0x0, 0x3, 0x9c, 0x0, 0x7, 0x9e, 0x0, 0x7, 0xe, 0x0, 0x7, 0xe, 0x0, 0xf, 0xf, 0x0, 0xf, 0xf, 0x0, 0xe, 0x7, 0x0, 0x1e, 0x7, 0x80, 0x1f, 0xff, 0x80, 0x1f, 0xff, 0x80, 0x3f, 0xff, 0xc0, 0x3c, 0x3, 0xc0, 0x38, 0x1, 0xc0, 0x78, 0x1, 0xe0, 0x78, 0x1, 0xe0, 0x70, 0x0, 0xe0, 0xf0, 0x0, 0xf0, 0xf0, 0x0, 0xf0} +#define NXFONT_BITMAP_195 {0x1, 0xc6, 0x0, 0x3, 0xfe, 0x0, 0x7, 0xfc, 0x0, 0x6, 0x38, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x3, 0xfc, 0x0, 0x3, 0x9c,\ + 0x0, 0x3, 0x9c, 0x0, 0x7, 0x9e, 0x0, 0x7, 0xe, 0x0, 0x7, 0xe, 0x0, 0xf, 0xf, 0x0, 0xf, 0xf, 0x0, 0xe, 0x7, 0x0, 0x1e, 0x7, 0x80, 0x1f, 0xff, 0x80, 0x1f, 0xff, 0x80, 0x3f, 0xff, 0xc0, 0x3c,\ + 0x3, 0xc0, 0x38, 0x1, 0xc0, 0x78, 0x1, 0xe0, 0x78, 0x1, 0xe0, 0x70, 0x0, 0xe0, 0xf0, 0x0, 0xf0, 0xf0, 0x0, 0xf0} /* Adieresis (196) */ #define NXFONT_METRICS_196 {3, 20, 30, 1, 7, 0} -#define NXFONT_BITMAP_196 {0x3, 0x9c, 0x0, 0x3, 0x9c, 0x0, 0x3, 0x9c, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x3, 0xfc, 0x0, 0x3, 0x9c, 0x0, 0x3, 0x9c, 0x0, 0x7, 0x9e, 0x0, 0x7, 0xe, 0x0, 0x7, 0xe, 0x0, 0xf, 0xf, 0x0, 0xf, 0xf, 0x0, 0xe, 0x7, 0x0, 0x1e, 0x7, 0x80, 0x1f, 0xff, 0x80, 0x1f, 0xff, 0x80, 0x3f, 0xff, 0xc0, 0x3c, 0x3, 0xc0, 0x38, 0x1, 0xc0, 0x78, 0x1, 0xe0, 0x78, 0x1, 0xe0, 0x70, 0x0, 0xe0, 0xf0, 0x0, 0xf0, 0xf0, 0x0, 0xf0} +#define NXFONT_BITMAP_196 {0x3, 0x9c, 0x0, 0x3, 0x9c, 0x0, 0x3, 0x9c, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x3, 0xfc, 0x0, 0x3, 0x9c,\ + 0x0, 0x3, 0x9c, 0x0, 0x7, 0x9e, 0x0, 0x7, 0xe, 0x0, 0x7, 0xe, 0x0, 0xf, 0xf, 0x0, 0xf, 0xf, 0x0, 0xe, 0x7, 0x0, 0x1e, 0x7, 0x80, 0x1f, 0xff, 0x80, 0x1f, 0xff, 0x80, 0x3f, 0xff, 0xc0, 0x3c,\ + 0x3, 0xc0, 0x38, 0x1, 0xc0, 0x78, 0x1, 0xe0, 0x78, 0x1, 0xe0, 0x70, 0x0, 0xe0, 0xf0, 0x0, 0xf0, 0xf0, 0x0, 0xf0} /* Aring (197) */ #define NXFONT_METRICS_197 {3, 20, 31, 1, 6, 0} -#define NXFONT_BITMAP_197 {0x0, 0xf0, 0x0, 0x1, 0x98, 0x0, 0x1, 0x8, 0x0, 0x1, 0x8, 0x0, 0x1, 0x98, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x3, 0xfc, 0x0, 0x3, 0x9c, 0x0, 0x3, 0x9c, 0x0, 0x7, 0x9e, 0x0, 0x7, 0xe, 0x0, 0x7, 0xe, 0x0, 0xf, 0xf, 0x0, 0xe, 0xf, 0x0, 0xe, 0x7, 0x0, 0x1e, 0x7, 0x80, 0x1f, 0xff, 0x80, 0x1f, 0xff, 0x80, 0x3f, 0xff, 0xc0, 0x3c, 0x3, 0xc0, 0x38, 0x1, 0xc0, 0x78, 0x1, 0xe0, 0x78, 0x1, 0xe0, 0x70, 0x0, 0xe0, 0xf0, 0x0, 0xf0, 0xf0, 0x0, 0xf0} +#define NXFONT_BITMAP_197 {0x0, 0xf0, 0x0, 0x1, 0x98, 0x0, 0x1, 0x8, 0x0, 0x1, 0x8, 0x0, 0x1, 0x98, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x3,\ + 0xfc, 0x0, 0x3, 0x9c, 0x0, 0x3, 0x9c, 0x0, 0x7, 0x9e, 0x0, 0x7, 0xe, 0x0, 0x7, 0xe, 0x0, 0xf, 0xf, 0x0, 0xe, 0xf, 0x0, 0xe, 0x7, 0x0, 0x1e, 0x7, 0x80, 0x1f, 0xff, 0x80, 0x1f, 0xff,\ + 0x80, 0x3f, 0xff, 0xc0, 0x3c, 0x3, 0xc0, 0x38, 0x1, 0xc0, 0x78, 0x1, 0xe0, 0x78, 0x1, 0xe0, 0x70, 0x0, 0xe0, 0xf0, 0x0, 0xf0, 0xf0, 0x0, 0xf0} /* AE (198) */ #define NXFONT_METRICS_198 {4, 29, 25, 1, 12, 0} -#define NXFONT_BITMAP_198 {0x0, 0x7f, 0xff, 0xf8, 0x0, 0x7f, 0xff, 0xf8, 0x0, 0xff, 0xff, 0xf8, 0x0, 0xe3, 0x80, 0x0, 0x1, 0xc3, 0x80, 0x0, 0x1, 0xc3, 0x80, 0x0, 0x3, 0xc3, 0x80, 0x0, 0x3, 0x83, 0x80, 0x0, 0x3, 0x83, 0x80, 0x0, 0x7, 0x83, 0x80, 0x0, 0x7, 0x3, 0x80, 0x0, 0x7, 0x3, 0xff, 0xf0, 0xf, 0x3, 0xff, 0xf0, 0xe, 0x3, 0xff, 0xf0, 0x1e, 0x3, 0x80, 0x0, 0x1f, 0xff, 0x80, 0x0, 0x1f, 0xff, 0x80, 0x0, 0x3f, 0xff, 0x80, 0x0, 0x38, 0x3, 0x80, 0x0, 0x78, 0x3, 0x80, 0x0, 0x78, 0x3, 0x80, 0x0, 0x70, 0x3, 0x80, 0x0, 0xf0, 0x3, 0xff, 0xf8, 0xe0, 0x3, 0xff, 0xf8, 0xe0, 0x3, 0xff, 0xf8} +#define NXFONT_BITMAP_198 {0x0, 0x7f, 0xff, 0xf8, 0x0, 0x7f, 0xff, 0xf8, 0x0, 0xff, 0xff, 0xf8, 0x0, 0xe3, 0x80, 0x0, 0x1, 0xc3, 0x80, 0x0, 0x1, 0xc3, 0x80, 0x0, 0x3, 0xc3, 0x80, 0x0, 0x3, 0x83, 0x80, 0x0, 0x3,\ + 0x83, 0x80, 0x0, 0x7, 0x83, 0x80, 0x0, 0x7, 0x3, 0x80, 0x0, 0x7, 0x3, 0xff, 0xf0, 0xf, 0x3, 0xff, 0xf0, 0xe, 0x3, 0xff, 0xf0, 0x1e, 0x3, 0x80, 0x0, 0x1f, 0xff, 0x80, 0x0, 0x1f, 0xff,\ + 0x80, 0x0, 0x3f, 0xff, 0x80, 0x0, 0x38, 0x3, 0x80, 0x0, 0x78, 0x3, 0x80, 0x0, 0x78, 0x3, 0x80, 0x0, 0x70, 0x3, 0x80, 0x0, 0xf0, 0x3, 0xff, 0xf8, 0xe0, 0x3, 0xff, 0xf8, 0xe0, 0x3, 0xff, 0xf8} /* Ccedilla (199) */ #define NXFONT_METRICS_199 {3, 20, 32, 2, 12, 0} -#define NXFONT_BITMAP_199 {0x1, 0xf8, 0x0, 0x7, 0xfe, 0x0, 0xf, 0xff, 0x80, 0x1f, 0x7, 0x80, 0x3c, 0x3, 0xc0, 0x78, 0x1, 0xe0, 0x70, 0x0, 0xe0, 0x70, 0x0, 0xe0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xf0, 0x0, 0x70, 0xf0, 0x0, 0x70, 0x70, 0x0, 0xf0, 0x70, 0x0, 0xe0, 0x78, 0x1, 0xe0, 0x3c, 0x3, 0xc0, 0x1f, 0x7, 0xc0, 0xf, 0xff, 0x80, 0x7, 0xfe, 0x0, 0x1, 0xf8, 0x0, 0x0, 0x60, 0x0, 0x0, 0x60, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x38, 0x0, 0x0, 0x18, 0x0, 0x3, 0x38, 0x0, 0x1, 0xf0, 0x0} +#define NXFONT_BITMAP_199 {0x1, 0xf8, 0x0, 0x7, 0xfe, 0x0, 0xf, 0xff, 0x80, 0x1f, 0x7, 0x80, 0x3c, 0x3, 0xc0, 0x78, 0x1, 0xe0, 0x70, 0x0, 0xe0, 0x70, 0x0, 0xe0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0,\ + 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xf0, 0x0, 0x70, 0xf0, 0x0, 0x70, 0x70, 0x0, 0xf0, 0x70, 0x0, 0xe0, 0x78, 0x1, 0xe0, 0x3c, 0x3, 0xc0, 0x1f, 0x7, 0xc0, 0xf, 0xff,\ + 0x80, 0x7, 0xfe, 0x0, 0x1, 0xf8, 0x0, 0x0, 0x60, 0x0, 0x0, 0x60, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x38, 0x0, 0x0, 0x18, 0x0, 0x3, 0x38, 0x0, 0x1, 0xf0, 0x0} /* Egrave (200) */ #define NXFONT_METRICS_200 {3, 17, 31, 3, 6, 0} -#define NXFONT_BITMAP_200 {0xf, 0x0, 0x0, 0x7, 0x80, 0x0, 0x3, 0x80, 0x0, 0x1, 0xc0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80} +#define NXFONT_BITMAP_200 {0xf, 0x0, 0x0, 0x7, 0x80, 0x0, 0x3, 0x80, 0x0, 0x1, 0xc0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0,\ + 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0,\ + 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80} /* Eacute (201) */ #define NXFONT_METRICS_201 {3, 17, 31, 3, 6, 0} -#define NXFONT_BITMAP_201 {0x0, 0x78, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xe0, 0x0, 0x1, 0xc0, 0x0, 0x3, 0x80, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80} +#define NXFONT_BITMAP_201 {0x0, 0x78, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xe0, 0x0, 0x1, 0xc0, 0x0, 0x3, 0x80, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0,\ + 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0,\ + 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80} /* Ecircumflex (202) */ #define NXFONT_METRICS_202 {3, 17, 31, 3, 6, 0} -#define NXFONT_BITMAP_202 {0x0, 0x80, 0x0, 0x1, 0xc0, 0x0, 0x3, 0xe0, 0x0, 0x7, 0x70, 0x0, 0xe, 0x38, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80} +#define NXFONT_BITMAP_202 {0x0, 0x80, 0x0, 0x1, 0xc0, 0x0, 0x3, 0xe0, 0x0, 0x7, 0x70, 0x0, 0xe, 0x38, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0,\ + 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0,\ + 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80} /* Edieresis (203) */ #define NXFONT_METRICS_203 {3, 17, 30, 3, 7, 0} -#define NXFONT_BITMAP_203 {0x1c, 0x38, 0x0, 0x1c, 0x38, 0x0, 0x1c, 0x38, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80} +#define NXFONT_BITMAP_203 {0x1c, 0x38, 0x0, 0x1c, 0x38, 0x0, 0x1c, 0x38, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0,\ + 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0,\ + 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80} /* Igrave (204) */ #define NXFONT_METRICS_204 {1, 7, 31, 0, 6, 0} @@ -635,23 +674,33 @@ /* Ntilde (209) */ #define NXFONT_METRICS_209 {3, 19, 30, 2, 7, 0} -#define NXFONT_BITMAP_209 {0x1, 0xc6, 0x0, 0x3, 0xfe, 0x0, 0x7, 0xfc, 0x0, 0x6, 0x38, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0, 0xe0, 0xf8, 0x0, 0xe0, 0xf8, 0x0, 0xe0, 0xfc, 0x0, 0xe0, 0xfc, 0x0, 0xe0, 0xfe, 0x0, 0xe0, 0xef, 0x0, 0xe0, 0xe7, 0x0, 0xe0, 0xe7, 0x80, 0xe0, 0xe3, 0xc0, 0xe0, 0xe3, 0xc0, 0xe0, 0xe1, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xe0, 0xe0, 0x78, 0xe0, 0xe0, 0x38, 0xe0, 0xe0, 0x3c, 0xe0, 0xe0, 0x1c, 0xe0, 0xe0, 0x1e, 0xe0, 0xe0, 0xf, 0xe0, 0xe0, 0x7, 0xe0, 0xe0, 0x7, 0xe0, 0xe0, 0x3, 0xe0, 0xe0, 0x1, 0xe0, 0xe0, 0x1, 0xe0} +#define NXFONT_BITMAP_209 {0x1, 0xc6, 0x0, 0x3, 0xfe, 0x0, 0x7, 0xfc, 0x0, 0x6, 0x38, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0, 0xe0, 0xf8, 0x0, 0xe0, 0xf8, 0x0, 0xe0, 0xfc, 0x0, 0xe0, 0xfc, 0x0, 0xe0, 0xfe, 0x0,\ + 0xe0, 0xef, 0x0, 0xe0, 0xe7, 0x0, 0xe0, 0xe7, 0x80, 0xe0, 0xe3, 0xc0, 0xe0, 0xe3, 0xc0, 0xe0, 0xe1, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xe0, 0xe0, 0x78, 0xe0, 0xe0, 0x38, 0xe0, 0xe0,\ + 0x3c, 0xe0, 0xe0, 0x1c, 0xe0, 0xe0, 0x1e, 0xe0, 0xe0, 0xf, 0xe0, 0xe0, 0x7, 0xe0, 0xe0, 0x7, 0xe0, 0xe0, 0x3, 0xe0, 0xe0, 0x1, 0xe0, 0xe0, 0x1, 0xe0} /* Ograve (210) */ #define NXFONT_METRICS_210 {3, 23, 31, 1, 6, 0} -#define NXFONT_BITMAP_210 {0x0, 0xf0, 0x0, 0x0, 0x78, 0x0, 0x0, 0x38, 0x0, 0x0, 0x1c, 0x0, 0x0, 0xe, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x3, 0xff, 0x80, 0xf, 0xff, 0xe0, 0x1f, 0x1, 0xf0, 0x3e, 0x0, 0xf8, 0x3c, 0x0, 0x78, 0x78, 0x0, 0x3c, 0x70, 0x0, 0x1c, 0x70, 0x0, 0x1c, 0xf0, 0x0, 0x1e, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xf0, 0x0, 0x1e, 0xf0, 0x0, 0x1e, 0x70, 0x0, 0x1c, 0x78, 0x0, 0x3c, 0x3c, 0x0, 0x78, 0x3e, 0x0, 0xf8, 0x1f, 0x1, 0xf0, 0xf, 0xff, 0xe0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0} +#define NXFONT_BITMAP_210 {0x0, 0xf0, 0x0, 0x0, 0x78, 0x0, 0x0, 0x38, 0x0, 0x0, 0x1c, 0x0, 0x0, 0xe, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x3, 0xff, 0x80, 0xf, 0xff, 0xe0, 0x1f, 0x1, 0xf0, 0x3e, 0x0, 0xf8,\ + 0x3c, 0x0, 0x78, 0x78, 0x0, 0x3c, 0x70, 0x0, 0x1c, 0x70, 0x0, 0x1c, 0xf0, 0x0, 0x1e, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xf0, 0x0, 0x1e,\ + 0xf0, 0x0, 0x1e, 0x70, 0x0, 0x1c, 0x78, 0x0, 0x3c, 0x3c, 0x0, 0x78, 0x3e, 0x0, 0xf8, 0x1f, 0x1, 0xf0, 0xf, 0xff, 0xe0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0} /* Oacute (211) */ #define NXFONT_METRICS_211 {3, 23, 31, 1, 6, 0} -#define NXFONT_BITMAP_211 {0x0, 0xf, 0x0, 0x0, 0x1e, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x38, 0x0, 0x0, 0x70, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x3, 0xff, 0x80, 0xf, 0xff, 0xe0, 0x1f, 0x1, 0xf0, 0x3e, 0x0, 0xf8, 0x3c, 0x0, 0x78, 0x78, 0x0, 0x3c, 0x70, 0x0, 0x1c, 0x70, 0x0, 0x1c, 0xf0, 0x0, 0x1e, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xf0, 0x0, 0x1e, 0xf0, 0x0, 0x1e, 0x70, 0x0, 0x1c, 0x78, 0x0, 0x3c, 0x3c, 0x0, 0x78, 0x3e, 0x0, 0xf8, 0x1f, 0x1, 0xf0, 0xf, 0xff, 0xe0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0} +#define NXFONT_BITMAP_211 {0x0, 0xf, 0x0, 0x0, 0x1e, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x38, 0x0, 0x0, 0x70, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x3, 0xff, 0x80, 0xf, 0xff, 0xe0, 0x1f, 0x1, 0xf0, 0x3e, 0x0, \ + 0xf8, 0x3c, 0x0, 0x78, 0x78, 0x0, 0x3c, 0x70, 0x0, 0x1c, 0x70, 0x0, 0x1c, 0xf0, 0x0, 0x1e, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xf0,\ + 0x0, 0x1e, 0xf0, 0x0, 0x1e, 0x70, 0x0, 0x1c, 0x78, 0x0, 0x3c, 0x3c, 0x0, 0x78, 0x3e, 0x0, 0xf8, 0x1f, 0x1, 0xf0, 0xf, 0xff, 0xe0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0} /* Ocircumflex (212) */ #define NXFONT_METRICS_212 {3, 23, 31, 1, 6, 0} -#define NXFONT_BITMAP_212 {0x0, 0x10, 0x0, 0x0, 0x38, 0x0, 0x0, 0x7c, 0x0, 0x0, 0xee, 0x0, 0x1, 0xc7, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x3, 0xff, 0x80, 0xf, 0xff, 0xe0, 0x1f, 0x1, 0xf0, 0x3e, 0x0, 0xf8, 0x3c, 0x0, 0x78, 0x78, 0x0, 0x3c, 0x70, 0x0, 0x1c, 0x70, 0x0, 0x1c, 0xf0, 0x0, 0x1e, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xf0, 0x0, 0x1e, 0xf0, 0x0, 0x1e, 0x70, 0x0, 0x1c, 0x78, 0x0, 0x3c, 0x3c, 0x0, 0x78, 0x3e, 0x0, 0xf8, 0x1f, 0x1, 0xf0, 0xf, 0xff, 0xe0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0} +#define NXFONT_BITMAP_212 {0x0, 0x10, 0x0, 0x0, 0x38, 0x0, 0x0, 0x7c, 0x0, 0x0, 0xee, 0x0, 0x1, 0xc7, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x3, 0xff, 0x80, 0xf, 0xff, 0xe0, 0x1f, 0x1, 0xf0, 0x3e, 0x0,\ + 0xf8, 0x3c, 0x0, 0x78, 0x78, 0x0, 0x3c, 0x70, 0x0, 0x1c, 0x70, 0x0, 0x1c, 0xf0, 0x0, 0x1e, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xf0,\ + 0x0, 0x1e, 0xf0, 0x0, 0x1e, 0x70, 0x0, 0x1c, 0x78, 0x0, 0x3c, 0x3c, 0x0, 0x78, 0x3e, 0x0, 0xf8, 0x1f, 0x1, 0xf0, 0xf, 0xff, 0xe0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0} /* Otilde (213) */ #define NXFONT_METRICS_213 {3, 23, 30, 1, 7, 0} -#define NXFONT_BITMAP_213 {0x0, 0x71, 0x80, 0x0, 0xff, 0x80, 0x1, 0xff, 0x0, 0x1, 0x8e, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x3, 0xff, 0x80, 0xf, 0xff, 0xe0, 0x1f, 0x1, 0xf0, 0x3e, 0x0, 0xf8, 0x3c, 0x0, 0x78, 0x78, 0x0, 0x3c, 0x70, 0x0, 0x1c, 0x70, 0x0, 0x1c, 0xf0, 0x0, 0x1e, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xf0, 0x0, 0x1e, 0xf0, 0x0, 0x1e, 0x70, 0x0, 0x1c, 0x78, 0x0, 0x3c, 0x3c, 0x0, 0x78, 0x3e, 0x0, 0xf8, 0x1f, 0x1, 0xf0, 0xf, 0xff, 0xe0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0} +#define NXFONT_BITMAP_213 {0x0, 0x71, 0x80, 0x0, 0xff, 0x80, 0x1, 0xff, 0x0, 0x1, 0x8e, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x3, 0xff, 0x80, 0xf, 0xff, 0xe0, 0x1f, 0x1, 0xf0, 0x3e, 0x0, 0xf8, 0x3c, 0x0,\ + 0x78, 0x78, 0x0, 0x3c, 0x70, 0x0, 0x1c, 0x70, 0x0, 0x1c, 0xf0, 0x0, 0x1e, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xe0, 0x0, 0xe, 0xf0, 0x0, 0x1e, 0xf0,\ + 0x0, 0x1e, 0x70, 0x0, 0x1c, 0x78, 0x0, 0x3c, 0x3c, 0x0, 0x78, 0x3e, 0x0, 0xf8, 0x1f, 0x1, 0xf0, 0xf, 0xff, 0xe0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0} /* Odieresis (214) */ #define NXFONT_METRICS_214 {3, 23, 29, 1, 8, 0} @@ -667,23 +716,33 @@ /* Ugrave (217) */ #define NXFONT_METRICS_217 {3, 18, 31, 3, 6, 0} -#define NXFONT_BITMAP_217 {0x7, 0x80, 0x0, 0x3, 0xc0, 0x0, 0x1, 0xc0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0x70, 0x0, 0x0, 0x0, 0x0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xf0, 0x3, 0xc0, 0x78, 0x7, 0x80, 0x7c, 0xf, 0x80, 0x3f, 0xff, 0x0, 0x1f, 0xfe, 0x0, 0x3, 0xf0, 0x0} +#define NXFONT_BITMAP_217 {0x7, 0x80, 0x0, 0x3, 0xc0, 0x0, 0x1, 0xc0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0x70, 0x0, 0x0, 0x0, 0x0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0,\ + 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1,\ + 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xf0, 0x3, 0xc0, 0x78, 0x7, 0x80, 0x7c, 0xf, 0x80, 0x3f, 0xff, 0x0, 0x1f, 0xfe, 0x0, 0x3, 0xf0, 0x0} /* Uacute (218) */ #define NXFONT_METRICS_218 {3, 18, 31, 3, 6, 0} -#define NXFONT_BITMAP_218 {0x0, 0x78, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xe0, 0x0, 0x1, 0xc0, 0x0, 0x3, 0x80, 0x0, 0x0, 0x0, 0x0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xf0, 0x3, 0xc0, 0x78, 0x7, 0x80, 0x7c, 0xf, 0x80, 0x3f, 0xff, 0x0, 0x1f, 0xfe, 0x0, 0x3, 0xf0, 0x0} +#define NXFONT_BITMAP_218 {0x0, 0x78, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xe0, 0x0, 0x1, 0xc0, 0x0, 0x3, 0x80, 0x0, 0x0, 0x0, 0x0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0,\ + 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1,\ + 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xf0, 0x3, 0xc0, 0x78, 0x7, 0x80, 0x7c, 0xf, 0x80, 0x3f, 0xff, 0x0, 0x1f, 0xfe, 0x0, 0x3, 0xf0, 0x0} /* Ucircumflex (219) */ #define NXFONT_METRICS_219 {3, 18, 31, 3, 6, 0} -#define NXFONT_BITMAP_219 {0x0, 0x40, 0x0, 0x0, 0xe0, 0x0, 0x1, 0xf0, 0x0, 0x3, 0xb8, 0x0, 0x7, 0x1c, 0x0, 0x0, 0x0, 0x0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xf0, 0x3, 0xc0, 0x78, 0x7, 0x80, 0x7c, 0xf, 0x80, 0x3f, 0xff, 0x0, 0x1f, 0xfe, 0x0, 0x3, 0xf0, 0x0} +#define NXFONT_BITMAP_219 {0x0, 0x40, 0x0, 0x0, 0xe0, 0x0, 0x1, 0xf0, 0x0, 0x3, 0xb8, 0x0, 0x7, 0x1c, 0x0, 0x0, 0x0, 0x0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0,\ + 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1,\ + 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xf0, 0x3, 0xc0, 0x78, 0x7, 0x80, 0x7c, 0xf, 0x80, 0x3f, 0xff, 0x0, 0x1f, 0xfe, 0x0, 0x3, 0xf0, 0x0} /* Udieresis (220) */ #define NXFONT_METRICS_220 {3, 18, 30, 3, 7, 0} -#define NXFONT_BITMAP_220 {0xe, 0x1c, 0x0, 0xe, 0x1c, 0x0, 0xe, 0x1c, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xf0, 0x3, 0xc0, 0x78, 0x7, 0x80, 0x7c, 0xf, 0x80, 0x3f, 0xff, 0x0, 0x1f, 0xfe, 0x0, 0x3, 0xf0, 0x0} +#define NXFONT_BITMAP_220 {0xe, 0x1c, 0x0, 0xe, 0x1c, 0x0, 0xe, 0x1c, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1,\ + 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0,\ + 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xe0, 0x1, 0xc0, 0xf0, 0x3, 0xc0, 0x78, 0x7, 0x80, 0x7c, 0xf, 0x80, 0x3f, 0xff, 0x0, 0x1f, 0xfe, 0x0, 0x3, 0xf0, 0x0} /* Yacute (221) */ #define NXFONT_METRICS_221 {3, 19, 31, 1, 6, 0} -#define NXFONT_BITMAP_221 {0x0, 0x3c, 0x0, 0x0, 0x78, 0x0, 0x0, 0x70, 0x0, 0x0, 0xe0, 0x0, 0x1, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xe0, 0x0, 0xe0, 0xf0, 0x1, 0xe0, 0x70, 0x1, 0xc0, 0x78, 0x3, 0xc0, 0x38, 0x3, 0x80, 0x3c, 0x7, 0x80, 0x1c, 0xf, 0x0, 0x1e, 0xf, 0x0, 0xf, 0x1e, 0x0, 0x7, 0x1c, 0x0, 0x7, 0xbc, 0x0, 0x3, 0xb8, 0x0, 0x3, 0xf8, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0} +#define NXFONT_BITMAP_221 {0x0, 0x3c, 0x0, 0x0, 0x78, 0x0, 0x0, 0x70, 0x0, 0x0, 0xe0, 0x0, 0x1, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xe0, 0x0, 0xe0, 0xf0, 0x1, 0xe0, 0x70, 0x1, 0xc0, 0x78, 0x3, 0xc0, 0x38, 0x3,\ + 0x80, 0x3c, 0x7, 0x80, 0x1c, 0xf, 0x0, 0x1e, 0xf, 0x0, 0xf, 0x1e, 0x0, 0x7, 0x1c, 0x0, 0x7, 0xbc, 0x0, 0x3, 0xb8, 0x0, 0x3, 0xf8, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x0,\ + 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0xe0, 0x0} /* Thorn (222) */ #define NXFONT_METRICS_222 {3, 17, 25, 3, 12, 0} @@ -832,13 +891,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_sans40x49b.h b/libs/libnx/nxfonts/nxfonts_sans40x49b.h index fe4e5ce1e6..c7d7d7a451 100644 --- a/libs/libnx/nxfonts/nxfonts_sans40x49b.h +++ b/libs/libnx/nxfonts/nxfonts_sans40x49b.h @@ -83,7 +83,9 @@ /* percent (37) */ #define NXFONT_METRICS_37 {4, 26, 23, 1, 14, 0} -#define NXFONT_BITMAP_37 {0xe, 0x0, 0x30, 0x0, 0x3f, 0x80, 0x70, 0x0, 0x7f, 0xc0, 0x60, 0x0, 0x71, 0xc0, 0xe0, 0x0, 0xe0, 0xe0, 0xc0, 0x0, 0xe0, 0xe1, 0xc0, 0x0, 0xe0, 0xe3, 0x80, 0x0, 0xe0, 0xe3, 0x80, 0x0, 0x71, 0xc7, 0x0, 0x0, 0x7f, 0xc6, 0x0, 0x0, 0x3f, 0x8e, 0x0, 0x0, 0xe, 0xc, 0x1c, 0x0, 0x0, 0x1c, 0x7f, 0x0, 0x0, 0x18, 0xff, 0x80, 0x0, 0x38, 0xe3, 0x80, 0x0, 0x31, 0xc1, 0xc0, 0x0, 0x71, 0xc1, 0xc0, 0x0, 0x61, 0xc1, 0xc0, 0x0, 0xe1, 0xc1, 0xc0, 0x1, 0xc0, 0xe3, 0x80, 0x1, 0xc0, 0xff, 0x80, 0x3, 0x80, 0x7f, 0x0, 0x3, 0x0, 0x1c, 0x0} +#define NXFONT_BITMAP_37 {0xe, 0x0, 0x30, 0x0, 0x3f, 0x80, 0x70, 0x0, 0x7f, 0xc0, 0x60, 0x0, 0x71, 0xc0, 0xe0, 0x0, 0xe0, 0xe0, 0xc0, 0x0, 0xe0, 0xe1, 0xc0, 0x0, 0xe0, 0xe3, 0x80, 0x0,\ + 0xe0, 0xe3, 0x80, 0x0, 0x71, 0xc7, 0x0, 0x0, 0x7f, 0xc6, 0x0, 0x0, 0x3f, 0x8e, 0x0, 0x0, 0xe, 0xc, 0x1c, 0x0, 0x0, 0x1c, 0x7f, 0x0, 0x0, 0x18, 0xff, 0x80, 0x0,\ + 0x38, 0xe3, 0x80, 0x0, 0x31, 0xc1, 0xc0, 0x0, 0x71, 0xc1, 0xc0, 0x0, 0x61, 0xc1, 0xc0, 0x0, 0xe1, 0xc1, 0xc0, 0x1, 0xc0, 0xe3, 0x80, 0x1, 0xc0, 0xff, 0x80, 0x3, 0x80, 0x7f, 0x0, 0x3, 0x0, 0x1c, 0x0} /* ampersand (38) */ #define NXFONT_METRICS_38 {3, 20, 25, 2, 12, 0} @@ -191,7 +193,10 @@ /* at (64) */ #define NXFONT_METRICS_64 {4, 29, 30, 1, 12, 0} -#define NXFONT_BITMAP_64 {0x0, 0xf, 0xe0, 0x0, 0x0, 0x7f, 0xfc, 0x0, 0x1, 0xff, 0xfe, 0x0, 0x3, 0xf0, 0x3f, 0x80, 0x7, 0xc0, 0x7, 0xc0, 0xf, 0x0, 0x3, 0xc0, 0x1e, 0x0, 0x1, 0xe0, 0x1c, 0x0, 0x0, 0xf0, 0x3c, 0x7, 0xdc, 0x70, 0x38, 0x1f, 0xfc, 0x70, 0x70, 0x3c, 0xfc, 0x38, 0x70, 0x78, 0x78, 0x38, 0xf0, 0xf0, 0x38, 0x38, 0xe0, 0xe0, 0x38, 0x38, 0xe1, 0xe0, 0x38, 0x38, 0xe1, 0xc0, 0x70, 0x78, 0xe1, 0xc0, 0x70, 0x70, 0xe1, 0xc0, 0x70, 0x70, 0xe1, 0xe0, 0xf0, 0xe0, 0xf1, 0xe1, 0xf1, 0xe0, 0x70, 0xff, 0xff, 0xc0, 0x78, 0x7f, 0x3f, 0x80, 0x38, 0x3e, 0x1e, 0x0, 0x3c, 0x0, 0x0, 0x0, 0x1e, 0x0, 0x0, 0x0, 0xf, 0x80, 0x0, 0x0, 0xf, 0xf0, 0x3c, 0x0, 0x3, 0xff, 0xfc, 0x0, 0x1, 0xff, 0xfc, 0x0, 0x0, 0x7f, 0xe0, 0x0} +#define NXFONT_BITMAP_64 {0x0, 0xf, 0xe0, 0x0, 0x0, 0x7f, 0xfc, 0x0, 0x1, 0xff, 0xfe, 0x0, 0x3, 0xf0, 0x3f, 0x80, 0x7, 0xc0, 0x7, 0xc0, 0xf, 0x0, 0x3, 0xc0, 0x1e, 0x0, 0x1, 0xe0, 0x1c, 0x0, 0x0, 0xf0,\ + 0x3c, 0x7, 0xdc, 0x70, 0x38, 0x1f, 0xfc, 0x70, 0x70, 0x3c, 0xfc, 0x38, 0x70, 0x78, 0x78, 0x38, 0xf0, 0xf0, 0x38, 0x38, 0xe0, 0xe0, 0x38, 0x38, 0xe1, 0xe0, 0x38, 0x38, 0xe1,\ + 0xc0, 0x70, 0x78, 0xe1, 0xc0, 0x70, 0x70, 0xe1, 0xc0, 0x70, 0x70, 0xe1, 0xe0, 0xf0, 0xe0, 0xf1, 0xe1, 0xf1, 0xe0, 0x70, 0xff, 0xff, 0xc0, 0x78, 0x7f, 0x3f, 0x80, 0x38, 0x3e,\ + 0x1e, 0x0, 0x3c, 0x0, 0x0, 0x0, 0x1e, 0x0, 0x0, 0x0, 0xf, 0x80, 0x0, 0x0, 0xf, 0xf0, 0x3c, 0x0, 0x3, 0xff, 0xfc, 0x0, 0x1, 0xff, 0xfc, 0x0, 0x0, 0x7f, 0xe0, 0x0} /* A (65) */ #define NXFONT_METRICS_65 {3, 22, 25, 0, 12, 0} @@ -283,7 +288,10 @@ /* W (87) */ #define NXFONT_METRICS_87 {4, 29, 25, 1, 12, 0} -#define NXFONT_BITMAP_87 {0xf8, 0x1f, 0x81, 0xf8, 0xf8, 0x1f, 0x81, 0xf8, 0x78, 0x1f, 0x81, 0xf0, 0x78, 0x1f, 0x81, 0xf0, 0x78, 0x1f, 0x81, 0xf0, 0x7c, 0x3f, 0xc3, 0xe0, 0x7c, 0x3f, 0xc3, 0xe0, 0x7c, 0x3f, 0xc3, 0xe0, 0x3c, 0x3f, 0xc3, 0xe0, 0x3c, 0x39, 0xc3, 0xc0, 0x3e, 0x79, 0xe3, 0xc0, 0x3e, 0x79, 0xe7, 0xc0, 0x1e, 0x79, 0xe7, 0xc0, 0x1e, 0x79, 0xe7, 0x80, 0x1e, 0x70, 0xe7, 0x80, 0x1e, 0x70, 0xe7, 0x80, 0xf, 0xf0, 0xff, 0x0, 0xf, 0xf0, 0xff, 0x0, 0xf, 0xf0, 0xff, 0x0, 0xf, 0xe0, 0x7f, 0x0, 0x7, 0xe0, 0x7e, 0x0, 0x7, 0xe0, 0x7e, 0x0, 0x7, 0xe0, 0x7e, 0x0, 0x3, 0xc0, 0x3c, 0x0, 0x3, 0xc0, 0x3c, 0x0} +#define NXFONT_BITMAP_87 {0xf8, 0x1f, 0x81, 0xf8, 0xf8, 0x1f, 0x81, 0xf8, 0x78, 0x1f, 0x81, 0xf0, 0x78, 0x1f, 0x81, 0xf0, 0x78, 0x1f, 0x81, 0xf0, 0x7c, 0x3f, 0xc3, 0xe0, 0x7c, 0x3f, 0xc3, 0xe0, 0x7c,\ + 0x3f, 0xc3, 0xe0, 0x3c, 0x3f, 0xc3, 0xe0, 0x3c, 0x39, 0xc3, 0xc0, 0x3e, 0x79, 0xe3, 0xc0, 0x3e, 0x79, 0xe7, 0xc0, 0x1e, 0x79, 0xe7, 0xc0, 0x1e, 0x79, 0xe7, 0x80, 0x1e, 0x70,\ + 0xe7, 0x80, 0x1e, 0x70, 0xe7, 0x80, 0xf, 0xf0, 0xff, 0x0, 0xf, 0xf0, 0xff, 0x0, 0xf, 0xf0, 0xff, 0x0, 0xf, 0xe0, 0x7f, 0x0, 0x7, 0xe0, 0x7e, 0x0, 0x7, 0xe0, 0x7e, 0x0, 0x7,\ + 0xe0, 0x7e, 0x0, 0x3, 0xc0, 0x3c, 0x0, 0x3, 0xc0, 0x3c, 0x0} /* X (88) */ #define NXFONT_METRICS_88 {3, 20, 25, 1, 12, 0} @@ -475,7 +483,10 @@ /* copyright (169) */ #define NXFONT_METRICS_169 {4, 26, 25, 0, 12, 0} -#define NXFONT_BITMAP_169 {0x0, 0x7f, 0x80, 0x0, 0x3, 0xff, 0xe0, 0x0, 0x7, 0x80, 0xf8, 0x0, 0x1f, 0x0, 0x3c, 0x0, 0x1c, 0x0, 0xe, 0x0, 0x38, 0x0, 0x7, 0x0, 0x70, 0x3f, 0x3, 0x0, 0x70, 0x7f, 0x83, 0x80, 0xe0, 0xf3, 0xc1, 0x80, 0xe1, 0xc0, 0xe1, 0xc0, 0xc1, 0xc0, 0xe0, 0xc0, 0xc3, 0x80, 0x0, 0xc0, 0xc3, 0x80, 0x0, 0xc0, 0xc3, 0x80, 0x0, 0xc0, 0xc3, 0x80, 0x0, 0xc0, 0xc1, 0xc0, 0xe0, 0xc0, 0xe1, 0xc0, 0xe1, 0xc0, 0xe0, 0xf3, 0xc3, 0x80, 0x60, 0x7f, 0x83, 0x80, 0x70, 0x3f, 0x7, 0x0, 0x38, 0x0, 0xe, 0x0, 0x1e, 0x0, 0x3c, 0x0, 0xf, 0x80, 0xf8, 0x0, 0x7, 0xff, 0xe0, 0x0, 0x1, 0xff, 0x80, 0x0} +#define NXFONT_BITMAP_169 {0x0, 0x7f, 0x80, 0x0, 0x3, 0xff, 0xe0, 0x0, 0x7, 0x80, 0xf8, 0x0, 0x1f, 0x0, 0x3c, 0x0, 0x1c, 0x0, 0xe, 0x0, 0x38, 0x0, 0x7, 0x0, 0x70, 0x3f, 0x3, 0x0, 0x70, 0x7f, 0x83,\ + 0x80, 0xe0, 0xf3, 0xc1, 0x80, 0xe1, 0xc0, 0xe1, 0xc0, 0xc1, 0xc0, 0xe0, 0xc0, 0xc3, 0x80, 0x0, 0xc0, 0xc3, 0x80, 0x0, 0xc0, 0xc3, 0x80, 0x0, 0xc0, 0xc3, 0x80, 0x0, 0xc0,\ + 0xc1, 0xc0, 0xe0, 0xc0, 0xe1, 0xc0, 0xe1, 0xc0, 0xe0, 0xf3, 0xc3, 0x80, 0x60, 0x7f, 0x83, 0x80, 0x70, 0x3f, 0x7, 0x0, 0x38, 0x0, 0xe, 0x0, 0x1e, 0x0, 0x3c, 0x0, 0xf, 0x80,\ + 0xf8, 0x0, 0x7, 0xff, 0xe0, 0x0, 0x1, 0xff, 0x80, 0x0} /* ordfeminine (170) */ #define NXFONT_METRICS_170 {2, 9, 16, 1, 12, 0} @@ -495,7 +506,10 @@ /* registered (174) */ #define NXFONT_METRICS_174 {4, 26, 25, 0, 12, 0} -#define NXFONT_BITMAP_174 {0x0, 0xff, 0x80, 0x0, 0x3, 0xff, 0xe0, 0x0, 0x7, 0x80, 0xf8, 0x0, 0x1e, 0x0, 0x3c, 0x0, 0x1c, 0x0, 0xe, 0x0, 0x38, 0xff, 0x87, 0x0, 0x70, 0xff, 0xc3, 0x0, 0x70, 0xe1, 0xe3, 0x80, 0xe0, 0xe0, 0xe1, 0x80, 0xe0, 0xe0, 0xe1, 0x80, 0xc0, 0xe0, 0xe1, 0xc0, 0xc0, 0xe1, 0xc1, 0xc0, 0xc0, 0xff, 0x81, 0xc0, 0xc0, 0xff, 0x1, 0xc0, 0xc0, 0xe3, 0x81, 0xc0, 0xc0, 0xe3, 0xc1, 0xc0, 0xe0, 0xe1, 0xc1, 0x80, 0xe0, 0xe0, 0xe3, 0x80, 0x70, 0xe0, 0xf3, 0x80, 0x70, 0xe0, 0x77, 0x0, 0x38, 0x0, 0xe, 0x0, 0x1e, 0x0, 0x1c, 0x0, 0xf, 0x80, 0x78, 0x0, 0x7, 0xff, 0xe0, 0x0, 0x1, 0xff, 0x80, 0x0} +#define NXFONT_BITMAP_174 {0x0, 0xff, 0x80, 0x0, 0x3, 0xff, 0xe0, 0x0, 0x7, 0x80, 0xf8, 0x0, 0x1e, 0x0, 0x3c, 0x0, 0x1c, 0x0, 0xe, 0x0, 0x38, 0xff, 0x87, 0x0, 0x70, 0xff, 0xc3, 0x0, 0x70, 0xe1, 0xe3,\ + 0x80, 0xe0, 0xe0, 0xe1, 0x80, 0xe0, 0xe0, 0xe1, 0x80, 0xc0, 0xe0, 0xe1, 0xc0, 0xc0, 0xe1, 0xc1, 0xc0, 0xc0, 0xff, 0x81, 0xc0, 0xc0, 0xff, 0x1, 0xc0, 0xc0, 0xe3, 0x81, 0xc0,\ + 0xc0, 0xe3, 0xc1, 0xc0, 0xe0, 0xe1, 0xc1, 0x80, 0xe0, 0xe0, 0xe3, 0x80, 0x70, 0xe0, 0xf3, 0x80, 0x70, 0xe0, 0x77, 0x0, 0x38, 0x0, 0xe, 0x0, 0x1e, 0x0, 0x1c, 0x0, 0xf, 0x80,\ + 0x78, 0x0, 0x7, 0xff, 0xe0, 0x0, 0x1, 0xff, 0x80, 0x0} /* macron (175) */ #define NXFONT_METRICS_175 {2, 10, 3, 0, 13, 0} @@ -527,7 +541,9 @@ /* paragraph (182) */ #define NXFONT_METRICS_182 {3, 17, 31, 0, 12, 0} -#define NXFONT_BITMAP_182 {0xf, 0xff, 0x80, 0x1f, 0xff, 0x80, 0x3f, 0x8c, 0x0, 0x7f, 0x8c, 0x0, 0x7f, 0x8c, 0x0, 0xff, 0x8c, 0x0, 0xff, 0x8c, 0x0, 0xff, 0x8c, 0x0, 0xff, 0x8c, 0x0, 0xff, 0x8c, 0x0, 0x7f, 0x8c, 0x0, 0x7f, 0x8c, 0x0, 0x3f, 0x8c, 0x0, 0x3f, 0x8c, 0x0, 0xf, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0} +#define NXFONT_BITMAP_182 {0xf, 0xff, 0x80, 0x1f, 0xff, 0x80, 0x3f, 0x8c, 0x0, 0x7f, 0x8c, 0x0, 0x7f, 0x8c, 0x0, 0xff, 0x8c, 0x0, 0xff, 0x8c, 0x0, 0xff, 0x8c, 0x0, 0xff, 0x8c, 0x0, 0xff, 0x8c, 0x0, 0x7f,\ + 0x8c, 0x0, 0x7f, 0x8c, 0x0, 0x3f, 0x8c, 0x0, 0x3f, 0x8c, 0x0, 0xf, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1,\ + 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0, 0x1, 0x8c, 0x0} /* periodcentered (183) */ #define NXFONT_METRICS_183 {1, 4, 5, 2, 21, 0} @@ -551,15 +567,21 @@ /* onequarter (188) */ #define NXFONT_METRICS_188 {4, 26, 24, 0, 13, 0} -#define NXFONT_BITMAP_188 {0x0, 0x0, 0x38, 0x0, 0x6, 0x0, 0x70, 0x0, 0x1e, 0x0, 0x70, 0x0, 0xfe, 0x0, 0xe0, 0x0, 0xfe, 0x1, 0xc0, 0x0, 0xe, 0x1, 0xc0, 0x0, 0xe, 0x3, 0x80, 0x0, 0xe, 0x3, 0x80, 0x0, 0xe, 0x7, 0x0, 0x0, 0xe, 0x7, 0x0, 0x0, 0xe, 0xe, 0x7, 0x0, 0xe, 0x1c, 0xf, 0x0, 0xe, 0x1c, 0x1f, 0x0, 0xe, 0x38, 0x1f, 0x0, 0x0, 0x38, 0x37, 0x0, 0x0, 0x70, 0x67, 0x0, 0x0, 0x70, 0xe7, 0x0, 0x0, 0xe0, 0xc7, 0x0, 0x1, 0xc1, 0x87, 0x0, 0x1, 0xc1, 0xff, 0xc0, 0x3, 0x81, 0xff, 0xc0, 0x3, 0x80, 0x7, 0x0, 0x7, 0x0, 0x7, 0x0, 0x7, 0x0, 0x7, 0x0} +#define NXFONT_BITMAP_188 {0x0, 0x0, 0x38, 0x0, 0x6, 0x0, 0x70, 0x0, 0x1e, 0x0, 0x70, 0x0, 0xfe, 0x0, 0xe0, 0x0, 0xfe, 0x1, 0xc0, 0x0, 0xe, 0x1, 0xc0, 0x0, 0xe, 0x3, 0x80, 0x0, 0xe, 0x3, 0x80, 0x0, 0xe, 0x7,\ + 0x0, 0x0, 0xe, 0x7, 0x0, 0x0, 0xe, 0xe, 0x7, 0x0, 0xe, 0x1c, 0xf, 0x0, 0xe, 0x1c, 0x1f, 0x0, 0xe, 0x38, 0x1f, 0x0, 0x0, 0x38, 0x37, 0x0, 0x0, 0x70, 0x67, 0x0, 0x0, 0x70, 0xe7, 0x0,\ + 0x0, 0xe0, 0xc7, 0x0, 0x1, 0xc1, 0x87, 0x0, 0x1, 0xc1, 0xff, 0xc0, 0x3, 0x81, 0xff, 0xc0, 0x3, 0x80, 0x7, 0x0, 0x7, 0x0, 0x7, 0x0, 0x7, 0x0, 0x7, 0x0} /* onehalf (189) */ #define NXFONT_METRICS_189 {4, 25, 24, 1, 13, 0} -#define NXFONT_BITMAP_189 {0x0, 0x0, 0xe0, 0x0, 0xc, 0x1, 0xc0, 0x0, 0x1c, 0x1, 0xc0, 0x0, 0xfc, 0x3, 0x80, 0x0, 0xfc, 0x3, 0x80, 0x0, 0x1c, 0x7, 0x0, 0x0, 0x1c, 0xe, 0x0, 0x0, 0x1c, 0xe, 0x0, 0x0, 0x1c, 0x1c, 0x0, 0x0, 0x1c, 0x1c, 0x0, 0x0, 0x1c, 0x38, 0x7e, 0x0, 0x1c, 0x30, 0xff, 0x0, 0x1c, 0x71, 0xe7, 0x80, 0x1c, 0xe1, 0xc3, 0x80, 0x0, 0xe1, 0xc3, 0x80, 0x1, 0xc0, 0x7, 0x80, 0x1, 0xc0, 0xf, 0x0, 0x3, 0x80, 0x1e, 0x0, 0x7, 0x0, 0x3c, 0x0, 0x7, 0x0, 0x78, 0x0, 0xe, 0x0, 0xf0, 0x0, 0xe, 0x1, 0xff, 0x80, 0x1c, 0x1, 0xff, 0x80, 0x1c, 0x1, 0xff, 0x80} +#define NXFONT_BITMAP_189 {0x0, 0x0, 0xe0, 0x0, 0xc, 0x1, 0xc0, 0x0, 0x1c, 0x1, 0xc0, 0x0, 0xfc, 0x3, 0x80, 0x0, 0xfc, 0x3, 0x80, 0x0, 0x1c, 0x7, 0x0, 0x0, 0x1c, 0xe, 0x0, 0x0, 0x1c, 0xe, 0x0, 0x0, 0x1c, 0x1c,\ + 0x0, 0x0, 0x1c, 0x1c, 0x0, 0x0, 0x1c, 0x38, 0x7e, 0x0, 0x1c, 0x30, 0xff, 0x0, 0x1c, 0x71, 0xe7, 0x80, 0x1c, 0xe1, 0xc3, 0x80, 0x0, 0xe1, 0xc3, 0x80, 0x1, 0xc0, 0x7, 0x80, 0x1, 0xc0,\ + 0xf, 0x0, 0x3, 0x80, 0x1e, 0x0, 0x7, 0x0, 0x3c, 0x0, 0x7, 0x0, 0x78, 0x0, 0xe, 0x0, 0xf0, 0x0, 0xe, 0x1, 0xff, 0x80, 0x1c, 0x1, 0xff, 0x80, 0x1c, 0x1, 0xff, 0x80} /* threequarters (190) */ #define NXFONT_METRICS_190 {4, 25, 24, 1, 13, 0} -#define NXFONT_BITMAP_190 {0x3f, 0x0, 0x1c, 0x0, 0x7f, 0x80, 0x38, 0x0, 0xf3, 0xc0, 0x38, 0x0, 0xe1, 0xc0, 0x70, 0x0, 0xe1, 0xc0, 0xe0, 0x0, 0x3, 0xc0, 0xe0, 0x0, 0xf, 0x81, 0xc0, 0x0, 0xf, 0x81, 0xc0, 0x0, 0xf, 0xc3, 0x80, 0x0, 0x1, 0xc7, 0x0, 0x0, 0xe1, 0xc7, 0xe, 0x0, 0xe1, 0xce, 0x1e, 0x0, 0xf3, 0xce, 0x1e, 0x0, 0x7f, 0x9c, 0x3e, 0x0, 0x3f, 0x1c, 0x7e, 0x0, 0x0, 0x38, 0xee, 0x0, 0x0, 0x70, 0xce, 0x0, 0x0, 0x71, 0x8e, 0x0, 0x0, 0xe3, 0x8e, 0x0, 0x0, 0xe3, 0xff, 0x80, 0x1, 0xc3, 0xff, 0x80, 0x1, 0xc0, 0xe, 0x0, 0x3, 0x80, 0xe, 0x0, 0x3, 0x80, 0xe, 0x0} +#define NXFONT_BITMAP_190 {0x3f, 0x0, 0x1c, 0x0, 0x7f, 0x80, 0x38, 0x0, 0xf3, 0xc0, 0x38, 0x0, 0xe1, 0xc0, 0x70, 0x0, 0xe1, 0xc0, 0xe0, 0x0, 0x3, 0xc0, 0xe0, 0x0, 0xf, 0x81, 0xc0, 0x0, 0xf, 0x81, 0xc0, 0x0, 0xf,\ + 0xc3, 0x80, 0x0, 0x1, 0xc7, 0x0, 0x0, 0xe1, 0xc7, 0xe, 0x0, 0xe1, 0xce, 0x1e, 0x0, 0xf3, 0xce, 0x1e, 0x0, 0x7f, 0x9c, 0x3e, 0x0, 0x3f, 0x1c, 0x7e, 0x0, 0x0, 0x38, 0xee, 0x0, 0x0, 0x70,\ + 0xce, 0x0, 0x0, 0x71, 0x8e, 0x0, 0x0, 0xe3, 0x8e, 0x0, 0x0, 0xe3, 0xff, 0x80, 0x1, 0xc3, 0xff, 0x80, 0x1, 0xc0, 0xe, 0x0, 0x3, 0x80, 0xe, 0x0, 0x3, 0x80, 0xe, 0x0} /* questiondown (191) */ #define NXFONT_METRICS_191 {2, 16, 24, 1, 19, 0} @@ -567,51 +589,75 @@ /* Agrave (192) */ #define NXFONT_METRICS_192 {3, 22, 31, 0, 6, 0} -#define NXFONT_BITMAP_192 {0x3, 0xc0, 0x0, 0x1, 0xe0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x78, 0x0, 0x0, 0x3c, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x3, 0xff, 0x0, 0x3, 0xff, 0x0, 0x3, 0xff, 0x0, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0xf, 0x87, 0x80, 0xf, 0x87, 0xc0, 0xf, 0x87, 0xc0, 0x1f, 0x3, 0xc0, 0x1f, 0x3, 0xe0, 0x1f, 0xff, 0xe0, 0x1f, 0xff, 0xe0, 0x3f, 0xff, 0xf0, 0x3f, 0xff, 0xf0, 0x3e, 0x1, 0xf0, 0x7c, 0x0, 0xf8, 0x7c, 0x0, 0xf8, 0xfc, 0x0, 0xfc, 0xf8, 0x0, 0x7c} +#define NXFONT_BITMAP_192 {0x3, 0xc0, 0x0, 0x1, 0xe0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x78, 0x0, 0x0, 0x3c, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x3, 0xff,\ + 0x0, 0x3, 0xff, 0x0, 0x3, 0xff, 0x0, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0xf, 0x87, 0x80, 0xf, 0x87, 0xc0, 0xf, 0x87, 0xc0, 0x1f, 0x3, 0xc0, 0x1f, 0x3, 0xe0, 0x1f, 0xff,\ + 0xe0, 0x1f, 0xff, 0xe0, 0x3f, 0xff, 0xf0, 0x3f, 0xff, 0xf0, 0x3e, 0x1, 0xf0, 0x7c, 0x0, 0xf8, 0x7c, 0x0, 0xf8, 0xfc, 0x0, 0xfc, 0xf8, 0x0, 0x7c} /* Aacute (193) */ #define NXFONT_METRICS_193 {3, 22, 31, 0, 6, 0} -#define NXFONT_BITMAP_193 {0x0, 0xf, 0x0, 0x0, 0x1e, 0x0, 0x0, 0x3c, 0x0, 0x0, 0x78, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x3, 0xff, 0x0, 0x3, 0xff, 0x0, 0x3, 0xff, 0x0, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0xf, 0x87, 0x80, 0xf, 0x87, 0xc0, 0xf, 0x87, 0xc0, 0x1f, 0x3, 0xc0, 0x1f, 0x3, 0xe0, 0x1f, 0xff, 0xe0, 0x1f, 0xff, 0xe0, 0x3f, 0xff, 0xf0, 0x3f, 0xff, 0xf0, 0x3e, 0x1, 0xf0, 0x7c, 0x0, 0xf8, 0x7c, 0x0, 0xf8, 0xfc, 0x0, 0xfc, 0xf8, 0x0, 0x7c} +#define NXFONT_BITMAP_193 {0x0, 0xf, 0x0, 0x0, 0x1e, 0x0, 0x0, 0x3c, 0x0, 0x0, 0x78, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x3, 0xff,\ + 0x0, 0x3, 0xff, 0x0, 0x3, 0xff, 0x0, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0xf, 0x87, 0x80, 0xf, 0x87, 0xc0, 0xf, 0x87, 0xc0, 0x1f, 0x3, 0xc0, 0x1f, 0x3, 0xe0, 0x1f, 0xff,\ + 0xe0, 0x1f, 0xff, 0xe0, 0x3f, 0xff, 0xf0, 0x3f, 0xff, 0xf0, 0x3e, 0x1, 0xf0, 0x7c, 0x0, 0xf8, 0x7c, 0x0, 0xf8, 0xfc, 0x0, 0xfc, 0xf8, 0x0, 0x7c} /* Acircumflex (194) */ #define NXFONT_METRICS_194 {3, 22, 31, 0, 6, 0} -#define NXFONT_BITMAP_194 {0x0, 0x30, 0x0, 0x0, 0x78, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xce, 0x0, 0x3, 0x87, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x3, 0xff, 0x0, 0x3, 0xff, 0x0, 0x3, 0xff, 0x0, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0xf, 0x87, 0x80, 0xf, 0x87, 0xc0, 0xf, 0x87, 0xc0, 0x1f, 0x3, 0xc0, 0x1f, 0x3, 0xe0, 0x1f, 0xff, 0xe0, 0x1f, 0xff, 0xe0, 0x3f, 0xff, 0xf0, 0x3f, 0xff, 0xf0, 0x3e, 0x1, 0xf0, 0x7c, 0x0, 0xf8, 0x7c, 0x0, 0xf8, 0xfc, 0x0, 0xfc, 0xf8, 0x0, 0x7c} +#define NXFONT_BITMAP_194 {0x0, 0x30, 0x0, 0x0, 0x78, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xce, 0x0, 0x3, 0x87, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x3, 0xff,\ + 0x0, 0x3, 0xff, 0x0, 0x3, 0xff, 0x0, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0xf, 0x87, 0x80, 0xf, 0x87, 0xc0, 0xf, 0x87, 0xc0, 0x1f, 0x3, 0xc0, 0x1f, 0x3, 0xe0, 0x1f, 0xff,\ + 0xe0, 0x1f, 0xff, 0xe0, 0x3f, 0xff, 0xf0, 0x3f, 0xff, 0xf0, 0x3e, 0x1, 0xf0, 0x7c, 0x0, 0xf8, 0x7c, 0x0, 0xf8, 0xfc, 0x0, 0xfc, 0xf8, 0x0, 0x7c} /* Atilde (195) */ #define NXFONT_METRICS_195 {3, 22, 30, 0, 7, 0} -#define NXFONT_BITMAP_195 {0x0, 0xf1, 0x80, 0x1, 0xff, 0x80, 0x3, 0xff, 0x0, 0x3, 0x1e, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x3, 0xff, 0x0, 0x3, 0xff, 0x0, 0x3, 0xff, 0x0, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0xf, 0x87, 0x80, 0xf, 0x87, 0xc0, 0xf, 0x87, 0xc0, 0x1f, 0x3, 0xc0, 0x1f, 0x3, 0xe0, 0x1f, 0xff, 0xe0, 0x1f, 0xff, 0xe0, 0x3f, 0xff, 0xf0, 0x3f, 0xff, 0xf0, 0x3e, 0x1, 0xf0, 0x7c, 0x0, 0xf8, 0x7c, 0x0, 0xf8, 0xfc, 0x0, 0xfc, 0xf8, 0x0, 0x7c} +#define NXFONT_BITMAP_195 {0x0, 0xf1, 0x80, 0x1, 0xff, 0x80, 0x3, 0xff, 0x0, 0x3, 0x1e, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x3, 0xff, 0x0, 0x3, 0xff,\ + 0x0, 0x3, 0xff, 0x0, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0xf, 0x87, 0x80, 0xf, 0x87, 0xc0, 0xf, 0x87, 0xc0, 0x1f, 0x3, 0xc0, 0x1f, 0x3, 0xe0, 0x1f, 0xff, 0xe0, 0x1f, 0xff,\ + 0xe0, 0x3f, 0xff, 0xf0, 0x3f, 0xff, 0xf0, 0x3e, 0x1, 0xf0, 0x7c, 0x0, 0xf8, 0x7c, 0x0, 0xf8, 0xfc, 0x0, 0xfc, 0xf8, 0x0, 0x7c} /* Adieresis (196) */ #define NXFONT_METRICS_196 {3, 22, 31, 0, 6, 0} -#define NXFONT_BITMAP_196 {0x3, 0xcf, 0x0, 0x3, 0xcf, 0x0, 0x3, 0xcf, 0x0, 0x3, 0xcf, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x3, 0xff, 0x0, 0x3, 0xff, 0x0, 0x3, 0xff, 0x0, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0xf, 0x87, 0x80, 0xf, 0x87, 0xc0, 0xf, 0x87, 0xc0, 0x1f, 0x3, 0xc0, 0x1f, 0x3, 0xe0, 0x1f, 0xff, 0xe0, 0x1f, 0xff, 0xe0, 0x3f, 0xff, 0xf0, 0x3f, 0xff, 0xf0, 0x3e, 0x1, 0xf0, 0x7c, 0x0, 0xf8, 0x7c, 0x0, 0xf8, 0xfc, 0x0, 0xfc, 0xf8, 0x0, 0x7c} +#define NXFONT_BITMAP_196 {0x3, 0xcf, 0x0, 0x3, 0xcf, 0x0, 0x3, 0xcf, 0x0, 0x3, 0xcf, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x3, 0xff, 0x0,\ + 0x3, 0xff, 0x0, 0x3, 0xff, 0x0, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0xf, 0x87, 0x80, 0xf, 0x87, 0xc0, 0xf, 0x87, 0xc0, 0x1f, 0x3, 0xc0, 0x1f, 0x3, 0xe0, 0x1f, 0xff, 0xe0, 0x1f,\ + 0xff, 0xe0, 0x3f, 0xff, 0xf0, 0x3f, 0xff, 0xf0, 0x3e, 0x1, 0xf0, 0x7c, 0x0, 0xf8, 0x7c, 0x0, 0xf8, 0xfc, 0x0, 0xfc, 0xf8, 0x0, 0x7c} /* Aring (197) */ #define NXFONT_METRICS_197 {3, 22, 31, 0, 6, 0} -#define NXFONT_BITMAP_197 {0x0, 0x78, 0x0, 0x0, 0xcc, 0x0, 0x0, 0x84, 0x0, 0x0, 0x84, 0x0, 0x0, 0xcc, 0x0, 0x0, 0x78, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x3, 0xff, 0x0, 0x3, 0xff, 0x0, 0x3, 0xff, 0x0, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0xf, 0x87, 0x80, 0xf, 0x87, 0xc0, 0xf, 0x87, 0xc0, 0x1f, 0x3, 0xc0, 0x1f, 0x3, 0xe0, 0x1f, 0xff, 0xe0, 0x1f, 0xff, 0xe0, 0x3f, 0xff, 0xf0, 0x3f, 0xff, 0xf0, 0x3e, 0x1, 0xf0, 0x7c, 0x0, 0xf8, 0x7c, 0x0, 0xf8, 0xfc, 0x0, 0xfc, 0xf8, 0x0, 0x7c} +#define NXFONT_BITMAP_197 {0x0, 0x78, 0x0, 0x0, 0xcc, 0x0, 0x0, 0x84, 0x0, 0x0, 0x84, 0x0, 0x0, 0xcc, 0x0, 0x0, 0x78, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x1, 0xfe, 0x0, 0x3, 0xff, 0x0,\ + 0x3, 0xff, 0x0, 0x3, 0xff, 0x0, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0x7, 0xcf, 0x80, 0xf, 0x87, 0x80, 0xf, 0x87, 0xc0, 0xf, 0x87, 0xc0, 0x1f, 0x3, 0xc0, 0x1f, 0x3, 0xe0, 0x1f, 0xff, 0xe0, 0x1f,\ + 0xff, 0xe0, 0x3f, 0xff, 0xf0, 0x3f, 0xff, 0xf0, 0x3e, 0x1, 0xf0, 0x7c, 0x0, 0xf8, 0x7c, 0x0, 0xf8, 0xfc, 0x0, 0xfc, 0xf8, 0x0, 0x7c} /* AE (198) */ #define NXFONT_METRICS_198 {4, 31, 25, 0, 12, 0} -#define NXFONT_BITMAP_198 {0x0, 0xff, 0xff, 0xfc, 0x0, 0xff, 0xff, 0xfc, 0x0, 0xff, 0xff, 0xfc, 0x1, 0xff, 0xff, 0xfc, 0x1, 0xf3, 0xc0, 0x0, 0x1, 0xe3, 0xc0, 0x0, 0x3, 0xe3, 0xc0, 0x0, 0x3, 0xe3, 0xc0, 0x0, 0x3, 0xc3, 0xc0, 0x0, 0x7, 0xc3, 0xc0, 0x0, 0x7, 0xc3, 0xc0, 0x0, 0x7, 0xc3, 0xff, 0xf8, 0xf, 0x83, 0xff, 0xf8, 0xf, 0x83, 0xff, 0xf8, 0xf, 0x83, 0xff, 0xf8, 0x1f, 0x3, 0xc0, 0x0, 0x1f, 0xff, 0xc0, 0x0, 0x1f, 0xff, 0xc0, 0x0, 0x3f, 0xff, 0xc0, 0x0, 0x3f, 0xff, 0xc0, 0x0, 0x3e, 0x3, 0xc0, 0x0, 0x7c, 0x3, 0xff, 0xfe, 0x7c, 0x3, 0xff, 0xfe, 0xf8, 0x3, 0xff, 0xfe, 0xf8, 0x3, 0xff, 0xfe} +#define NXFONT_BITMAP_198 {0x0, 0xff, 0xff, 0xfc, 0x0, 0xff, 0xff, 0xfc, 0x0, 0xff, 0xff, 0xfc, 0x1, 0xff, 0xff, 0xfc, 0x1, 0xf3, 0xc0, 0x0, 0x1, 0xe3, 0xc0, 0x0, 0x3, 0xe3, 0xc0, 0x0, 0x3, 0xe3, 0xc0, 0x0, 0x3, 0xc3,\ + 0xc0, 0x0, 0x7, 0xc3, 0xc0, 0x0, 0x7, 0xc3, 0xc0, 0x0, 0x7, 0xc3, 0xff, 0xf8, 0xf, 0x83, 0xff, 0xf8, 0xf, 0x83, 0xff, 0xf8, 0xf, 0x83, 0xff, 0xf8, 0x1f, 0x3, 0xc0, 0x0, 0x1f, 0xff, 0xc0, 0x0,\ + 0x1f, 0xff, 0xc0, 0x0, 0x3f, 0xff, 0xc0, 0x0, 0x3f, 0xff, 0xc0, 0x0, 0x3e, 0x3, 0xc0, 0x0, 0x7c, 0x3, 0xff, 0xfe, 0x7c, 0x3, 0xff, 0xfe, 0xf8, 0x3, 0xff, 0xfe, 0xf8, 0x3, 0xff, 0xfe} /* Ccedilla (199) */ #define NXFONT_METRICS_199 {3, 21, 32, 1, 12, 0} -#define NXFONT_BITMAP_199 {0x1, 0xfe, 0x0, 0x7, 0xff, 0x80, 0xf, 0xff, 0xc0, 0x1f, 0xff, 0xe0, 0x3f, 0x87, 0xf0, 0x3e, 0x1, 0xf0, 0x7c, 0x1, 0xf0, 0x7c, 0x0, 0xf8, 0x7c, 0x0, 0xf8, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0x7c, 0x0, 0xf8, 0x7c, 0x0, 0xf8, 0x7e, 0x1, 0xf8, 0x3e, 0x1, 0xf0, 0x3f, 0x87, 0xf0, 0x1f, 0xff, 0xe0, 0xf, 0xff, 0xc0, 0x7, 0xff, 0x80, 0x1, 0xfc, 0x0, 0x0, 0x60, 0x0, 0x0, 0x60, 0x0, 0x0, 0xf8, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x1, 0xf8, 0x0, 0x1, 0xf0, 0x0} +#define NXFONT_BITMAP_199 {0x1, 0xfe, 0x0, 0x7, 0xff, 0x80, 0xf, 0xff, 0xc0, 0x1f, 0xff, 0xe0, 0x3f, 0x87, 0xf0, 0x3e, 0x1, 0xf0, 0x7c, 0x1, 0xf0, 0x7c, 0x0, 0xf8, 0x7c, 0x0, 0xf8, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8,\ + 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0x7c, 0x0, 0xf8, 0x7c, 0x0, 0xf8, 0x7e, 0x1, 0xf8, 0x3e, 0x1, 0xf0, 0x3f, 0x87, 0xf0, 0x1f, 0xff, 0xe0, 0xf, 0xff,\ + 0xc0, 0x7, 0xff, 0x80, 0x1, 0xfc, 0x0, 0x0, 0x60, 0x0, 0x0, 0x60, 0x0, 0x0, 0xf8, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x1, 0xf8, 0x0, 0x1, 0xf0, 0x0} /* Egrave (200) */ #define NXFONT_METRICS_200 {3, 18, 31, 2, 6, 0} -#define NXFONT_BITMAP_200 {0x1e, 0x0, 0x0, 0xf, 0x0, 0x0, 0x7, 0x80, 0x0, 0x3, 0xc0, 0x0, 0x1, 0xe0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0} +#define NXFONT_BITMAP_200 {0x1e, 0x0, 0x0, 0xf, 0x0, 0x0, 0x7, 0x80, 0x0, 0x3, 0xc0, 0x0, 0x1, 0xe0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xf8, 0x0, 0x0, 0xf8, 0x0,\ + 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8,\ + 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0} /* Eacute (201) */ #define NXFONT_METRICS_201 {3, 18, 31, 2, 6, 0} -#define NXFONT_BITMAP_201 {0x0, 0x78, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xe0, 0x0, 0x3, 0xc0, 0x0, 0x7, 0x80, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0} +#define NXFONT_BITMAP_201 {0x0, 0x78, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xe0, 0x0, 0x3, 0xc0, 0x0, 0x7, 0x80, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xf8, 0x0, 0x0, 0xf8,\ + 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0,\ + 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0} /* Ecircumflex (202) */ #define NXFONT_METRICS_202 {3, 18, 31, 2, 6, 0} -#define NXFONT_BITMAP_202 {0x0, 0xc0, 0x0, 0x1, 0xe0, 0x0, 0x3, 0xf0, 0x0, 0x7, 0x38, 0x0, 0xe, 0x1c, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0} +#define NXFONT_BITMAP_202 {0x0, 0xc0, 0x0, 0x1, 0xe0, 0x0, 0x3, 0xf0, 0x0, 0x7, 0x38, 0x0, 0xe, 0x1c, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xf8, 0x0, 0x0, 0xf8,\ + 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0,\ + 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0} /* Edieresis (203) */ #define NXFONT_METRICS_203 {3, 18, 31, 2, 6, 0} -#define NXFONT_BITMAP_203 {0x1e, 0x3c, 0x0, 0x1e, 0x3c, 0x0, 0x1e, 0x3c, 0x0, 0x1e, 0x3c, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0} +#define NXFONT_BITMAP_203 {0x1e, 0x3c, 0x0, 0x1e, 0x3c, 0x0, 0x1e, 0x3c, 0x0, 0x1e, 0x3c, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xf8, 0x0, 0x0,\ + 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xff, 0xff, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8,\ + 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0} /* Igrave (204) */ #define NXFONT_METRICS_204 {1, 8, 31, 0, 6, 0} @@ -635,27 +681,39 @@ /* Ntilde (209) */ #define NXFONT_METRICS_209 {3, 19, 30, 2, 7, 0} -#define NXFONT_BITMAP_209 {0x3, 0xc6, 0x0, 0x7, 0xfe, 0x0, 0xf, 0xfc, 0x0, 0xc, 0x78, 0x0, 0x0, 0x0, 0x0, 0xf8, 0x3, 0xe0, 0xfc, 0x3, 0xe0, 0xfc, 0x3, 0xe0, 0xfe, 0x3, 0xe0, 0xfe, 0x3, 0xe0, 0xff, 0x3, 0xe0, 0xff, 0x3, 0xe0, 0xff, 0x83, 0xe0, 0xff, 0xc3, 0xe0, 0xfb, 0xc3, 0xe0, 0xfb, 0xe3, 0xe0, 0xf9, 0xe3, 0xe0, 0xf9, 0xf3, 0xe0, 0xf8, 0xf3, 0xe0, 0xf8, 0xfb, 0xe0, 0xf8, 0x7b, 0xe0, 0xf8, 0x3f, 0xe0, 0xf8, 0x3f, 0xe0, 0xf8, 0x1f, 0xe0, 0xf8, 0x1f, 0xe0, 0xf8, 0xf, 0xe0, 0xf8, 0xf, 0xe0, 0xf8, 0x7, 0xe0, 0xf8, 0x7, 0xe0, 0xf8, 0x3, 0xe0} +#define NXFONT_BITMAP_209 {0x3, 0xc6, 0x0, 0x7, 0xfe, 0x0, 0xf, 0xfc, 0x0, 0xc, 0x78, 0x0, 0x0, 0x0, 0x0, 0xf8, 0x3, 0xe0, 0xfc, 0x3, 0xe0, 0xfc, 0x3, 0xe0, 0xfe, 0x3, 0xe0, 0xfe, 0x3, 0xe0, 0xff, 0x3, 0xe0,\ + 0xff, 0x3, 0xe0, 0xff, 0x83, 0xe0, 0xff, 0xc3, 0xe0, 0xfb, 0xc3, 0xe0, 0xfb, 0xe3, 0xe0, 0xf9, 0xe3, 0xe0, 0xf9, 0xf3, 0xe0, 0xf8, 0xf3, 0xe0, 0xf8, 0xfb, 0xe0, 0xf8, 0x7b, 0xe0,\ + 0xf8, 0x3f, 0xe0, 0xf8, 0x3f, 0xe0, 0xf8, 0x1f, 0xe0, 0xf8, 0x1f, 0xe0, 0xf8, 0xf, 0xe0, 0xf8, 0xf, 0xe0, 0xf8, 0x7, 0xe0, 0xf8, 0x7, 0xe0, 0xf8, 0x3, 0xe0} /* Ograve (210) */ #define NXFONT_METRICS_210 {3, 23, 31, 1, 6, 0} -#define NXFONT_BITMAP_210 {0x1, 0xe0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x78, 0x0, 0x0, 0x3c, 0x0, 0x0, 0x1e, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0, 0x7, 0xff, 0xc0, 0xf, 0xff, 0xe0, 0x1f, 0xff, 0xf0, 0x3f, 0xc7, 0xf8, 0x3f, 0x1, 0xf8, 0x7e, 0x0, 0xfc, 0x7c, 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0x7c, 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0x7e, 0x0, 0xfc, 0x3f, 0x1, 0xf8, 0x3f, 0xc7, 0xf8, 0x1f, 0xff, 0xf0, 0xf, 0xff, 0xe0, 0x7, 0xff, 0xc0, 0x1, 0xff, 0x0} +#define NXFONT_BITMAP_210 {0x1, 0xe0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x78, 0x0, 0x0, 0x3c, 0x0, 0x0, 0x1e, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0, 0x7, 0xff, 0xc0, 0xf, 0xff, 0xe0, 0x1f, 0xff, 0xf0, 0x3f, 0xc7, 0xf8, 0x3f,\ + 0x1, 0xf8, 0x7e, 0x0, 0xfc, 0x7c, 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0x7c,\ + 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0x7e, 0x0, 0xfc, 0x3f, 0x1, 0xf8, 0x3f, 0xc7, 0xf8, 0x1f, 0xff, 0xf0, 0xf, 0xff, 0xe0, 0x7, 0xff, 0xc0, 0x1, 0xff, 0x0} /* Oacute (211) */ #define NXFONT_METRICS_211 {3, 23, 31, 1, 6, 0} -#define NXFONT_BITMAP_211 {0x0, 0x7, 0x80, 0x0, 0xf, 0x0, 0x0, 0x1e, 0x0, 0x0, 0x3c, 0x0, 0x0, 0x78, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0, 0x7, 0xff, 0xc0, 0xf, 0xff, 0xe0, 0x1f, 0xff, 0xf0, 0x3f, 0xc7, 0xf8, 0x3f, 0x1, 0xf8, 0x7e, 0x0, 0xfc, 0x7c, 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0x7c, 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0x7e, 0x0, 0xfc, 0x3f, 0x1, 0xf8, 0x3f, 0xc7, 0xf8, 0x1f, 0xff, 0xf0, 0xf, 0xff, 0xe0, 0x7, 0xff, 0xc0, 0x1, 0xff, 0x0} +#define NXFONT_BITMAP_211 {0x0, 0x7, 0x80, 0x0, 0xf, 0x0, 0x0, 0x1e, 0x0, 0x0, 0x3c, 0x0, 0x0, 0x78, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0, 0x7, 0xff, 0xc0, 0xf, 0xff, 0xe0, 0x1f, 0xff, 0xf0, 0x3f, 0xc7, 0xf8, 0x3f,\ + 0x1, 0xf8, 0x7e, 0x0, 0xfc, 0x7c, 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0x7c,\ + 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0x7e, 0x0, 0xfc, 0x3f, 0x1, 0xf8, 0x3f, 0xc7, 0xf8, 0x1f, 0xff, 0xf0, 0xf, 0xff, 0xe0, 0x7, 0xff, 0xc0, 0x1, 0xff, 0x0} /* Ocircumflex (212) */ #define NXFONT_METRICS_212 {3, 23, 31, 1, 6, 0} -#define NXFONT_BITMAP_212 {0x0, 0x18, 0x0, 0x0, 0x3c, 0x0, 0x0, 0x7e, 0x0, 0x0, 0xe7, 0x0, 0x1, 0xc3, 0x80, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0, 0x7, 0xff, 0xc0, 0xf, 0xff, 0xe0, 0x1f, 0xff, 0xf0, 0x3f, 0xc7, 0xf8, 0x3f, 0x1, 0xf8, 0x7e, 0x0, 0xfc, 0x7c, 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0x7c, 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0x7e, 0x0, 0xfc, 0x3f, 0x1, 0xf8, 0x3f, 0xc7, 0xf8, 0x1f, 0xff, 0xf0, 0xf, 0xff, 0xe0, 0x7, 0xff, 0xc0, 0x1, 0xff, 0x0} +#define NXFONT_BITMAP_212 {0x0, 0x18, 0x0, 0x0, 0x3c, 0x0, 0x0, 0x7e, 0x0, 0x0, 0xe7, 0x0, 0x1, 0xc3, 0x80, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0, 0x7, 0xff, 0xc0, 0xf, 0xff, 0xe0, 0x1f, 0xff, 0xf0, 0x3f, 0xc7, 0xf8, 0x3f,\ + 0x1, 0xf8, 0x7e, 0x0, 0xfc, 0x7c, 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0x7c,\ + 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0x7e, 0x0, 0xfc, 0x3f, 0x1, 0xf8, 0x3f, 0xc7, 0xf8, 0x1f, 0xff, 0xf0, 0xf, 0xff, 0xe0, 0x7, 0xff, 0xc0, 0x1, 0xff, 0x0} /* Otilde (213) */ #define NXFONT_METRICS_213 {3, 23, 30, 1, 7, 0} -#define NXFONT_BITMAP_213 {0x0, 0x78, 0xc0, 0x0, 0xff, 0xc0, 0x1, 0xff, 0x80, 0x1, 0x8f, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0, 0x7, 0xff, 0xc0, 0xf, 0xff, 0xe0, 0x1f, 0xff, 0xf0, 0x3f, 0xc7, 0xf8, 0x3f, 0x1, 0xf8, 0x7e, 0x0, 0xfc, 0x7c, 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0x7c, 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0x7e, 0x0, 0xfc, 0x3f, 0x1, 0xf8, 0x3f, 0xc7, 0xf8, 0x1f, 0xff, 0xf0, 0xf, 0xff, 0xe0, 0x7, 0xff, 0xc0, 0x1, 0xff, 0x0} +#define NXFONT_BITMAP_213 {0x0, 0x78, 0xc0, 0x0, 0xff, 0xc0, 0x1, 0xff, 0x80, 0x1, 0x8f, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0, 0x7, 0xff, 0xc0, 0xf, 0xff, 0xe0, 0x1f, 0xff, 0xf0, 0x3f, 0xc7, 0xf8, 0x3f, 0x1, 0xf8,\ + 0x7e, 0x0, 0xfc, 0x7c, 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0x7c, 0x0, 0x7c,\ + 0x7c, 0x0, 0x7c, 0x7e, 0x0, 0xfc, 0x3f, 0x1, 0xf8, 0x3f, 0xc7, 0xf8, 0x1f, 0xff, 0xf0, 0xf, 0xff, 0xe0, 0x7, 0xff, 0xc0, 0x1, 0xff, 0x0} /* Odieresis (214) */ #define NXFONT_METRICS_214 {3, 23, 31, 1, 6, 0} -#define NXFONT_BITMAP_214 {0x1, 0xe7, 0x80, 0x1, 0xe7, 0x80, 0x1, 0xe7, 0x80, 0x1, 0xe7, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0, 0x7, 0xff, 0xc0, 0xf, 0xff, 0xe0, 0x1f, 0xff, 0xf0, 0x3f, 0xc7, 0xf8, 0x3f, 0x1, 0xf8, 0x7e, 0x0, 0xfc, 0x7c, 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0x7c, 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0x7e, 0x0, 0xfc, 0x3f, 0x1, 0xf8, 0x3f, 0xc7, 0xf8, 0x1f, 0xff, 0xf0, 0xf, 0xff, 0xe0, 0x7, 0xff, 0xc0, 0x1, 0xff, 0x0} +#define NXFONT_BITMAP_214 {0x1, 0xe7, 0x80, 0x1, 0xe7, 0x80, 0x1, 0xe7, 0x80, 0x1, 0xe7, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0, 0x7, 0xff, 0xc0, 0xf, 0xff, 0xe0, 0x1f, 0xff, 0xf0, 0x3f, 0xc7, 0xf8,\ + 0x3f, 0x1, 0xf8, 0x7e, 0x0, 0xfc, 0x7c, 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e, 0xf8, 0x0, 0x3e,\ + 0x7c, 0x0, 0x7c, 0x7c, 0x0, 0x7c, 0x7e, 0x0, 0xfc, 0x3f, 0x1, 0xf8, 0x3f, 0xc7, 0xf8, 0x1f, 0xff, 0xf0, 0xf, 0xff, 0xe0, 0x7, 0xff, 0xc0, 0x1, 0xff, 0x0} /* multiply (215) */ #define NXFONT_METRICS_215 {2, 15, 16, 2, 21, 0} @@ -667,23 +725,33 @@ /* Ugrave (217) */ #define NXFONT_METRICS_217 {3, 19, 31, 2, 6, 0} -#define NXFONT_BITMAP_217 {0x7, 0x80, 0x0, 0x3, 0xc0, 0x0, 0x1, 0xe0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x78, 0x0, 0x0, 0x0, 0x0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xfc, 0x7, 0xe0, 0x7f, 0x1f, 0xc0, 0x7f, 0xff, 0xc0, 0x3f, 0xff, 0x80, 0x1f, 0xff, 0x0, 0x7, 0xfc, 0x0} +#define NXFONT_BITMAP_217 {0x7, 0x80, 0x0, 0x3, 0xc0, 0x0, 0x1, 0xe0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x78, 0x0, 0x0, 0x0, 0x0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8,\ + 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8,\ + 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xfc, 0x7, 0xe0, 0x7f, 0x1f, 0xc0, 0x7f, 0xff, 0xc0, 0x3f, 0xff, 0x80, 0x1f, 0xff, 0x0, 0x7, 0xfc, 0x0} /* Uacute (218) */ #define NXFONT_METRICS_218 {3, 19, 31, 2, 6, 0} -#define NXFONT_BITMAP_218 {0x0, 0x1e, 0x0, 0x0, 0x3c, 0x0, 0x0, 0x78, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xe0, 0x0, 0x0, 0x0, 0x0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xfc, 0x7, 0xe0, 0x7f, 0x1f, 0xc0, 0x7f, 0xff, 0xc0, 0x3f, 0xff, 0x80, 0x1f, 0xff, 0x0, 0x7, 0xfc, 0x0} +#define NXFONT_BITMAP_218 {0x0, 0x1e, 0x0, 0x0, 0x3c, 0x0, 0x0, 0x78, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xe0, 0x0, 0x0, 0x0, 0x0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3,\ + 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0,\ + 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xfc, 0x7, 0xe0, 0x7f, 0x1f, 0xc0, 0x7f, 0xff, 0xc0, 0x3f, 0xff, 0x80, 0x1f, 0xff, 0x0, 0x7, 0xfc, 0x0} /* Ucircumflex (219) */ #define NXFONT_METRICS_219 {3, 19, 31, 2, 6, 0} -#define NXFONT_BITMAP_219 {0x0, 0x60, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xf8, 0x0, 0x3, 0x9c, 0x0, 0x7, 0xe, 0x0, 0x0, 0x0, 0x0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xfc, 0x7, 0xe0, 0x7f, 0x1f, 0xc0, 0x7f, 0xff, 0xc0, 0x3f, 0xff, 0x80, 0x1f, 0xff, 0x0, 0x7, 0xfc, 0x0} +#define NXFONT_BITMAP_219 {0x0, 0x60, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xf8, 0x0, 0x3, 0x9c, 0x0, 0x7, 0xe, 0x0, 0x0, 0x0, 0x0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0,\ + 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8,\ + 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xfc, 0x7, 0xe0, 0x7f, 0x1f, 0xc0, 0x7f, 0xff, 0xc0, 0x3f, 0xff, 0x80, 0x1f, 0xff, 0x0, 0x7, 0xfc, 0x0} /* Udieresis (220) */ #define NXFONT_METRICS_220 {3, 19, 31, 2, 6, 0} -#define NXFONT_BITMAP_220 {0xf, 0x1e, 0x0, 0xf, 0x1e, 0x0, 0xf, 0x1e, 0x0, 0xf, 0x1e, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xfc, 0x7, 0xe0, 0x7f, 0x1f, 0xc0, 0x7f, 0xff, 0xc0, 0x3f, 0xff, 0x80, 0x1f, 0xff, 0x0, 0x7, 0xfc, 0x0} +#define NXFONT_BITMAP_220 {0xf, 0x1e, 0x0, 0xf, 0x1e, 0x0, 0xf, 0x1e, 0x0, 0xf, 0x1e, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0,\ + 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xf8,\ + 0x3, 0xe0, 0xf8, 0x3, 0xe0, 0xfc, 0x7, 0xe0, 0x7f, 0x1f, 0xc0, 0x7f, 0xff, 0xc0, 0x3f, 0xff, 0x80, 0x1f, 0xff, 0x0, 0x7, 0xfc, 0x0} /* Yacute (221) */ #define NXFONT_METRICS_221 {3, 20, 31, 1, 6, 0} -#define NXFONT_BITMAP_221 {0x0, 0x1e, 0x0, 0x0, 0x3c, 0x0, 0x0, 0x78, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xe0, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x3, 0xf0, 0xfc, 0x3, 0xf0, 0x7e, 0x7, 0xe0, 0x3e, 0x7, 0xc0, 0x3f, 0xf, 0xc0, 0x3f, 0xf, 0x80, 0x1f, 0xf, 0x80, 0x1f, 0x9f, 0x0, 0xf, 0x9f, 0x0, 0xf, 0xfe, 0x0, 0x7, 0xfe, 0x0, 0x7, 0xfc, 0x0, 0x3, 0xfc, 0x0, 0x3, 0xf8, 0x0, 0x3, 0xf8, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0} +#define NXFONT_BITMAP_221 {0x0, 0x1e, 0x0, 0x0, 0x3c, 0x0, 0x0, 0x78, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xe0, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x3, 0xf0, 0xfc, 0x3, 0xf0, 0x7e, 0x7, 0xe0, 0x3e, 0x7, 0xc0, 0x3f, 0xf, 0xc0, 0x3f, 0xf, 0x80,\ + 0x1f, 0xf, 0x80, 0x1f, 0x9f, 0x0, 0xf, 0x9f, 0x0, 0xf, 0xfe, 0x0, 0x7, 0xfe, 0x0, 0x7, 0xfc, 0x0, 0x3, 0xfc, 0x0, 0x3, 0xf8, 0x0, 0x3, 0xf8, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0,\ + 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x1, 0xf0, 0x0} /* Thorn (222) */ #define NXFONT_METRICS_222 {3, 18, 25, 2, 12, 0} @@ -832,13 +900,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_serif22x28b.h b/libs/libnx/nxfonts/nxfonts_serif22x28b.h index 26992c6d3f..3f301c3806 100644 --- a/libs/libnx/nxfonts/nxfonts_serif22x28b.h +++ b/libs/libnx/nxfonts/nxfonts_serif22x28b.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_serif22x29.h b/libs/libnx/nxfonts/nxfonts_serif22x29.h index be19e28a8f..57cdf6a5ee 100644 --- a/libs/libnx/nxfonts/nxfonts_serif22x29.h +++ b/libs/libnx/nxfonts/nxfonts_serif22x29.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_serif27x38b.h b/libs/libnx/nxfonts/nxfonts_serif27x38b.h index 64c07e2f79..bcba7c2888 100644 --- a/libs/libnx/nxfonts/nxfonts_serif27x38b.h +++ b/libs/libnx/nxfonts/nxfonts_serif27x38b.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_serif29x37.h b/libs/libnx/nxfonts/nxfonts_serif29x37.h index a35ae4da56..186db443f8 100644 --- a/libs/libnx/nxfonts/nxfonts_serif29x37.h +++ b/libs/libnx/nxfonts/nxfonts_serif29x37.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_serif38x48.h b/libs/libnx/nxfonts/nxfonts_serif38x48.h index 8039fe19ce..94b193aa78 100644 --- a/libs/libnx/nxfonts/nxfonts_serif38x48.h +++ b/libs/libnx/nxfonts/nxfonts_serif38x48.h @@ -191,7 +191,10 @@ /* at (64) */ #define NXFONT_METRICS_64 {4, 27, 28, 2, 14, 0} -#define NXFONT_BITMAP_64 {0x0, 0x1f, 0xf0, 0x0, 0x0, 0xf8, 0x3c, 0x0, 0x1, 0xe0, 0x6, 0x0, 0x7, 0x80, 0x3, 0x0, 0xe, 0x0, 0x1, 0x80, 0x1c, 0x0, 0x0, 0xc0, 0x1c, 0x0, 0x0, 0xc0, 0x38, 0x7, 0x8c, 0x60, 0x70, 0x1f, 0x5c, 0x60, 0x70, 0x1c, 0x7c, 0x20, 0x70, 0x38, 0x38, 0x20, 0xe0, 0x70, 0x38, 0x20, 0xe0, 0x70, 0x30, 0x20, 0xe0, 0x70, 0x70, 0x20, 0xe0, 0xe0, 0x70, 0x60, 0xe0, 0xe0, 0x70, 0x40, 0xe0, 0xe0, 0xe0, 0xc0, 0xe0, 0xe0, 0xe0, 0x80, 0x70, 0xe1, 0xe1, 0x80, 0x70, 0x77, 0x73, 0x0, 0x70, 0x3c, 0x3e, 0x0, 0x38, 0x0, 0x0, 0x0, 0x18, 0x0, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x0, 0xe, 0x0, 0x0, 0x0, 0x7, 0x80, 0x6, 0x0, 0x1, 0xf0, 0x3c, 0x0, 0x0, 0x7f, 0xf0, 0x0} +#define NXFONT_BITMAP_64 {0x0, 0x1f, 0xf0, 0x0, 0x0, 0xf8, 0x3c, 0x0, 0x1, 0xe0, 0x6, 0x0, 0x7, 0x80, 0x3, 0x0, 0xe, 0x0, 0x1, 0x80, 0x1c, 0x0, 0x0, 0xc0, 0x1c, 0x0, 0x0, 0xc0, 0x38, 0x7, 0x8c, 0x60, 0x70,\ + 0x1f, 0x5c, 0x60, 0x70, 0x1c, 0x7c, 0x20, 0x70, 0x38, 0x38, 0x20, 0xe0, 0x70, 0x38, 0x20, 0xe0, 0x70, 0x30, 0x20, 0xe0, 0x70, 0x70, 0x20, 0xe0, 0xe0, 0x70, 0x60, 0xe0, 0xe0, 0x70,\ + 0x40, 0xe0, 0xe0, 0xe0, 0xc0, 0xe0, 0xe0, 0xe0, 0x80, 0x70, 0xe1, 0xe1, 0x80, 0x70, 0x77, 0x73, 0x0, 0x70, 0x3c, 0x3e, 0x0, 0x38, 0x0, 0x0, 0x0, 0x18, 0x0, 0x0, 0x0, 0x1c, 0x0,\ + 0x0, 0x0, 0xe, 0x0, 0x0, 0x0, 0x7, 0x80, 0x6, 0x0, 0x1, 0xf0, 0x3c, 0x0, 0x0, 0x7f, 0xf0, 0x0} /* A (65) */ #define NXFONT_METRICS_65 {3, 22, 23, 1, 14, 0} @@ -243,7 +246,9 @@ /* M (77) */ #define NXFONT_METRICS_77 {4, 28, 23, 1, 14, 0} -#define NXFONT_BITMAP_77 {0xfc, 0x0, 0x7, 0xf0, 0x3e, 0x0, 0x7, 0xc0, 0x1e, 0x0, 0xf, 0x80, 0x1f, 0x0, 0xf, 0x80, 0x1f, 0x0, 0xb, 0x80, 0x17, 0x0, 0x1b, 0x80, 0x17, 0x80, 0x1b, 0x80, 0x13, 0x80, 0x33, 0x80, 0x13, 0xc0, 0x33, 0x80, 0x13, 0xc0, 0x23, 0x80, 0x11, 0xe0, 0x63, 0x80, 0x11, 0xe0, 0x63, 0x80, 0x10, 0xe0, 0xc3, 0x80, 0x10, 0xf0, 0xc3, 0x80, 0x10, 0x70, 0x83, 0x80, 0x10, 0x79, 0x83, 0x80, 0x10, 0x79, 0x3, 0x80, 0x10, 0x3d, 0x3, 0x80, 0x10, 0x3f, 0x3, 0x80, 0x10, 0x1e, 0x3, 0x80, 0x10, 0x1e, 0x3, 0x80, 0x38, 0xc, 0x7, 0xc0, 0xfe, 0xc, 0x1f, 0xf0} +#define NXFONT_BITMAP_77 {0xfc, 0x0, 0x7, 0xf0, 0x3e, 0x0, 0x7, 0xc0, 0x1e, 0x0, 0xf, 0x80, 0x1f, 0x0, 0xf, 0x80, 0x1f, 0x0, 0xb, 0x80, 0x17, 0x0, 0x1b, 0x80, 0x17, 0x80, 0x1b, 0x80, 0x13, 0x80, 0x33, 0x80, 0x13,\ + 0xc0, 0x33, 0x80, 0x13, 0xc0, 0x23, 0x80, 0x11, 0xe0, 0x63, 0x80, 0x11, 0xe0, 0x63, 0x80, 0x10, 0xe0, 0xc3, 0x80, 0x10, 0xf0, 0xc3, 0x80, 0x10, 0x70, 0x83, 0x80, 0x10, 0x79, 0x83, 0x80,\ + 0x10, 0x79, 0x3, 0x80, 0x10, 0x3d, 0x3, 0x80, 0x10, 0x3f, 0x3, 0x80, 0x10, 0x1e, 0x3, 0x80, 0x10, 0x1e, 0x3, 0x80, 0x38, 0xc, 0x7, 0xc0, 0xfe, 0xc, 0x1f, 0xf0} /* N (78) */ #define NXFONT_METRICS_78 {3, 22, 23, 1, 14, 0} @@ -283,7 +288,9 @@ /* W (87) */ #define NXFONT_METRICS_87 {4, 31, 23, 1, 14, 0} -#define NXFONT_BITMAP_87 {0xff, 0x3f, 0xe0, 0xfe, 0x7c, 0xf, 0x80, 0x78, 0x3c, 0x7, 0x0, 0x30, 0x1c, 0x7, 0x80, 0x30, 0x1e, 0x7, 0x80, 0x60, 0x1e, 0x3, 0x80, 0x60, 0xe, 0x3, 0xc0, 0x60, 0xf, 0x3, 0xc0, 0xc0, 0x7, 0x3, 0xe0, 0xc0, 0x7, 0x87, 0xe0, 0xc0, 0x7, 0x86, 0xe1, 0x80, 0x3, 0x84, 0xf1, 0x80, 0x3, 0xcc, 0xf1, 0x80, 0x3, 0xcc, 0x73, 0x0, 0x1, 0xd8, 0x7b, 0x0, 0x1, 0xd8, 0x3b, 0x0, 0x1, 0xf8, 0x3e, 0x0, 0x0, 0xf0, 0x3e, 0x0, 0x0, 0xf0, 0x1c, 0x0, 0x0, 0xe0, 0x1c, 0x0, 0x0, 0x60, 0x1c, 0x0, 0x0, 0x60, 0x8, 0x0, 0x0, 0x40, 0x8, 0x0} +#define NXFONT_BITMAP_87 {0xff, 0x3f, 0xe0, 0xfe, 0x7c, 0xf, 0x80, 0x78, 0x3c, 0x7, 0x0, 0x30, 0x1c, 0x7, 0x80, 0x30, 0x1e, 0x7, 0x80, 0x60, 0x1e, 0x3, 0x80, 0x60, 0xe, 0x3, 0xc0, 0x60, 0xf, 0x3, 0xc0, 0xc0, 0x7,\ + 0x3, 0xe0, 0xc0, 0x7, 0x87, 0xe0, 0xc0, 0x7, 0x86, 0xe1, 0x80, 0x3, 0x84, 0xf1, 0x80, 0x3, 0xcc, 0xf1, 0x80, 0x3, 0xcc, 0x73, 0x0, 0x1, 0xd8, 0x7b, 0x0, 0x1, 0xd8, 0x3b, 0x0, 0x1, 0xf8,\ + 0x3e, 0x0, 0x0, 0xf0, 0x3e, 0x0, 0x0, 0xf0, 0x1c, 0x0, 0x0, 0xe0, 0x1c, 0x0, 0x0, 0x60, 0x1c, 0x0, 0x0, 0x60, 0x8, 0x0, 0x0, 0x40, 0x8, 0x0} /* X (88) */ #define NXFONT_METRICS_88 {3, 22, 23, 1, 14, 0} @@ -591,23 +598,33 @@ /* AE (198) */ #define NXFONT_METRICS_198 {4, 28, 23, 1, 14, 0} -#define NXFONT_BITMAP_198 {0x0, 0xff, 0xff, 0xe0, 0x0, 0x1f, 0x81, 0xe0, 0x0, 0x1f, 0x0, 0x60, 0x0, 0x37, 0x0, 0x20, 0x0, 0x37, 0x0, 0x20, 0x0, 0x67, 0x0, 0x0, 0x0, 0x67, 0x0, 0x0, 0x0, 0x47, 0x0, 0x80, 0x0, 0xc7, 0x0, 0x80, 0x0, 0xc7, 0x1, 0x80, 0x1, 0x87, 0x3, 0x80, 0x1, 0x87, 0xff, 0x80, 0x3, 0x7, 0x3, 0x80, 0x3, 0x7, 0x1, 0x80, 0x7, 0xff, 0x0, 0x80, 0x6, 0x7, 0x0, 0x80, 0xc, 0x7, 0x0, 0x0, 0xc, 0x7, 0x0, 0x10, 0x18, 0x7, 0x0, 0x10, 0x18, 0x7, 0x0, 0x30, 0x30, 0x7, 0x0, 0x60, 0x30, 0xf, 0x81, 0xe0, 0xfe, 0x3f, 0xff, 0xe0} +#define NXFONT_BITMAP_198 {0x0, 0xff, 0xff, 0xe0, 0x0, 0x1f, 0x81, 0xe0, 0x0, 0x1f, 0x0, 0x60, 0x0, 0x37, 0x0, 0x20, 0x0, 0x37, 0x0, 0x20, 0x0, 0x67, 0x0, 0x0, 0x0, 0x67, 0x0, 0x0, 0x0, 0x47, 0x0, 0x80, 0x0, 0xc7,\ + 0x0, 0x80, 0x0, 0xc7, 0x1, 0x80, 0x1, 0x87, 0x3, 0x80, 0x1, 0x87, 0xff, 0x80, 0x3, 0x7, 0x3, 0x80, 0x3, 0x7, 0x1, 0x80, 0x7, 0xff, 0x0, 0x80, 0x6, 0x7, 0x0, 0x80, 0xc, 0x7, 0x0, 0x0,\ + 0xc, 0x7, 0x0, 0x10, 0x18, 0x7, 0x0, 0x10, 0x18, 0x7, 0x0, 0x30, 0x30, 0x7, 0x0, 0x60, 0x30, 0xf, 0x81, 0xe0, 0xfe, 0x3f, 0xff, 0xe0} /* Ccedilla (199) */ #define NXFONT_METRICS_199 {3, 20, 30, 1, 14, 0} -#define NXFONT_BITMAP_199 {0x1, 0xff, 0x10, 0x7, 0x83, 0xf0, 0xe, 0x0, 0xf0, 0x1c, 0x0, 0x70, 0x38, 0x0, 0x30, 0x38, 0x0, 0x30, 0x70, 0x0, 0x10, 0x70, 0x0, 0x10, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x70, 0x0, 0x0, 0x70, 0x0, 0x0, 0x38, 0x0, 0x0, 0x38, 0x0, 0x10, 0x1c, 0x0, 0x30, 0xe, 0x0, 0x60, 0x7, 0x83, 0xc0, 0x1, 0xff, 0x0, 0x0, 0x40, 0x0, 0x0, 0xc0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x38, 0x0, 0x0, 0x18, 0x0, 0x0, 0x38, 0x0, 0x1, 0xf0, 0x0} +#define NXFONT_BITMAP_199 {0x1, 0xff, 0x10, 0x7, 0x83, 0xf0, 0xe, 0x0, 0xf0, 0x1c, 0x0, 0x70, 0x38, 0x0, 0x30, 0x38, 0x0, 0x30, 0x70, 0x0, 0x10, 0x70, 0x0, 0x10, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0,\ + 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x70, 0x0, 0x0, 0x70, 0x0, 0x0, 0x38, 0x0, 0x0, 0x38, 0x0, 0x10, 0x1c, 0x0, 0x30, 0xe, 0x0, 0x60, 0x7, 0x83, 0xc0, 0x1, 0xff, 0x0,\ + 0x0, 0x40, 0x0, 0x0, 0xc0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x38, 0x0, 0x0, 0x18, 0x0, 0x0, 0x38, 0x0, 0x1, 0xf0, 0x0} /* Egrave (200) */ #define NXFONT_METRICS_200 {3, 19, 30, 1, 7, 0} -#define NXFONT_BITMAP_200 {0x3, 0x0, 0x0, 0x3, 0x80, 0x0, 0x1, 0xc0, 0x0, 0x0, 0x60, 0x0, 0x0, 0x30, 0x0, 0x0, 0x18, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xc0, 0x3e, 0x3, 0xc0, 0x1c, 0x0, 0xc0, 0x1c, 0x0, 0x40, 0x1c, 0x0, 0x40, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x3, 0x0, 0x1f, 0xff, 0x0, 0x1c, 0x3, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x60, 0x1c, 0x0, 0xc0, 0x3e, 0x3, 0xc0, 0xff, 0xff, 0xc0} +#define NXFONT_BITMAP_200 {0x3, 0x0, 0x0, 0x3, 0x80, 0x0, 0x1, 0xc0, 0x0, 0x0, 0x60, 0x0, 0x0, 0x30, 0x0, 0x0, 0x18, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xc0, 0x3e, 0x3, 0xc0, 0x1c, 0x0, 0xc0, 0x1c, 0x0, 0x40, 0x1c, 0x0,\ + 0x40, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x3, 0x0, 0x1f, 0xff, 0x0, 0x1c, 0x3, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x0, 0x0, 0x1c,\ + 0x0, 0x0, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x60, 0x1c, 0x0, 0xc0, 0x3e, 0x3, 0xc0, 0xff, 0xff, 0xc0} /* Eacute (201) */ #define NXFONT_METRICS_201 {3, 19, 30, 1, 7, 0} -#define NXFONT_BITMAP_201 {0x0, 0x6, 0x0, 0x0, 0xe, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x30, 0x0, 0x0, 0x60, 0x0, 0x0, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xc0, 0x3e, 0x3, 0xc0, 0x1c, 0x0, 0xc0, 0x1c, 0x0, 0x40, 0x1c, 0x0, 0x40, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x3, 0x0, 0x1f, 0xff, 0x0, 0x1c, 0x3, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x60, 0x1c, 0x0, 0xc0, 0x3e, 0x3, 0xc0, 0xff, 0xff, 0xc0} +#define NXFONT_BITMAP_201 {0x0, 0x6, 0x0, 0x0, 0xe, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x30, 0x0, 0x0, 0x60, 0x0, 0x0, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xc0, 0x3e, 0x3, 0xc0, 0x1c, 0x0, 0xc0, 0x1c, 0x0, 0x40, 0x1c, 0x0,\ + 0x40, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x3, 0x0, 0x1f, 0xff, 0x0, 0x1c, 0x3, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x0, 0x0, 0x1c,\ + 0x0, 0x0, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x60, 0x1c, 0x0, 0xc0, 0x3e, 0x3, 0xc0, 0xff, 0xff, 0xc0} /* Ecircumflex (202) */ #define NXFONT_METRICS_202 {3, 19, 30, 1, 7, 0} -#define NXFONT_BITMAP_202 {0x0, 0x30, 0x0, 0x0, 0x78, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xce, 0x0, 0x3, 0x3, 0x0, 0x2, 0x1, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xc0, 0x3e, 0x3, 0xc0, 0x1c, 0x0, 0xc0, 0x1c, 0x0, 0x40, 0x1c, 0x0, 0x40, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x3, 0x0, 0x1f, 0xff, 0x0, 0x1c, 0x3, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x60, 0x1c, 0x0, 0xc0, 0x3e, 0x3, 0xc0, 0xff, 0xff, 0xc0} +#define NXFONT_BITMAP_202 {0x0, 0x30, 0x0, 0x0, 0x78, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xce, 0x0, 0x3, 0x3, 0x0, 0x2, 0x1, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xc0, 0x3e, 0x3, 0xc0, 0x1c, 0x0, 0xc0, 0x1c, 0x0, 0x40, 0x1c, 0x0,\ + 0x40, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x3, 0x0, 0x1f, 0xff, 0x0, 0x1c, 0x3, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x1, 0x0, 0x1c, 0x0, 0x0, 0x1c,\ + 0x0, 0x0, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x60, 0x1c, 0x0, 0xc0, 0x3e, 0x3, 0xc0, 0xff, 0xff, 0xc0} /* Edieresis (203) */ #define NXFONT_METRICS_203 {3, 19, 28, 1, 9, 0} @@ -635,19 +652,27 @@ /* Ntilde (209) */ #define NXFONT_METRICS_209 {3, 22, 29, 1, 8, 0} -#define NXFONT_BITMAP_209 {0x0, 0xe0, 0x80, 0x1, 0xf9, 0x80, 0x3, 0x3f, 0x0, 0x2, 0xe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf8, 0x1, 0xfc, 0x3c, 0x0, 0x70, 0x1e, 0x0, 0x20, 0x1f, 0x0, 0x20, 0x1f, 0x0, 0x20, 0x17, 0x80, 0x20, 0x13, 0xc0, 0x20, 0x13, 0xc0, 0x20, 0x11, 0xe0, 0x20, 0x10, 0xf0, 0x20, 0x10, 0xf8, 0x20, 0x10, 0x78, 0x20, 0x10, 0x3c, 0x20, 0x10, 0x1e, 0x20, 0x10, 0x1f, 0x20, 0x10, 0xf, 0x20, 0x10, 0x7, 0xa0, 0x10, 0x3, 0xe0, 0x10, 0x1, 0xe0, 0x10, 0x1, 0xe0, 0x10, 0x0, 0xe0, 0x38, 0x0, 0x60, 0xfe, 0x0, 0x20} +#define NXFONT_BITMAP_209 {0x0, 0xe0, 0x80, 0x1, 0xf9, 0x80, 0x3, 0x3f, 0x0, 0x2, 0xe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf8, 0x1, 0xfc, 0x3c, 0x0, 0x70, 0x1e, 0x0, 0x20, 0x1f, 0x0, 0x20, 0x1f, 0x0, 0x20, 0x17,\ + 0x80, 0x20, 0x13, 0xc0, 0x20, 0x13, 0xc0, 0x20, 0x11, 0xe0, 0x20, 0x10, 0xf0, 0x20, 0x10, 0xf8, 0x20, 0x10, 0x78, 0x20, 0x10, 0x3c, 0x20, 0x10, 0x1e, 0x20, 0x10, 0x1f, 0x20, 0x10, 0xf,\ + 0x20, 0x10, 0x7, 0xa0, 0x10, 0x3, 0xe0, 0x10, 0x1, 0xe0, 0x10, 0x1, 0xe0, 0x10, 0x0, 0xe0, 0x38, 0x0, 0x60, 0xfe, 0x0, 0x20} /* Ograve (210) */ #define NXFONT_METRICS_210 {3, 22, 30, 1, 7, 0} -#define NXFONT_BITMAP_210 {0x3, 0x0, 0x0, 0x3, 0x80, 0x0, 0x1, 0xc0, 0x0, 0x0, 0x60, 0x0, 0x0, 0x30, 0x0, 0x0, 0x18, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x7, 0x87, 0x80, 0xe, 0x1, 0xc0, 0x1c, 0x0, 0xe0, 0x38, 0x0, 0x70, 0x38, 0x0, 0x70, 0x70, 0x0, 0x38, 0x70, 0x0, 0x38, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0x70, 0x0, 0x38, 0x70, 0x0, 0x38, 0x38, 0x0, 0x70, 0x38, 0x0, 0x70, 0x1c, 0x0, 0xe0, 0xe, 0x1, 0xc0, 0x7, 0x87, 0x80, 0x1, 0xfe, 0x0} +#define NXFONT_BITMAP_210 {0x3, 0x0, 0x0, 0x3, 0x80, 0x0, 0x1, 0xc0, 0x0, 0x0, 0x60, 0x0, 0x0, 0x30, 0x0, 0x0, 0x18, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x7, 0x87, 0x80, 0xe, 0x1, 0xc0, 0x1c, 0x0, 0xe0, 0x38, 0x0,\ + 0x70, 0x38, 0x0, 0x70, 0x70, 0x0, 0x38, 0x70, 0x0, 0x38, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0x70, 0x0,\ + 0x38, 0x70, 0x0, 0x38, 0x38, 0x0, 0x70, 0x38, 0x0, 0x70, 0x1c, 0x0, 0xe0, 0xe, 0x1, 0xc0, 0x7, 0x87, 0x80, 0x1, 0xfe, 0x0} /* Oacute (211) */ #define NXFONT_METRICS_211 {3, 22, 30, 1, 7, 0} -#define NXFONT_BITMAP_211 {0x0, 0x1, 0x80, 0x0, 0x3, 0x80, 0x0, 0x7, 0x0, 0x0, 0xc, 0x0, 0x0, 0x18, 0x0, 0x0, 0x30, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x7, 0x87, 0x80, 0xe, 0x1, 0xc0, 0x1c, 0x0, 0xe0, 0x38, 0x0, 0x70, 0x38, 0x0, 0x70, 0x70, 0x0, 0x38, 0x70, 0x0, 0x38, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0x70, 0x0, 0x38, 0x70, 0x0, 0x38, 0x38, 0x0, 0x70, 0x38, 0x0, 0x70, 0x1c, 0x0, 0xe0, 0xe, 0x1, 0xc0, 0x7, 0x87, 0x80, 0x1, 0xfe, 0x0} +#define NXFONT_BITMAP_211 {0x0, 0x1, 0x80, 0x0, 0x3, 0x80, 0x0, 0x7, 0x0, 0x0, 0xc, 0x0, 0x0, 0x18, 0x0, 0x0, 0x30, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x7, 0x87, 0x80, 0xe, 0x1, 0xc0, 0x1c, 0x0, 0xe0, 0x38, 0x0,\ + 0x70, 0x38, 0x0, 0x70, 0x70, 0x0, 0x38, 0x70, 0x0, 0x38, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0x70, 0x0,\ + 0x38, 0x70, 0x0, 0x38, 0x38, 0x0, 0x70, 0x38, 0x0, 0x70, 0x1c, 0x0, 0xe0, 0xe, 0x1, 0xc0, 0x7, 0x87, 0x80, 0x1, 0xfe, 0x0} /* Ocircumflex (212) */ #define NXFONT_METRICS_212 {3, 22, 30, 1, 7, 0} -#define NXFONT_BITMAP_212 {0x0, 0x30, 0x0, 0x0, 0x78, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xce, 0x0, 0x3, 0x3, 0x0, 0x2, 0x1, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x7, 0x87, 0x80, 0xe, 0x1, 0xc0, 0x1c, 0x0, 0xe0, 0x38, 0x0, 0x70, 0x38, 0x0, 0x70, 0x70, 0x0, 0x38, 0x70, 0x0, 0x38, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0x70, 0x0, 0x38, 0x70, 0x0, 0x38, 0x38, 0x0, 0x70, 0x38, 0x0, 0x70, 0x1c, 0x0, 0xe0, 0xe, 0x1, 0xc0, 0x7, 0x87, 0x80, 0x1, 0xfe, 0x0} +#define NXFONT_BITMAP_212 {0x0, 0x30, 0x0, 0x0, 0x78, 0x0, 0x0, 0xfc, 0x0, 0x1, 0xce, 0x0, 0x3, 0x3, 0x0, 0x2, 0x1, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x7, 0x87, 0x80, 0xe, 0x1, 0xc0, 0x1c, 0x0, 0xe0, 0x38, 0x0,\ + 0x70, 0x38, 0x0, 0x70, 0x70, 0x0, 0x38, 0x70, 0x0, 0x38, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0xf0, 0x0, 0x3c, 0x70, 0x0,\ + 0x38, 0x70, 0x0, 0x38, 0x38, 0x0, 0x70, 0x38, 0x0, 0x70, 0x1c, 0x0, 0xe0, 0xe, 0x1, 0xc0, 0x7, 0x87, 0x80, 0x1, 0xfe, 0x0} /* Otilde (213) */ #define NXFONT_METRICS_213 {3, 22, 28, 1, 9, 0} @@ -667,15 +692,21 @@ /* Ugrave (217) */ #define NXFONT_METRICS_217 {3, 22, 30, 1, 7, 0} -#define NXFONT_BITMAP_217 {0x0, 0xc0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0x70, 0x0, 0x0, 0x18, 0x0, 0x0, 0xc, 0x0, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0, 0xff, 0x81, 0xfc, 0x3e, 0x0, 0x70, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x60, 0x1e, 0x0, 0x60, 0xe, 0x0, 0x40, 0xf, 0x0, 0xc0, 0x7, 0xc3, 0x80, 0x1, 0xfe, 0x0} +#define NXFONT_BITMAP_217 {0x0, 0xc0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0x70, 0x0, 0x0, 0x18, 0x0, 0x0, 0xc, 0x0, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0, 0xff, 0x81, 0xfc, 0x3e, 0x0, 0x70, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0,\ + 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0,\ + 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x60, 0x1e, 0x0, 0x60, 0xe, 0x0, 0x40, 0xf, 0x0, 0xc0, 0x7, 0xc3, 0x80, 0x1, 0xfe, 0x0} /* Uacute (218) */ #define NXFONT_METRICS_218 {3, 22, 30, 1, 7, 0} -#define NXFONT_BITMAP_218 {0x0, 0x1, 0x80, 0x0, 0x3, 0x80, 0x0, 0x7, 0x0, 0x0, 0xc, 0x0, 0x0, 0x18, 0x0, 0x0, 0x30, 0x0, 0x0, 0x0, 0x0, 0xff, 0x81, 0xfc, 0x3e, 0x0, 0x70, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x60, 0x1e, 0x0, 0x60, 0xe, 0x0, 0x40, 0xf, 0x0, 0xc0, 0x7, 0xc3, 0x80, 0x1, 0xfe, 0x0} +#define NXFONT_BITMAP_218 {0x0, 0x1, 0x80, 0x0, 0x3, 0x80, 0x0, 0x7, 0x0, 0x0, 0xc, 0x0, 0x0, 0x18, 0x0, 0x0, 0x30, 0x0, 0x0, 0x0, 0x0, 0xff, 0x81, 0xfc, 0x3e, 0x0, 0x70, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0,\ + 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0,\ + 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x60, 0x1e, 0x0, 0x60, 0xe, 0x0, 0x40, 0xf, 0x0, 0xc0, 0x7, 0xc3, 0x80, 0x1, 0xfe, 0x0} /* Ucircumflex (219) */ #define NXFONT_METRICS_219 {3, 22, 30, 1, 7, 0} -#define NXFONT_BITMAP_219 {0x0, 0x18, 0x0, 0x0, 0x3c, 0x0, 0x0, 0x7e, 0x0, 0x0, 0xe7, 0x0, 0x1, 0x81, 0x80, 0x1, 0x0, 0x80, 0x0, 0x0, 0x0, 0xff, 0x81, 0xfc, 0x3e, 0x0, 0x70, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x60, 0x1e, 0x0, 0x60, 0xe, 0x0, 0x40, 0xf, 0x0, 0xc0, 0x7, 0xc3, 0x80, 0x1, 0xfe, 0x0} +#define NXFONT_BITMAP_219 {0x0, 0x18, 0x0, 0x0, 0x3c, 0x0, 0x0, 0x7e, 0x0, 0x0, 0xe7, 0x0, 0x1, 0x81, 0x80, 0x1, 0x0, 0x80, 0x0, 0x0, 0x0, 0xff, 0x81, 0xfc, 0x3e, 0x0, 0x70, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0,\ + 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x20,\ + 0x1c, 0x0, 0x20, 0x1c, 0x0, 0x60, 0x1e, 0x0, 0x60, 0xe, 0x0, 0x40, 0xf, 0x0, 0xc0, 0x7, 0xc3, 0x80, 0x1, 0xfe, 0x0} /* Udieresis (220) */ #define NXFONT_METRICS_220 {3, 22, 28, 1, 9, 0} @@ -832,13 +863,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_serif38x49b.h b/libs/libnx/nxfonts/nxfonts_serif38x49b.h index c163b144d0..10ea13e76c 100644 --- a/libs/libnx/nxfonts/nxfonts_serif38x49b.h +++ b/libs/libnx/nxfonts/nxfonts_serif38x49b.h @@ -191,7 +191,10 @@ /* at (64) */ #define NXFONT_METRICS_64 {4, 26, 27, 2, 15, 0} -#define NXFONT_BITMAP_64 {0x0, 0x1f, 0xe0, 0x0, 0x0, 0xfc, 0x3c, 0x0, 0x3, 0xe0, 0xe, 0x0, 0x7, 0x80, 0x3, 0x0, 0xf, 0x0, 0x1, 0x0, 0x1e, 0x0, 0x1, 0x80, 0x3e, 0xf, 0x38, 0x80, 0x3c, 0x1f, 0xf8, 0xc0, 0x7c, 0x7c, 0xf8, 0x40, 0x78, 0x78, 0x78, 0x40, 0xf8, 0xf8, 0xf0, 0x40, 0xf8, 0xf0, 0xf0, 0x40, 0xf1, 0xf0, 0xf0, 0x40, 0xf1, 0xf0, 0xf0, 0x40, 0xf1, 0xe0, 0xf0, 0xc0, 0xf1, 0xe1, 0xe0, 0x80, 0xf1, 0xe1, 0xe1, 0x80, 0xf1, 0xe3, 0xe3, 0x0, 0x71, 0xf3, 0xe3, 0x0, 0x78, 0xfe, 0xfe, 0x0, 0x78, 0x78, 0x78, 0x0, 0x3c, 0x0, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x0, 0xe, 0x0, 0x1, 0x80, 0x7, 0x80, 0x7, 0x0, 0x1, 0xe0, 0x3c, 0x0, 0x0, 0x3f, 0xe0, 0x0} +#define NXFONT_BITMAP_64 {0x0, 0x1f, 0xe0, 0x0, 0x0, 0xfc, 0x3c, 0x0, 0x3, 0xe0, 0xe, 0x0, 0x7, 0x80, 0x3, 0x0, 0xf, 0x0, 0x1, 0x0, 0x1e, 0x0, 0x1, 0x80, 0x3e, 0xf, 0x38, 0x80, 0x3c, 0x1f, 0xf8, 0xc0,\ + 0x7c, 0x7c, 0xf8, 0x40, 0x78, 0x78, 0x78, 0x40, 0xf8, 0xf8, 0xf0, 0x40, 0xf8, 0xf0, 0xf0, 0x40, 0xf1, 0xf0, 0xf0, 0x40, 0xf1, 0xf0, 0xf0, 0x40, 0xf1, 0xe0, 0xf0, 0xc0, 0xf1,\ + 0xe1, 0xe0, 0x80, 0xf1, 0xe1, 0xe1, 0x80, 0xf1, 0xe3, 0xe3, 0x0, 0x71, 0xf3, 0xe3, 0x0, 0x78, 0xfe, 0xfe, 0x0, 0x78, 0x78, 0x78, 0x0, 0x3c, 0x0, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x0,\ + 0xe, 0x0, 0x1, 0x80, 0x7, 0x80, 0x7, 0x0, 0x1, 0xe0, 0x3c, 0x0, 0x0, 0x3f, 0xe0, 0x0} /* A (65) */ #define NXFONT_METRICS_65 {3, 21, 23, 1, 14, 0} @@ -243,7 +246,9 @@ /* M (77) */ #define NXFONT_METRICS_77 {4, 28, 23, 1, 14, 0} -#define NXFONT_BITMAP_77 {0xff, 0x0, 0xf, 0xf0, 0x3f, 0x0, 0x1f, 0xc0, 0x1f, 0x80, 0x1f, 0x80, 0x1f, 0x80, 0x3f, 0x80, 0x17, 0xc0, 0x3f, 0x80, 0x17, 0xc0, 0x2f, 0x80, 0x17, 0xc0, 0x6f, 0x80, 0x13, 0xe0, 0x4f, 0x80, 0x13, 0xe0, 0xcf, 0x80, 0x13, 0xe0, 0xcf, 0x80, 0x11, 0xf0, 0x8f, 0x80, 0x11, 0xf1, 0x8f, 0x80, 0x10, 0xf9, 0xf, 0x80, 0x10, 0xfb, 0xf, 0x80, 0x10, 0xfb, 0xf, 0x80, 0x10, 0x7e, 0xf, 0x80, 0x10, 0x7e, 0xf, 0x80, 0x10, 0x7c, 0xf, 0x80, 0x10, 0x3c, 0xf, 0x80, 0x10, 0x3c, 0xf, 0x80, 0x10, 0x18, 0xf, 0x80, 0x38, 0x18, 0x1f, 0xc0, 0xfe, 0x18, 0x3f, 0xf0} +#define NXFONT_BITMAP_77 {0xff, 0x0, 0xf, 0xf0, 0x3f, 0x0, 0x1f, 0xc0, 0x1f, 0x80, 0x1f, 0x80, 0x1f, 0x80, 0x3f, 0x80, 0x17, 0xc0, 0x3f, 0x80, 0x17, 0xc0, 0x2f, 0x80, 0x17, 0xc0, 0x6f, 0x80, 0x13, 0xe0,\ + 0x4f, 0x80, 0x13, 0xe0, 0xcf, 0x80, 0x13, 0xe0, 0xcf, 0x80, 0x11, 0xf0, 0x8f, 0x80, 0x11, 0xf1, 0x8f, 0x80, 0x10, 0xf9, 0xf, 0x80, 0x10, 0xfb, 0xf, 0x80, 0x10, 0xfb, 0xf, 0x80,\ + 0x10, 0x7e, 0xf, 0x80, 0x10, 0x7e, 0xf, 0x80, 0x10, 0x7c, 0xf, 0x80, 0x10, 0x3c, 0xf, 0x80, 0x10, 0x3c, 0xf, 0x80, 0x10, 0x18, 0xf, 0x80, 0x38, 0x18, 0x1f, 0xc0, 0xfe, 0x18, 0x3f, 0xf0} /* N (78) */ #define NXFONT_METRICS_78 {3, 22, 23, 1, 14, 0} @@ -283,7 +288,9 @@ /* W (87) */ #define NXFONT_METRICS_87 {4, 32, 23, 0, 14, 0} -#define NXFONT_BITMAP_87 {0xff, 0xef, 0xff, 0x3f, 0x7f, 0x3, 0xf8, 0xe, 0x3f, 0x1, 0xf8, 0xc, 0x1f, 0x1, 0xf8, 0xc, 0x1f, 0x1, 0xf8, 0x8, 0x1f, 0x81, 0xfc, 0x18, 0xf, 0x81, 0xfc, 0x18, 0xf, 0x81, 0x7c, 0x10, 0xf, 0xc3, 0x7c, 0x30, 0x7, 0xc2, 0x7e, 0x30, 0x7, 0xc6, 0x3e, 0x20, 0x7, 0xe6, 0x3e, 0x60, 0x3, 0xe4, 0x3e, 0x60, 0x3, 0xec, 0x1f, 0x40, 0x3, 0xf8, 0x1f, 0xc0, 0x1, 0xf8, 0x1f, 0xc0, 0x1, 0xf8, 0xf, 0x80, 0x1, 0xf0, 0xf, 0x80, 0x0, 0xf0, 0xf, 0x80, 0x0, 0xe0, 0x7, 0x0, 0x0, 0xe0, 0x7, 0x0, 0x0, 0xe0, 0x7, 0x0, 0x0, 0x40, 0x2, 0x0} +#define NXFONT_BITMAP_87 {0xff, 0xef, 0xff, 0x3f, 0x7f, 0x3, 0xf8, 0xe, 0x3f, 0x1, 0xf8, 0xc, 0x1f, 0x1, 0xf8, 0xc, 0x1f, 0x1, 0xf8, 0x8, 0x1f, 0x81, 0xfc, 0x18, 0xf, 0x81, 0xfc, 0x18, 0xf, 0x81, 0x7c, 0x10,\ + 0xf, 0xc3, 0x7c, 0x30, 0x7, 0xc2, 0x7e, 0x30, 0x7, 0xc6, 0x3e, 0x20, 0x7, 0xe6, 0x3e, 0x60, 0x3, 0xe4, 0x3e, 0x60, 0x3, 0xec, 0x1f, 0x40, 0x3, 0xf8, 0x1f, 0xc0, 0x1, 0xf8, 0x1f, 0xc0,\ + 0x1, 0xf8, 0xf, 0x80, 0x1, 0xf0, 0xf, 0x80, 0x0, 0xf0, 0xf, 0x80, 0x0, 0xe0, 0x7, 0x0, 0x0, 0xe0, 0x7, 0x0, 0x0, 0xe0, 0x7, 0x0, 0x0, 0x40, 0x2, 0x0} /* X (88) */ #define NXFONT_METRICS_88 {3, 21, 23, 1, 14, 0} @@ -567,7 +574,9 @@ /* Agrave (192) */ #define NXFONT_METRICS_192 {3, 21, 30, 1, 7, 0} -#define NXFONT_BITMAP_192 {0x6, 0x0, 0x0, 0x7, 0x0, 0x0, 0x3, 0x80, 0x0, 0x1, 0xc0, 0x0, 0x0, 0x60, 0x0, 0x0, 0x0, 0x0, 0x0, 0x20, 0x0, 0x0, 0x20, 0x0, 0x0, 0x60, 0x0, 0x0, 0x70, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x1, 0x7c, 0x0, 0x1, 0x7c, 0x0, 0x3, 0x3e, 0x0, 0x2, 0x3e, 0x0, 0x6, 0x3e, 0x0, 0x6, 0x1f, 0x0, 0x4, 0x1f, 0x0, 0xc, 0xf, 0x0, 0xf, 0xff, 0x80, 0x18, 0xf, 0x80, 0x18, 0x7, 0xc0, 0x10, 0x7, 0xc0, 0x30, 0x3, 0xe0, 0x30, 0x3, 0xe0, 0x70, 0x7, 0xf0, 0xfc, 0x1f, 0xf8} +#define NXFONT_BITMAP_192 {0x6, 0x0, 0x0, 0x7, 0x0, 0x0, 0x3, 0x80, 0x0, 0x1, 0xc0, 0x0, 0x0, 0x60, 0x0, 0x0, 0x0, 0x0, 0x0, 0x20, 0x0, 0x0, 0x20, 0x0, 0x0, 0x60, 0x0, 0x0, 0x70, 0x0, 0x0, 0xf0, 0x0, 0x0,\ + 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x1, 0x7c, 0x0, 0x1, 0x7c, 0x0, 0x3, 0x3e, 0x0, 0x2, 0x3e, 0x0, 0x6, 0x3e, 0x0, 0x6, 0x1f, 0x0, 0x4, 0x1f, 0x0, 0xc, 0xf, 0x0, 0xf, 0xff,\ + 0x80, 0x18, 0xf, 0x80, 0x18, 0x7, 0xc0, 0x10, 0x7, 0xc0, 0x30, 0x3, 0xe0, 0x30, 0x3, 0xe0, 0x70, 0x7, 0xf0, 0xfc, 0x1f, 0xf8} /* Aacute (193) */ #define NXFONT_METRICS_193 {3, 21, 30, 1, 7, 0} @@ -575,7 +584,9 @@ /* Acircumflex (194) */ #define NXFONT_METRICS_194 {3, 21, 30, 1, 7, 0} -#define NXFONT_BITMAP_194 {0x0, 0x60, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xf8, 0x0, 0x1, 0x98, 0x0, 0x3, 0xc, 0x0, 0x2, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x20, 0x0, 0x0, 0x60, 0x0, 0x0, 0x70, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x1, 0x7c, 0x0, 0x1, 0x7c, 0x0, 0x3, 0x3e, 0x0, 0x2, 0x3e, 0x0, 0x6, 0x3e, 0x0, 0x6, 0x1f, 0x0, 0x4, 0x1f, 0x0, 0xc, 0xf, 0x0, 0xf, 0xff, 0x80, 0x18, 0xf, 0x80, 0x18, 0x7, 0xc0, 0x10, 0x7, 0xc0, 0x30, 0x3, 0xe0, 0x30, 0x3, 0xe0, 0x70, 0x7, 0xf0, 0xfc, 0x1f, 0xf8} +#define NXFONT_BITMAP_194 {0x0, 0x60, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xf8, 0x0, 0x1, 0x98, 0x0, 0x3, 0xc, 0x0, 0x2, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x20, 0x0, 0x0, 0x60, 0x0, 0x0, 0x70, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf8,\ + 0x0, 0x0, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x1, 0x7c, 0x0, 0x1, 0x7c, 0x0, 0x3, 0x3e, 0x0, 0x2, 0x3e, 0x0, 0x6, 0x3e, 0x0, 0x6, 0x1f, 0x0, 0x4, 0x1f, 0x0, 0xc, 0xf, 0x0, 0xf, 0xff, 0x80, 0x18,\ + 0xf, 0x80, 0x18, 0x7, 0xc0, 0x10, 0x7, 0xc0, 0x30, 0x3, 0xe0, 0x30, 0x3, 0xe0, 0x70, 0x7, 0xf0, 0xfc, 0x1f, 0xf8} /* Atilde (195) */ #define NXFONT_METRICS_195 {3, 21, 29, 1, 8, 0} @@ -587,27 +598,39 @@ /* Aring (197) */ #define NXFONT_METRICS_197 {3, 21, 30, 1, 7, 0} -#define NXFONT_BITMAP_197 {0x0, 0xe0, 0x0, 0x1, 0xb0, 0x0, 0x3, 0x18, 0x0, 0x2, 0x8, 0x0, 0x3, 0x18, 0x0, 0x1, 0xb0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x60, 0x0, 0x0, 0x70, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x1, 0x7c, 0x0, 0x1, 0x7c, 0x0, 0x3, 0x3e, 0x0, 0x2, 0x3e, 0x0, 0x6, 0x3e, 0x0, 0x6, 0x1f, 0x0, 0x4, 0x1f, 0x0, 0xc, 0xf, 0x0, 0xf, 0xff, 0x80, 0x18, 0xf, 0x80, 0x18, 0x7, 0xc0, 0x10, 0x7, 0xc0, 0x30, 0x3, 0xe0, 0x30, 0x3, 0xe0, 0x70, 0x7, 0xf0, 0xfc, 0x1f, 0xf8} +#define NXFONT_BITMAP_197 {0x0, 0xe0, 0x0, 0x1, 0xb0, 0x0, 0x3, 0x18, 0x0, 0x2, 0x8, 0x0, 0x3, 0x18, 0x0, 0x1, 0xb0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x60, 0x0, 0x0, 0x70, 0x0, 0x0, 0xf0, 0x0, 0x0, 0xf8, 0x0,\ + 0x0, 0xf8, 0x0, 0x1, 0xf8, 0x0, 0x1, 0x7c, 0x0, 0x1, 0x7c, 0x0, 0x3, 0x3e, 0x0, 0x2, 0x3e, 0x0, 0x6, 0x3e, 0x0, 0x6, 0x1f, 0x0, 0x4, 0x1f, 0x0, 0xc, 0xf, 0x0, 0xf, 0xff, 0x80, 0x18, 0xf,\ + 0x80, 0x18, 0x7, 0xc0, 0x10, 0x7, 0xc0, 0x30, 0x3, 0xe0, 0x30, 0x3, 0xe0, 0x70, 0x7, 0xf0, 0xfc, 0x1f, 0xf8} /* AE (198) */ #define NXFONT_METRICS_198 {4, 32, 23, 0, 14, 0} -#define NXFONT_BITMAP_198 {0x3, 0xff, 0xff, 0xfc, 0x0, 0xff, 0xff, 0xfc, 0x0, 0x63, 0xe0, 0x1c, 0x0, 0x63, 0xe0, 0xc, 0x0, 0xc3, 0xe0, 0xc, 0x0, 0xc3, 0xe0, 0x4, 0x1, 0x83, 0xe0, 0x4, 0x1, 0x83, 0xe0, 0x80, 0x3, 0x3, 0xe0, 0x80, 0x3, 0x3, 0xe1, 0x80, 0x2, 0x3, 0xe3, 0x80, 0x7, 0xff, 0xff, 0x80, 0x7, 0xff, 0xe3, 0x80, 0xc, 0x3, 0xe1, 0x80, 0xc, 0x3, 0xe0, 0x80, 0x18, 0x3, 0xe0, 0x80, 0x18, 0x3, 0xe0, 0x1, 0x38, 0x3, 0xe0, 0x3, 0x30, 0x3, 0xe0, 0x6, 0x70, 0x3, 0xe0, 0xe, 0x70, 0x3, 0xe0, 0x3e, 0xf8, 0x7, 0xff, 0xfc, 0xfe, 0x1f, 0xff, 0xfc} +#define NXFONT_BITMAP_198 {0x3, 0xff, 0xff, 0xfc, 0x0, 0xff, 0xff, 0xfc, 0x0, 0x63, 0xe0, 0x1c, 0x0, 0x63, 0xe0, 0xc, 0x0, 0xc3, 0xe0, 0xc, 0x0, 0xc3, 0xe0, 0x4, 0x1, 0x83, 0xe0, 0x4, 0x1, 0x83, 0xe0, 0x80, 0x3, 0x3,\ + 0xe0, 0x80, 0x3, 0x3, 0xe1, 0x80, 0x2, 0x3, 0xe3, 0x80, 0x7, 0xff, 0xff, 0x80, 0x7, 0xff, 0xe3, 0x80, 0xc, 0x3, 0xe1, 0x80, 0xc, 0x3, 0xe0, 0x80, 0x18, 0x3, 0xe0, 0x80, 0x18, 0x3, 0xe0, 0x1,\ + 0x38, 0x3, 0xe0, 0x3, 0x30, 0x3, 0xe0, 0x6, 0x70, 0x3, 0xe0, 0xe, 0x70, 0x3, 0xe0, 0x3e, 0xf8, 0x7, 0xff, 0xfc, 0xfe, 0x1f, 0xff, 0xfc} /* Ccedilla (199) */ #define NXFONT_METRICS_199 {3, 19, 30, 2, 14, 0} -#define NXFONT_BITMAP_199 {0x1, 0xfc, 0x20, 0x7, 0xff, 0x60, 0xf, 0x7, 0xe0, 0x1e, 0x1, 0xe0, 0x3c, 0x0, 0xe0, 0x7c, 0x0, 0x60, 0x7c, 0x0, 0x60, 0xf8, 0x0, 0x20, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0x7c, 0x0, 0x0, 0x7c, 0x0, 0x0, 0x3c, 0x0, 0x20, 0x1e, 0x0, 0x60, 0xf, 0x81, 0xc0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0, 0x0, 0x18, 0x0, 0x0, 0x30, 0x0, 0x0, 0x70, 0x0, 0x0, 0x38, 0x0, 0x3, 0x18, 0x0, 0x3, 0xb8, 0x0, 0x1, 0xf0, 0x0} +#define NXFONT_BITMAP_199 {0x1, 0xfc, 0x20, 0x7, 0xff, 0x60, 0xf, 0x7, 0xe0, 0x1e, 0x1, 0xe0, 0x3c, 0x0, 0xe0, 0x7c, 0x0, 0x60, 0x7c, 0x0, 0x60, 0xf8, 0x0, 0x20, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8,\ + 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0x7c, 0x0, 0x0, 0x7c, 0x0, 0x0, 0x3c, 0x0, 0x20, 0x1e, 0x0, 0x60, 0xf, 0x81, 0xc0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0,\ + 0x0, 0x18, 0x0, 0x0, 0x30, 0x0, 0x0, 0x70, 0x0, 0x0, 0x38, 0x0, 0x3, 0x18, 0x0, 0x3, 0xb8, 0x0, 0x1, 0xf0, 0x0} /* Egrave (200) */ #define NXFONT_METRICS_200 {3, 21, 30, 0, 7, 0} -#define NXFONT_BITMAP_200 {0x6, 0x0, 0x0, 0x7, 0x0, 0x0, 0x3, 0x80, 0x0, 0x1, 0xc0, 0x0, 0x0, 0x60, 0x0, 0x0, 0x30, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xe0, 0x1f, 0x0, 0xe0, 0x1f, 0x0, 0x60, 0x1f, 0x0, 0x60, 0x1f, 0x0, 0x20, 0x1f, 0x0, 0x20, 0x1f, 0x4, 0x0, 0x1f, 0x4, 0x0, 0x1f, 0xc, 0x0, 0x1f, 0x1c, 0x0, 0x1f, 0xfc, 0x0, 0x1f, 0x1c, 0x0, 0x1f, 0xc, 0x0, 0x1f, 0x4, 0x0, 0x1f, 0x4, 0x0, 0x1f, 0x0, 0x8, 0x1f, 0x0, 0x18, 0x1f, 0x0, 0x30, 0x1f, 0x0, 0x70, 0x1f, 0x1, 0xf0, 0x3f, 0xff, 0xe0, 0xff, 0xff, 0xe0} +#define NXFONT_BITMAP_200 {0x6, 0x0, 0x0, 0x7, 0x0, 0x0, 0x3, 0x80, 0x0, 0x1, 0xc0, 0x0, 0x0, 0x60, 0x0, 0x0, 0x30, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xe0, 0x1f, 0x0, 0xe0, 0x1f, 0x0, 0x60, 0x1f, 0x0,\ + 0x60, 0x1f, 0x0, 0x20, 0x1f, 0x0, 0x20, 0x1f, 0x4, 0x0, 0x1f, 0x4, 0x0, 0x1f, 0xc, 0x0, 0x1f, 0x1c, 0x0, 0x1f, 0xfc, 0x0, 0x1f, 0x1c, 0x0, 0x1f, 0xc, 0x0, 0x1f, 0x4, 0x0, 0x1f, 0x4, 0x0,\ + 0x1f, 0x0, 0x8, 0x1f, 0x0, 0x18, 0x1f, 0x0, 0x30, 0x1f, 0x0, 0x70, 0x1f, 0x1, 0xf0, 0x3f, 0xff, 0xe0, 0xff, 0xff, 0xe0} /* Eacute (201) */ #define NXFONT_METRICS_201 {3, 21, 30, 0, 7, 0} -#define NXFONT_BITMAP_201 {0x0, 0x1, 0x80, 0x0, 0x3, 0x80, 0x0, 0x7, 0x0, 0x0, 0xe, 0x0, 0x0, 0x18, 0x0, 0x0, 0x30, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xe0, 0x1f, 0x0, 0xe0, 0x1f, 0x0, 0x60, 0x1f, 0x0, 0x60, 0x1f, 0x0, 0x20, 0x1f, 0x0, 0x20, 0x1f, 0x4, 0x0, 0x1f, 0x4, 0x0, 0x1f, 0xc, 0x0, 0x1f, 0x1c, 0x0, 0x1f, 0xfc, 0x0, 0x1f, 0x1c, 0x0, 0x1f, 0xc, 0x0, 0x1f, 0x4, 0x0, 0x1f, 0x4, 0x0, 0x1f, 0x0, 0x8, 0x1f, 0x0, 0x18, 0x1f, 0x0, 0x30, 0x1f, 0x0, 0x70, 0x1f, 0x1, 0xf0, 0x3f, 0xff, 0xe0, 0xff, 0xff, 0xe0} +#define NXFONT_BITMAP_201 {0x0, 0x1, 0x80, 0x0, 0x3, 0x80, 0x0, 0x7, 0x0, 0x0, 0xe, 0x0, 0x0, 0x18, 0x0, 0x0, 0x30, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xe0, 0x1f, 0x0, 0xe0, 0x1f, 0x0, 0x60, 0x1f, 0x0,\ + 0x60, 0x1f, 0x0, 0x20, 0x1f, 0x0, 0x20, 0x1f, 0x4, 0x0, 0x1f, 0x4, 0x0, 0x1f, 0xc, 0x0, 0x1f, 0x1c, 0x0, 0x1f, 0xfc, 0x0, 0x1f, 0x1c, 0x0, 0x1f, 0xc, 0x0, 0x1f, 0x4, 0x0, 0x1f, 0x4, 0x0,\ + 0x1f, 0x0, 0x8, 0x1f, 0x0, 0x18, 0x1f, 0x0, 0x30, 0x1f, 0x0, 0x70, 0x1f, 0x1, 0xf0, 0x3f, 0xff, 0xe0, 0xff, 0xff, 0xe0} /* Ecircumflex (202) */ #define NXFONT_METRICS_202 {3, 21, 30, 0, 7, 0} -#define NXFONT_BITMAP_202 {0x0, 0x30, 0x0, 0x0, 0x78, 0x0, 0x0, 0xfc, 0x0, 0x0, 0xcc, 0x0, 0x1, 0x86, 0x0, 0x1, 0x2, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xe0, 0x1f, 0x0, 0xe0, 0x1f, 0x0, 0x60, 0x1f, 0x0, 0x60, 0x1f, 0x0, 0x20, 0x1f, 0x0, 0x20, 0x1f, 0x4, 0x0, 0x1f, 0x4, 0x0, 0x1f, 0xc, 0x0, 0x1f, 0x1c, 0x0, 0x1f, 0xfc, 0x0, 0x1f, 0x1c, 0x0, 0x1f, 0xc, 0x0, 0x1f, 0x4, 0x0, 0x1f, 0x4, 0x0, 0x1f, 0x0, 0x8, 0x1f, 0x0, 0x18, 0x1f, 0x0, 0x30, 0x1f, 0x0, 0x70, 0x1f, 0x1, 0xf0, 0x3f, 0xff, 0xe0, 0xff, 0xff, 0xe0} +#define NXFONT_BITMAP_202 {0x0, 0x30, 0x0, 0x0, 0x78, 0x0, 0x0, 0xfc, 0x0, 0x0, 0xcc, 0x0, 0x1, 0x86, 0x0, 0x1, 0x2, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xe0, 0x1f, 0x0, 0xe0, 0x1f, 0x0, 0x60, 0x1f, 0x0,\ + 0x60, 0x1f, 0x0, 0x20, 0x1f, 0x0, 0x20, 0x1f, 0x4, 0x0, 0x1f, 0x4, 0x0, 0x1f, 0xc, 0x0, 0x1f, 0x1c, 0x0, 0x1f, 0xfc, 0x0, 0x1f, 0x1c, 0x0, 0x1f, 0xc, 0x0, 0x1f, 0x4, 0x0, 0x1f, 0x4, 0x0, 0x1f,\ + 0x0, 0x8, 0x1f, 0x0, 0x18, 0x1f, 0x0, 0x30, 0x1f, 0x0, 0x70, 0x1f, 0x1, 0xf0, 0x3f, 0xff, 0xe0, 0xff, 0xff, 0xe0} /* Edieresis (203) */ #define NXFONT_METRICS_203 {3, 21, 29, 0, 8, 0} @@ -635,19 +658,27 @@ /* Ntilde (209) */ #define NXFONT_METRICS_209 {3, 22, 29, 1, 8, 0} -#define NXFONT_BITMAP_209 {0x0, 0x61, 0x0, 0x0, 0xfb, 0x0, 0x1, 0xbe, 0x0, 0x1, 0xc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x1, 0xfc, 0x7f, 0x0, 0x70, 0x3f, 0x80, 0x20, 0x1f, 0x80, 0x20, 0x1f, 0xc0, 0x20, 0x1f, 0xe0, 0x20, 0x17, 0xf0, 0x20, 0x13, 0xf8, 0x20, 0x11, 0xf8, 0x20, 0x11, 0xfc, 0x20, 0x10, 0xfe, 0x20, 0x10, 0x7f, 0x20, 0x10, 0x3f, 0x20, 0x10, 0x1f, 0xa0, 0x10, 0x1f, 0xe0, 0x10, 0xf, 0xe0, 0x10, 0x7, 0xe0, 0x10, 0x3, 0xe0, 0x10, 0x3, 0xe0, 0x10, 0x1, 0xe0, 0x10, 0x0, 0xe0, 0x38, 0x0, 0x60, 0xfe, 0x0, 0x20} +#define NXFONT_BITMAP_209 {0x0, 0x61, 0x0, 0x0, 0xfb, 0x0, 0x1, 0xbe, 0x0, 0x1, 0xc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x1, 0xfc, 0x7f, 0x0, 0x70, 0x3f, 0x80, 0x20, 0x1f, 0x80, 0x20, 0x1f, 0xc0, 0x20, 0x1f, 0xe0,\ + 0x20, 0x17, 0xf0, 0x20, 0x13, 0xf8, 0x20, 0x11, 0xf8, 0x20, 0x11, 0xfc, 0x20, 0x10, 0xfe, 0x20, 0x10, 0x7f, 0x20, 0x10, 0x3f, 0x20, 0x10, 0x1f, 0xa0, 0x10, 0x1f, 0xe0, 0x10, 0xf, 0xe0, 0x10,\ + 0x7, 0xe0, 0x10, 0x3, 0xe0, 0x10, 0x3, 0xe0, 0x10, 0x1, 0xe0, 0x10, 0x0, 0xe0, 0x38, 0x0, 0x60, 0xfe, 0x0, 0x20} /* Ograve (210) */ #define NXFONT_METRICS_210 {3, 21, 30, 2, 7, 0} -#define NXFONT_BITMAP_210 {0x6, 0x0, 0x0, 0x7, 0x0, 0x0, 0x3, 0x80, 0x0, 0x1, 0xc0, 0x0, 0x0, 0x60, 0x0, 0x0, 0x30, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x7, 0xff, 0x0, 0xf, 0x8f, 0x80, 0x1e, 0x3, 0xc0, 0x3c, 0x1, 0xe0, 0x7c, 0x1, 0xf0, 0x78, 0x0, 0xf0, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0x78, 0x0, 0xf0, 0x7c, 0x1, 0xf0, 0x3c, 0x1, 0xe0, 0x1e, 0x3, 0xc0, 0xf, 0x8f, 0x80, 0x7, 0xff, 0x0, 0x1, 0xfc, 0x0} +#define NXFONT_BITMAP_210 {0x6, 0x0, 0x0, 0x7, 0x0, 0x0, 0x3, 0x80, 0x0, 0x1, 0xc0, 0x0, 0x0, 0x60, 0x0, 0x0, 0x30, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x7, 0xff, 0x0, 0xf, 0x8f, 0x80, 0x1e, 0x3, 0xc0, 0x3c, 0x1, 0xe0, 0x7c,\ + 0x1, 0xf0, 0x78, 0x0, 0xf0, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0x78, 0x0, 0xf0,\ + 0x7c, 0x1, 0xf0, 0x3c, 0x1, 0xe0, 0x1e, 0x3, 0xc0, 0xf, 0x8f, 0x80, 0x7, 0xff, 0x0, 0x1, 0xfc, 0x0} /* Oacute (211) */ #define NXFONT_METRICS_211 {3, 21, 30, 2, 7, 0} -#define NXFONT_BITMAP_211 {0x0, 0x3, 0x80, 0x0, 0x7, 0x0, 0x0, 0xe, 0x0, 0x0, 0x18, 0x0, 0x0, 0x30, 0x0, 0x0, 0x60, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x7, 0xff, 0x0, 0xf, 0x8f, 0x80, 0x1e, 0x3, 0xc0, 0x3c, 0x1, 0xe0, 0x7c, 0x1, 0xf0, 0x78, 0x0, 0xf0, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0x78, 0x0, 0xf0, 0x7c, 0x1, 0xf0, 0x3c, 0x1, 0xe0, 0x1e, 0x3, 0xc0, 0xf, 0x8f, 0x80, 0x7, 0xff, 0x0, 0x1, 0xfc, 0x0} +#define NXFONT_BITMAP_211 {0x0, 0x3, 0x80, 0x0, 0x7, 0x0, 0x0, 0xe, 0x0, 0x0, 0x18, 0x0, 0x0, 0x30, 0x0, 0x0, 0x60, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x7, 0xff, 0x0, 0xf, 0x8f, 0x80, 0x1e, 0x3, 0xc0, 0x3c, 0x1, 0xe0, 0x7c,\ + 0x1, 0xf0, 0x78, 0x0, 0xf0, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0x78, 0x0, 0xf0,\ + 0x7c, 0x1, 0xf0, 0x3c, 0x1, 0xe0, 0x1e, 0x3, 0xc0, 0xf, 0x8f, 0x80, 0x7, 0xff, 0x0, 0x1, 0xfc, 0x0} /* Ocircumflex (212) */ #define NXFONT_METRICS_212 {3, 21, 30, 2, 7, 0} -#define NXFONT_BITMAP_212 {0x0, 0x30, 0x0, 0x0, 0x78, 0x0, 0x0, 0xfc, 0x0, 0x0, 0xcc, 0x0, 0x1, 0x86, 0x0, 0x1, 0x2, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x7, 0xff, 0x0, 0xf, 0x8f, 0x80, 0x1e, 0x3, 0xc0, 0x3c, 0x1, 0xe0, 0x7c, 0x1, 0xf0, 0x78, 0x0, 0xf0, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0x78, 0x0, 0xf0, 0x7c, 0x1, 0xf0, 0x3c, 0x1, 0xe0, 0x1e, 0x3, 0xc0, 0xf, 0x8f, 0x80, 0x7, 0xff, 0x0, 0x1, 0xfc, 0x0} +#define NXFONT_BITMAP_212 {0x0, 0x30, 0x0, 0x0, 0x78, 0x0, 0x0, 0xfc, 0x0, 0x0, 0xcc, 0x0, 0x1, 0x86, 0x0, 0x1, 0x2, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x7, 0xff, 0x0, 0xf, 0x8f, 0x80, 0x1e, 0x3, 0xc0, 0x3c, 0x1, 0xe0, 0x7c,\ + 0x1, 0xf0, 0x78, 0x0, 0xf0, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0xf8, 0x0, 0xf8, 0x78, 0x0, 0xf0,\ + 0x7c, 0x1, 0xf0, 0x3c, 0x1, 0xe0, 0x1e, 0x3, 0xc0, 0xf, 0x8f, 0x80, 0x7, 0xff, 0x0, 0x1, 0xfc, 0x0} /* Otilde (213) */ #define NXFONT_METRICS_213 {3, 21, 29, 2, 8, 0} @@ -667,23 +698,33 @@ /* Ugrave (217) */ #define NXFONT_METRICS_217 {3, 23, 30, 0, 7, 0} -#define NXFONT_BITMAP_217 {0x0, 0xc0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0x70, 0x0, 0x0, 0x38, 0x0, 0x0, 0xc, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0xfe, 0x3f, 0x80, 0x38, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x30, 0xf, 0x80, 0x30, 0xf, 0x80, 0x60, 0x7, 0xc0, 0xc0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0} +#define NXFONT_BITMAP_217 {0x0, 0xc0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0x70, 0x0, 0x0, 0x38, 0x0, 0x0, 0xc, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0xfe, 0x3f, 0x80, 0x38, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f,\ + 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10,\ + 0x1f, 0x0, 0x30, 0xf, 0x80, 0x30, 0xf, 0x80, 0x60, 0x7, 0xc0, 0xc0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0} /* Uacute (218) */ #define NXFONT_METRICS_218 {3, 23, 30, 0, 7, 0} -#define NXFONT_BITMAP_218 {0x0, 0x0, 0xc0, 0x0, 0x1, 0xc0, 0x0, 0x3, 0x80, 0x0, 0x7, 0x0, 0x0, 0xc, 0x0, 0x0, 0x10, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0xfe, 0x3f, 0x80, 0x38, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x30, 0xf, 0x80, 0x30, 0xf, 0x80, 0x60, 0x7, 0xc0, 0xc0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0} +#define NXFONT_BITMAP_218 {0x0, 0x0, 0xc0, 0x0, 0x1, 0xc0, 0x0, 0x3, 0x80, 0x0, 0x7, 0x0, 0x0, 0xc, 0x0, 0x0, 0x10, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0xfe, 0x3f, 0x80, 0x38, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f,\ + 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10,\ + 0x1f, 0x0, 0x30, 0xf, 0x80, 0x30, 0xf, 0x80, 0x60, 0x7, 0xc0, 0xc0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0} /* Ucircumflex (219) */ #define NXFONT_METRICS_219 {3, 23, 30, 0, 7, 0} -#define NXFONT_BITMAP_219 {0x0, 0xc, 0x0, 0x0, 0x1e, 0x0, 0x0, 0x3f, 0x0, 0x0, 0x33, 0x0, 0x0, 0x61, 0x80, 0x0, 0x40, 0x80, 0x0, 0x0, 0x0, 0xff, 0xe0, 0xfe, 0x3f, 0x80, 0x38, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x30, 0xf, 0x80, 0x30, 0xf, 0x80, 0x60, 0x7, 0xc0, 0xc0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0} +#define NXFONT_BITMAP_219 {0x0, 0xc, 0x0, 0x0, 0x1e, 0x0, 0x0, 0x3f, 0x0, 0x0, 0x33, 0x0, 0x0, 0x61, 0x80, 0x0, 0x40, 0x80, 0x0, 0x0, 0x0, 0xff, 0xe0, 0xfe, 0x3f, 0x80, 0x38, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10,\ + 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0,\ + 0x10, 0x1f, 0x0, 0x30, 0xf, 0x80, 0x30, 0xf, 0x80, 0x60, 0x7, 0xc0, 0xc0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0} /* Udieresis (220) */ #define NXFONT_METRICS_220 {3, 23, 29, 0, 8, 0} -#define NXFONT_BITMAP_220 {0x0, 0x21, 0x0, 0x0, 0x73, 0x80, 0x0, 0x73, 0x80, 0x0, 0x21, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0xfe, 0x3f, 0x80, 0x38, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x30, 0xf, 0x80, 0x30, 0xf, 0x80, 0x60, 0x7, 0xc0, 0xc0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0} +#define NXFONT_BITMAP_220 {0x0, 0x21, 0x0, 0x0, 0x73, 0x80, 0x0, 0x73, 0x80, 0x0, 0x21, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0xfe, 0x3f, 0x80, 0x38, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10,\ + 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0, 0x10, 0x1f, 0x0,\ + 0x30, 0xf, 0x80, 0x30, 0xf, 0x80, 0x60, 0x7, 0xc0, 0xc0, 0x3, 0xff, 0x80, 0x0, 0xfe, 0x0} /* Yacute (221) */ #define NXFONT_METRICS_221 {3, 22, 30, 1, 7, 0} -#define NXFONT_BITMAP_221 {0x0, 0x0, 0xc0, 0x0, 0x1, 0xc0, 0x0, 0x3, 0x80, 0x0, 0x7, 0x0, 0x0, 0xc, 0x0, 0x0, 0x10, 0x0, 0x0, 0x0, 0x0, 0xff, 0xc3, 0xfc, 0x7f, 0x0, 0xf0, 0x3f, 0x0, 0x60, 0x3f, 0x0, 0x60, 0x1f, 0x80, 0xc0, 0x1f, 0x80, 0x80, 0xf, 0xc1, 0x80, 0xf, 0xc3, 0x0, 0x7, 0xe3, 0x0, 0x3, 0xe6, 0x0, 0x3, 0xf4, 0x0, 0x1, 0xfc, 0x0, 0x1, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x1, 0xfc, 0x0, 0x7, 0xff, 0x0} +#define NXFONT_BITMAP_221 {0x0, 0x0, 0xc0, 0x0, 0x1, 0xc0, 0x0, 0x3, 0x80, 0x0, 0x7, 0x0, 0x0, 0xc, 0x0, 0x0, 0x10, 0x0, 0x0, 0x0, 0x0, 0xff, 0xc3, 0xfc, 0x7f, 0x0, 0xf0, 0x3f, 0x0, 0x60, 0x3f, 0x0, 0x60, 0x1f, 0x80, 0xc0, 0x1f,\ + 0x80, 0x80, 0xf, 0xc1, 0x80, 0xf, 0xc3, 0x0, 0x7, 0xe3, 0x0, 0x3, 0xe6, 0x0, 0x3, 0xf4, 0x0, 0x1, 0xfc, 0x0, 0x1, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8,\ + 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x0, 0xf8, 0x0, 0x1, 0xfc, 0x0, 0x7, 0xff, 0x0} /* Thorn (222) */ #define NXFONT_METRICS_222 {3, 19, 23, 0, 14, 0} @@ -832,13 +873,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-10x20.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-10x20.h index 98933c0e77..9204c2dae3 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-10x20.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-10x20.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-4x6.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-4x6.h index 6fe29efdc3..0d118d7248 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-4x6.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-4x6.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x7.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x7.h index de6e033223..3490144175 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x7.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x7.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x8.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x8.h index 2393a5bf39..e8a8dbe417 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x8.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x8.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x10.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x10.h index d90a244000..d50b297392 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x10.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x10.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x12.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x12.h index 964975bcf9..ca361f9ea0 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x12.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x12.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13.h index b8f807e682..7329dccf8d 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13b.h index d21ec62693..fa2f22e392 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13b.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13o.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13o.h index 9253a8cb8f..7243b9516d 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13o.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13o.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x9.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x9.h index f1a54b6f26..3ce220a97e 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x9.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x9.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13.h index 8ba5a5ca2a..26c2ad9742 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13b.h index 378ee189fb..c11196df4a 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13b.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13o.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13o.h index 974fd98ccc..f0f1535b98 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13o.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13o.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14.h index 809f8f4333..fcac61e469 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14b.h index 6062c1dfb4..e2e9b039e3 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14b.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13.h index 84d9447885..4c45a2f87a 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13b.h index aeb7676bfc..99ae50c99d 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13b.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13o.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13o.h index 999fb8af8c..f8996156b6 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13o.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13o.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15.h index be1bd262a8..a46147e09f 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15b.h index d5a635e6c7..8e7c02aace 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15b.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18.h index 2ae9e07d89..1349b71693 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18b.h index 7c48f03f5b..ce6f468fd7 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18b.h @@ -832,13 +832,14 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Public Functions + * Public Functions Definitions ****************************************************************************/ #undef EXTERN diff --git a/libs/libnx/nxglib/nxglib_circlepts.c b/libs/libnx/nxglib/nxglib_circlepts.c index 4a2b82420d..c20ebdf96c 100644 --- a/libs/libnx/nxglib/nxglib_circlepts.c +++ b/libs/libnx/nxglib/nxglib_circlepts.c @@ -33,6 +33,7 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ + /* Trigonometry */ #define SIN_0p0 0 /* sin(0) = 0 */ @@ -85,7 +86,8 @@ * ****************************************************************************/ -void nxgl_circlepts(FAR const struct nxgl_point_s *center, nxgl_coord_t radius, +void nxgl_circlepts(FAR const struct nxgl_point_s *center, + nxgl_coord_t radius, FAR struct nxgl_point_s *circle) { nxgl_coord_t xoffs; diff --git a/libs/libnx/nxglib/nxglib_circletraps.c b/libs/libnx/nxglib/nxglib_circletraps.c index 2a96f8ba23..5a548a2bda 100644 --- a/libs/libnx/nxglib/nxglib_circletraps.c +++ b/libs/libnx/nxglib/nxglib_circletraps.c @@ -33,6 +33,7 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ + /* Trigonometry */ #define SIN_0p0 0 /* sin(0) = 0 */ @@ -64,7 +65,8 @@ * ****************************************************************************/ -void nxgl_circletraps(FAR const struct nxgl_point_s *center, nxgl_coord_t radius, +void nxgl_circletraps(FAR const struct nxgl_point_s *center, + nxgl_coord_t radius, FAR struct nxgl_trapezoid_s *circle) { nxgl_coord_t xoffs; diff --git a/libs/libnx/nxglib/nxglib_rectintersect.c b/libs/libnx/nxglib/nxglib_rectintersect.c index b03215d520..47b8eba885 100644 --- a/libs/libnx/nxglib/nxglib_rectintersect.c +++ b/libs/libnx/nxglib/nxglib_rectintersect.c @@ -34,7 +34,7 @@ * Name: nxgl_rectintersect * * Description: - * Return the rectangle representing the intersection of the two rectangles. + * Return the rectangle representing the intersection of the two rectangles. * ****************************************************************************/ diff --git a/libs/libnx/nxglib/nxglib_rgb2yuv.c b/libs/libnx/nxglib/nxglib_rgb2yuv.c index 4c7fd54805..31449e3338 100644 --- a/libs/libnx/nxglib/nxglib_rgb2yuv.c +++ b/libs/libnx/nxglib/nxglib_rgb2yuv.c @@ -66,7 +66,10 @@ void nxgl_rgb2yuv(uint8_t r, uint8_t g, uint8_t b, * V = 128 + (0.5000 * R) - (0.4187 * G) - (0.0813 * B); */ - *y = (uint8_t)b16toi(b16muli(b16_P2990, r) + b16muli(b16_P5870, g) + b16muli(b16_P1140, b)); - *u = (uint8_t)b16toi(b16_128P0 - b16muli(b16_P1687, r) - b16muli(b16_P3313, g) + b16muli(b16_P5000, b)); - *v = (uint8_t)b16toi(b16_128P0 + b16muli(b16_P5000, r) - b16muli(b16_P4187, g) - b16muli(b16_P0813, b)); + *y = (uint8_t)b16toi(b16muli(b16_P2990, r) + + b16muli(b16_P5870, g) + b16muli(b16_P1140, b)); + *u = (uint8_t)b16toi(b16_128P0 - b16muli(b16_P1687, r) - + b16muli(b16_P3313, g) + b16muli(b16_P5000, b)); + *v = (uint8_t)b16toi(b16_128P0 + b16muli(b16_P5000, r) - + b16muli(b16_P4187, g) - b16muli(b16_P0813, b)); } diff --git a/libs/libnx/nxglib/nxglib_rgbblend.c b/libs/libnx/nxglib/nxglib_rgbblend.c index 11f9b5dfc6..dc2ce22f45 100644 --- a/libs/libnx/nxglib/nxglib_rgbblend.c +++ b/libs/libnx/nxglib/nxglib_rgbblend.c @@ -39,7 +39,8 @@ * component1. * * The frac1 value could be though as related to the 1/alpha value for - * component1. However, the background, component2, is always treated as though + * component1. + * However, the background, component2, is always treated as though * alpha == 1. * * This algorithm is used to handle endpoints as part of the @@ -76,7 +77,9 @@ static uint8_t nxglib_blend_component(uint8_t component1, uint8_t component2, (uint32_t)((ub16_t)component2 * (b8ONE - frac1)) + (uint32_t)b8HALF; - /* Now we can snap it down to 16-bits and check for the overflow condition. */ + /* Now we can snap it down to 16-bits and check for the overflow + * condition. + */ blend = ub8toi(blendb8); if (blend > 255) @@ -166,7 +169,7 @@ uint32_t nxglib_rgb24_blend(uint32_t color1, uint32_t color2, ub16_t frac1) /* Recombine and return the blended value */ - return RGBTO24(r,g,b); + return RGBTO24(r, g, b); } #endif @@ -212,7 +215,7 @@ uint16_t nxglib_rgb565_blend(uint16_t color1, uint16_t color2, ub16_t frac1) /* Recombine and return the blended value */ - return RGBTO24(r,g,b); + return RGBTO24(r, g, b); } #endif diff --git a/libs/libnx/nxglib/nxglib_runcopy.c b/libs/libnx/nxglib/nxglib_runcopy.c index 5dccca85e4..4ec0579ad2 100644 --- a/libs/libnx/nxglib/nxglib_runcopy.c +++ b/libs/libnx/nxglib/nxglib_runcopy.c @@ -39,7 +39,8 @@ * ****************************************************************************/ -void nxgl_runcopy(FAR struct nxgl_run_s *dest, FAR const struct nxgl_run_s *src) +void nxgl_runcopy(FAR struct nxgl_run_s *dest, + FAR const struct nxgl_run_s *src) { dest->x1 = src->x1; dest->x2 = src->x2; diff --git a/libs/libnx/nxglib/nxglib_vectsubtract.c b/libs/libnx/nxglib/nxglib_vectsubtract.c index 5ccd088597..1697544643 100644 --- a/libs/libnx/nxglib/nxglib_vectsubtract.c +++ b/libs/libnx/nxglib/nxglib_vectsubtract.c @@ -34,7 +34,8 @@ * Name: nxgl_vectsubtract * * Description: - * Add subtract vector v2 from vector v1 and return the result in vector dest + * Add subtract vector v2 from vector v1 and return the result in vector + * dest * ****************************************************************************/ diff --git a/libs/libnx/nxglib/nxglib_yuv2rgb.c b/libs/libnx/nxglib/nxglib_yuv2rgb.c index f9890d95bb..87a93aceff 100644 --- a/libs/libnx/nxglib/nxglib_yuv2rgb.c +++ b/libs/libnx/nxglib/nxglib_yuv2rgb.c @@ -65,7 +65,9 @@ void nxgl_yuv2rgb(uint8_t y, uint8_t u, uint8_t v, * B = Y + 1.77200 * (U - 128.0) */ - *r = (uint8_t)b16toi(itob16(y) + b16muli(b16_1P402, vm128)); - *g = (uint8_t)b16toi(itob16(y) - b16muli(b16_P3441, um128) - b16muli(b16_P7141, vm128)); + *r = (uint8_t)b16toi(itob16(y) + + b16muli(b16_1P402, vm128)); + *g = (uint8_t)b16toi(itob16(y) - b16muli(b16_P3441, um128) - + b16muli(b16_P7141, vm128)); *b = (uint8_t)b16toi(itob16(y) + b16muli(b16_1P772, um128)); } diff --git a/libs/libnx/nxmu/nx_bitmap.c b/libs/libnx/nxmu/nx_bitmap.c index fb6f4c5353..5988f9eb6e 100644 --- a/libs/libnx/nxmu/nx_bitmap.c +++ b/libs/libnx/nxmu/nx_bitmap.c @@ -45,8 +45,8 @@ * * Input Parameters: * hwnd - The window that will receive the bitmap image - * dest - Describes the rectangular region on the display that will receive the - * the bit map. + * dest - Describes the rectangular region on the display that will + * receive the the bit map. * src - The start of the source image. * origin - The origin of the upper, left-most corner of the full bitmap. * Both dest and origin are in window coordinates, however, origin @@ -91,7 +91,6 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest, outmsg.origin.y = origin->y; nxgl_rectcopy(&outmsg.dest, dest); - /* Create a semaphore for tracking command completion */ outmsg.sem_done = &sem_done; @@ -113,7 +112,9 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest, ret = nxmu_sendwindow(wnd, &outmsg, sizeof(struct nxsvrmsg_bitmap_s)); - /* Wait that the command is completed, so that caller can release the buffer. */ + /* Wait that the command is completed, so that caller can release the + * buffer. + */ if (ret == OK) { diff --git a/libs/libnx/nxmu/nx_block.c b/libs/libnx/nxmu/nx_block.c index 7dc2a664f7..ecfce41bd1 100644 --- a/libs/libnx/nxmu/nx_block.c +++ b/libs/libnx/nxmu/nx_block.c @@ -43,10 +43,10 @@ * to the window and then (2) block any further window messaging. * * The 'blocked' callback is the response from nx_block (or nxtk_block). - * Those blocking interfaces are used to assure that no further messages are - * are directed to the window. Receipt of the blocked callback signifies - * that (1) there are no further pending callbacks and (2) that the - * window is now 'defunct' and will receive no further callbacks. + * Those blocking interfaces are used to assure that no further messages + * are are directed to the window. Receipt of the blocked callback + * signifies that (1) there are no further pending callbacks and (2) that + * the window is now 'defunct' and will receive no further callbacks. * * This callback supports coordinated destruction of a window in multi- * user mode. In multi-use mode, the client window logic must stay @@ -82,16 +82,18 @@ int nx_block(NXWINDOW hwnd, FAR void *arg) if (!NXBE_ISBLOCKED(wnd)) { - /* Mark the window as blocked. This will stop all messages to the window - * (EXCEPT the NX_SVRMSG_BLOCKED). Blocking the messages before sending the - * blocked message is awkward but assures that no other messages sneak into + /* Mark the window as blocked. This will stop all messages to the + * window (EXCEPT the NX_SVRMSG_BLOCKED). + * Blocking the messages before sending the blocked message + * is awkward but assures that no other messages sneak into * the message queue before we can set the blocked state. */ NXBE_SETBLOCKED(wnd); - /* Send the message indicating that the window is blocked (and because of - * queue also that there are no additional queue messages for the window) + /* Send the message indicating that the window is blocked + * (and because of queue also that there are no additional queue + * messages for the window) */ outmsg.msgid = NX_SVRMSG_BLOCKED; @@ -102,7 +104,8 @@ int nx_block(NXWINDOW hwnd, FAR void *arg) * that it will not be blocked. */ - ret = nxmu_sendserver(wnd->conn, &outmsg, sizeof(struct nxsvrmsg_blocked_s)); + ret = nxmu_sendserver(wnd->conn, &outmsg, + sizeof(struct nxsvrmsg_blocked_s)); } return ret; diff --git a/libs/libnx/nxmu/nx_closewindow.c b/libs/libnx/nxmu/nx_closewindow.c index 26dd22ffca..059a3f2ab3 100644 --- a/libs/libnx/nxmu/nx_closewindow.c +++ b/libs/libnx/nxmu/nx_closewindow.c @@ -60,5 +60,6 @@ int nx_closewindow(NXWINDOW hwnd) outmsg.msgid = NX_SVRMSG_CLOSEWINDOW; outmsg.wnd = wnd; - return nxmu_sendserver(wnd->conn, &outmsg, sizeof(struct nxsvrmsg_closewindow_s)); + return nxmu_sendserver(wnd->conn, &outmsg, + sizeof(struct nxsvrmsg_closewindow_s)); } diff --git a/libs/libnx/nxmu/nx_constructwindow.c b/libs/libnx/nxmu/nx_constructwindow.c index 395ad22627..edd988c4f2 100644 --- a/libs/libnx/nxmu/nx_constructwindow.c +++ b/libs/libnx/nxmu/nx_constructwindow.c @@ -42,16 +42,17 @@ * Name: nx_constructwindow * * Description: - * This function is the same a nx_openwindow EXCEPT that the client provides - * the window structure instance. nx_constructwindow will initialize the - * the pre-allocated window structure for use by NX. This function is - * provided in addition to nx_openwindow in order to support a kind of - * inheritance: The caller's window structure may include extensions that - * are not visible to NX. + * This function is the same a nx_openwindow EXCEPT that the client + * provides the window structure instance. nx_constructwindow will + * initialize the the pre-allocated window structure for use by NX. + * This function is provided in addition to nx_openwindow in order + * to support a kind of inheritance: The caller's window structure + * may include extensions that are not visible to NX. * - * NOTE: hwnd must have been allocated using a user-space allocator that - * permits user access to the window. Once provided to nx_constructwindow() - * that memory is owned and managed by NX. On certain error conditions or + * NOTE: + * hwnd must have been allocated using a user-space allocator that permits + * user access to the window. Once provided to nx_constructwindow() that + * memory is owned and managed by NX. On certain error conditions or * when the window is closed, NX will free the window. * * Input Parameters: @@ -112,5 +113,6 @@ int nx_constructwindow(NXHANDLE handle, NXWINDOW hwnd, uint8_t flags, outmsg.msgid = NX_SVRMSG_OPENWINDOW; outmsg.wnd = wnd; - return nxmu_sendserver(conn, &outmsg, sizeof(struct nxsvrmsg_openwindow_s)); + return nxmu_sendserver(conn, &outmsg, + sizeof(struct nxsvrmsg_openwindow_s)); } diff --git a/libs/libnx/nxmu/nx_cursor.c b/libs/libnx/nxmu/nx_cursor.c index 63fb702be0..f48d989879 100644 --- a/libs/libnx/nxmu/nx_cursor.c +++ b/libs/libnx/nxmu/nx_cursor.c @@ -201,7 +201,8 @@ int nxcursor_setposition(NXHANDLE hnd, FAR const struct nxgl_point_s *pos) int nxcursor_get_position(NXHANDLE hnd, FAR struct nxgl_point_s *pos) { - /* REVISIT: The cursor position is not accessible from here. It is in hnd, + /* REVISIT: + * The cursor position is not accessible from here. It is in hnd, * be we don't have the definitions exposed to get it. */ diff --git a/libs/libnx/nxmu/nx_eventnotify.c b/libs/libnx/nxmu/nx_eventnotify.c index e00075ba5a..72d8a2282b 100644 --- a/libs/libnx/nxmu/nx_eventnotify.c +++ b/libs/libnx/nxmu/nx_eventnotify.c @@ -46,8 +46,8 @@ * client can then call nv_eventhandler() only when incoming events are * available. * - * Only one such event is issued. Upon receipt of the signal, if the client - * wishes further notifications, it must call nx_eventnotify again. + * Only one such event is issued. Upon receipt of the signal, if the + * client wishes further notifications, it must call nx_eventnotify again. * * Input Parameters: * handle - the handle returned by nx_connect diff --git a/libs/libnx/nxmu/nx_filltrapezoid.c b/libs/libnx/nxmu/nx_filltrapezoid.c index f0b7583eb0..52f39cd5d7 100644 --- a/libs/libnx/nxmu/nx_filltrapezoid.c +++ b/libs/libnx/nxmu/nx_filltrapezoid.c @@ -41,7 +41,8 @@ * Name: nx_filltrapezoid * * Description: - * Fill the specified trapezoidal region in the window with the specified color + * Fill the specified trapezoidal region in the window with the specified + * color * * Input Parameters: * hwnd - The window handle @@ -77,7 +78,9 @@ int nx_filltrapezoid(NXWINDOW hwnd, FAR const struct nxgl_rect_s *clip, outmsg.msgid = NX_SVRMSG_FILLTRAP; outmsg.wnd = wnd; - /* If no clipping window was provided, then use the size of the entire window */ + /* If no clipping window was provided, then use the size of the entire + * window + */ if (clip != NULL) { @@ -112,5 +115,6 @@ int nx_filltrapezoid(NXWINDOW hwnd, FAR const struct nxgl_rect_s *clip, /* Forward the trapezoid fill command to the server */ - return nxmu_sendwindow(wnd, &outmsg, sizeof(struct nxsvrmsg_filltrapezoid_s)); + return nxmu_sendwindow(wnd, &outmsg, + sizeof(struct nxsvrmsg_filltrapezoid_s)); } diff --git a/libs/libnx/nxmu/nx_getposition.c b/libs/libnx/nxmu/nx_getposition.c index 3a68e2521e..ea8079d55e 100644 --- a/libs/libnx/nxmu/nx_getposition.c +++ b/libs/libnx/nxmu/nx_getposition.c @@ -67,14 +67,15 @@ int nx_getposition(NXWINDOW hwnd) /* Request the size/position info. * * It is tempting to just take the positional information from the window - * structure that we have in our hands now. However, we need to run this through - * the server to keep things serialized. There might, for example, be a pending - * size/position change and, in that case, this function would return the - * wrong info. + * structure that we have in our hands now. However, we need to run this + * through the server to keep things serialized. There might, for example, + * be a pending size/position change and, in that case, this function would + * return the wrong info. */ outmsg.msgid = NX_SVRMSG_GETPOSITION; outmsg.wnd = wnd; - return nxmu_sendwindow(wnd, &outmsg, sizeof(struct nxsvrmsg_getposition_s)); + return nxmu_sendwindow(wnd, &outmsg, + sizeof(struct nxsvrmsg_getposition_s)); } diff --git a/libs/libnx/nxmu/nx_getrectangle.c b/libs/libnx/nxmu/nx_getrectangle.c index 7321df17d4..37071103fe 100644 --- a/libs/libnx/nxmu/nx_getrectangle.c +++ b/libs/libnx/nxmu/nx_getrectangle.c @@ -105,9 +105,12 @@ int nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, /* Forward the fill command to the server */ - ret = nxmu_sendwindow(wnd, &outmsg, sizeof(struct nxsvrmsg_getrectangle_s)); + ret = nxmu_sendwindow(wnd, &outmsg, + sizeof(struct nxsvrmsg_getrectangle_s)); - /* Wait that the command is completed, so that caller can release the buffer. */ + /* Wait that the command is completed, so that caller can release the + * buffer. + */ if (ret == OK) { diff --git a/libs/libnx/nxmu/nx_kbdin.c b/libs/libnx/nxmu/nx_kbdin.c index b8ef08b447..5be1eb9bc5 100644 --- a/libs/libnx/nxmu/nx_kbdin.c +++ b/libs/libnx/nxmu/nx_kbdin.c @@ -56,8 +56,8 @@ int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch) int ret; int i; - /* Allocate a bigger message to account for the variable amount of character - * data. + /* Allocate a bigger message to account for the variable amount of + * character data. */ size = sizeof(struct nxsvrmsg_kbdin_s) + nch - 1; diff --git a/libs/libnx/nxmu/nx_mousein.c b/libs/libnx/nxmu/nx_mousein.c index d9719dc0b0..c673145bc6 100644 --- a/libs/libnx/nxmu/nx_mousein.c +++ b/libs/libnx/nxmu/nx_mousein.c @@ -42,12 +42,15 @@ * * Description: * Used by a thread or interrupt handler that manages some kind of pointing - * hardware to report new positional data to the NX server. That positional + * hardware to report new positional data to the NX server. That positional * data will be routed by the NX server to the appropriate window client. * ****************************************************************************/ -int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons) +int nx_mousein(NXHANDLE handle, + nxgl_coord_t x, + nxgl_coord_t y, + uint8_t buttons) { FAR struct nxmu_conn_s *conn = (FAR struct nxmu_conn_s *)handle; struct nxsvrmsg_mousein_s outmsg; diff --git a/libs/libnx/nxmu/nx_openwindow.c b/libs/libnx/nxmu/nx_openwindow.c index 8ff4c1d614..0d56dd603f 100644 --- a/libs/libnx/nxmu/nx_openwindow.c +++ b/libs/libnx/nxmu/nx_openwindow.c @@ -75,7 +75,8 @@ NXWINDOW nx_openwindow(NXHANDLE handle, uint8_t flags, /* Pre-allocate the window structure */ - wnd = (FAR struct nxbe_window_s *)lib_uzalloc(sizeof(struct nxbe_window_s)); + wnd = (FAR struct nxbe_window_s *) + lib_uzalloc(sizeof(struct nxbe_window_s)); if (!wnd) { set_errno(ENOMEM); diff --git a/libs/libnx/nxmu/nx_releasebkgd.c b/libs/libnx/nxmu/nx_releasebkgd.c index 0fb8645315..a4a5b16ed0 100644 --- a/libs/libnx/nxmu/nx_releasebkgd.c +++ b/libs/libnx/nxmu/nx_releasebkgd.c @@ -66,5 +66,6 @@ int nx_releasebkgd(NXWINDOW hwnd) /* Request access to the background window from the server */ outmsg.msgid = NX_SVRMSG_RELEASEBKGD; - return nxmu_sendserver(wnd->conn, &outmsg, sizeof(struct nxsvrmsg_releasebkgd_s)); + return nxmu_sendserver(wnd->conn, &outmsg, + sizeof(struct nxsvrmsg_releasebkgd_s)); } diff --git a/libs/libnx/nxmu/nx_requestbkgd.c b/libs/libnx/nxmu/nx_requestbkgd.c index 2892cf201b..836e584f70 100644 --- a/libs/libnx/nxmu/nx_requestbkgd.c +++ b/libs/libnx/nxmu/nx_requestbkgd.c @@ -95,5 +95,6 @@ int nx_requestbkgd(NXHANDLE handle, FAR const struct nx_callback_s *cb, outmsg.cb = cb; outmsg.arg = arg; - return nxmu_sendserver(conn, &outmsg, sizeof(struct nxsvrmsg_requestbkgd_s)); + return nxmu_sendserver(conn, &outmsg, + sizeof(struct nxsvrmsg_requestbkgd_s)); } diff --git a/libs/libnx/nxmu/nx_setbgcolor.c b/libs/libnx/nxmu/nx_setbgcolor.c index f058432134..40fede59c8 100644 --- a/libs/libnx/nxmu/nx_setbgcolor.c +++ b/libs/libnx/nxmu/nx_setbgcolor.c @@ -70,5 +70,6 @@ int nx_setbgcolor(NXHANDLE handle, /* Forward the fill command to the server */ - return nxmu_sendserver(conn, &outmsg, sizeof(struct nxsvrmsg_setbgcolor_s)); + return nxmu_sendserver(conn, &outmsg, + sizeof(struct nxsvrmsg_setbgcolor_s)); } diff --git a/libs/libnx/nxmu/nx_setpixel.c b/libs/libnx/nxmu/nx_setpixel.c index 6d15f11e23..996987f4cf 100644 --- a/libs/libnx/nxmu/nx_setpixel.c +++ b/libs/libnx/nxmu/nx_setpixel.c @@ -42,7 +42,8 @@ * * Description: * Set a single pixel in the window to the specified color. This is simply - * a degenerate case of nx_fill(), but may be optimized in some architectures. + * a degenerate case of nx_fill(), but may be optimized in some + * architectures. * * Input Parameters: * wnd - The window structure reference diff --git a/libs/libnx/nxmu/nx_setposition.c b/libs/libnx/nxmu/nx_setposition.c index b83f8b58d9..314dcd49ad 100644 --- a/libs/libnx/nxmu/nx_setposition.c +++ b/libs/libnx/nxmu/nx_setposition.c @@ -70,5 +70,6 @@ int nx_setposition(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos) outmsg.pos.x = pos->x; outmsg.pos.y = pos->y; - return nxmu_sendwindow(wnd, &outmsg, sizeof(struct nxsvrmsg_setposition_s)); + return nxmu_sendwindow(wnd, &outmsg, + sizeof(struct nxsvrmsg_setposition_s)); } diff --git a/libs/libnx/nxmu/nx_setvisibility.c b/libs/libnx/nxmu/nx_setvisibility.c index ad04093d20..a5823173e7 100644 --- a/libs/libnx/nxmu/nx_setvisibility.c +++ b/libs/libnx/nxmu/nx_setvisibility.c @@ -63,5 +63,6 @@ int nx_setvisibility(NXWINDOW hwnd, bool hide) outmsg.wnd = wnd; outmsg.hide = hide; - return nxmu_sendwindow(wnd, &outmsg, sizeof(struct nxsvrmsg_setvisibility_s)); + return nxmu_sendwindow(wnd, &outmsg, + sizeof(struct nxsvrmsg_setvisibility_s)); } diff --git a/libs/libnx/nxtk/nxtk.h b/libs/libnx/nxtk/nxtk.h index 57be035ed9..f26bf1b0bf 100644 --- a/libs/libnx/nxtk/nxtk.h +++ b/libs/libnx/nxtk/nxtk.h @@ -130,8 +130,9 @@ void nxtk_subwindowclip(FAR struct nxtk_framedwindow_s *fwnd, * Name: nxtk_containerclip * * Description: - * We are given a 'src' rectangle in containing window, relative coordinates - * (i.e., (0,0) is the top left corner of the outer, containing window). + * We are given a 'src' rectangle in containing window, relative + * coordinates (i.e., (0,0) is the top left corner of the outer, + * containing window). * This function will (1) clip that src rectangle so that it lies within * the sub-window bounds, and then (2) move the rectangle to that it is * relative to the sub-window (i.e., (0,0) is the top left corner of the @@ -161,7 +162,8 @@ void nxtk_containerclip(FAR struct nxtk_framedwindow_s *fwnd, * * Input Parameters: * fwnd - The framed window within which the move is to be done. - * This must have been previously created by nxtk_openwindow(). + * This must have been previously created by + * nxtk_openwindow(). * destrect - The location to receive the clipped rectangle relative * to containing window * destoffset - The location to received the clipped offset. diff --git a/libs/libnx/nxtk/nxtk_bitmaptoolbar.c b/libs/libnx/nxtk/nxtk_bitmaptoolbar.c index a618c49e02..10bf3a1d04 100644 --- a/libs/libnx/nxtk/nxtk_bitmaptoolbar.c +++ b/libs/libnx/nxtk/nxtk_bitmaptoolbar.c @@ -50,8 +50,8 @@ * will receive the bit map. * src - The start of the source image. * origin - The origin of the upper, left-most corner of the full bitmap. - * Both dest and origin are in sub-window coordinates, however, the - * origin may lie outside of the sub-window display. + * Both dest and origin are in sub-window coordinates, however, + * the origin may lie outside of the sub-window display. * stride - The width of the full source image in pixels. * * Returned Value: @@ -61,9 +61,11 @@ int nxtk_bitmaptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest, FAR const void *src[CONFIG_NX_NPLANES], - FAR const struct nxgl_point_s *origin, unsigned int stride) + FAR const struct nxgl_point_s *origin, + unsigned int stride) { - FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd; + FAR struct nxtk_framedwindow_s *fwnd = + (FAR struct nxtk_framedwindow_s *)hfwnd; struct nxgl_point_s wndorigin; struct nxgl_rect_s clipdest; @@ -90,8 +92,8 @@ int nxtk_bitmaptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest, nxgl_vectoradd(&wndorigin, origin, &fwnd->tbrect.pt1); - /* Then move the origin so that is relative to the containing window, not the - * client subwindow + /* Then move the origin so that is relative to the containing window, not + * the client subwindow */ nxgl_vectsubtract(&wndorigin, &wndorigin, &fwnd->wnd.bounds.pt1); diff --git a/libs/libnx/nxtk/nxtk_bitmapwindow.c b/libs/libnx/nxtk/nxtk_bitmapwindow.c index 625c943e1f..3bc76cbc3a 100644 --- a/libs/libnx/nxtk/nxtk_bitmapwindow.c +++ b/libs/libnx/nxtk/nxtk_bitmapwindow.c @@ -50,8 +50,8 @@ * will receive the bit map. * src - The start of the source image. * origin - The origin of the upper, left-most corner of the full bitmap. - * Both dest and origin are in sub-window coordinates, however, the - * origin may lie outside of the sub-window display. + * Both dest and origin are in sub-window coordinates, however, + * the origin may lie outside of the sub-window display. * stride - The width of the full source image in pixels. * * Returned Value: @@ -64,7 +64,8 @@ int nxtk_bitmapwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest, FAR const struct nxgl_point_s *origin, unsigned int stride) { - FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd; + FAR struct nxtk_framedwindow_s *fwnd = + (FAR struct nxtk_framedwindow_s *)hfwnd; struct nxgl_point_s wndorigin; struct nxgl_rect_s clipdest; diff --git a/libs/libnx/nxtk/nxtk_block.c b/libs/libnx/nxtk/nxtk_block.c index fac1668638..9ec5781f10 100644 --- a/libs/libnx/nxtk/nxtk_block.c +++ b/libs/libnx/nxtk/nxtk_block.c @@ -40,10 +40,10 @@ * to the window and then (2) block any further window messaging. * * The 'blocked' callback is the response from nx_block (or nxtk_block). - * Those blocking interfaces are used to assure that no further messages are - * are directed to the window. Receipt of the blocked callback signifies - * that (1) there are no further pending callbacks and (2) that the - * window is now 'defunct' and will receive no further callbacks. + * Those blocking interfaces are used to assure that no further messages + * are are directed to the window. Receipt of the blocked callback + * signifies that (1) there are no further pending callbacks and (2) that + * the window is now 'defunct' and will receive no further callbacks. * * This callback supports coordinated destruction of a window in multi- * user mode. In multi-use mode, the client window logic must stay diff --git a/libs/libnx/nxtk/nxtk_containerclip.c b/libs/libnx/nxtk/nxtk_containerclip.c index 92c6404654..d75a0be560 100644 --- a/libs/libnx/nxtk/nxtk_containerclip.c +++ b/libs/libnx/nxtk/nxtk_containerclip.c @@ -41,8 +41,9 @@ * Name: nxtk_containerclip * * Description: - * We are given a 'src' rectangle in containing window, relative coordinates - * (i.e., (0,0) is the top left corner of the outer, containing window). + * We are given a 'src' rectangle in containing window, relative + * coordinates (i.e., (0,0) is the top left corner of the outer, containing + * window). * This function will (1) clip that src rectangle so that it lies within * the sub-window bounds, and then (2) move the rectangle to that it is * relative to the sub-window (i.e., (0,0) is the top left corner of the diff --git a/libs/libnx/nxtk/nxtk_drawcircletoolbar.c b/libs/libnx/nxtk/nxtk_drawcircletoolbar.c index 36045ef56c..c05f4d0260 100644 --- a/libs/libnx/nxtk/nxtk_drawcircletoolbar.c +++ b/libs/libnx/nxtk/nxtk_drawcircletoolbar.c @@ -77,7 +77,8 @@ * ****************************************************************************/ -int nxtk_drawcircletoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_point_s *center, +int nxtk_drawcircletoolbar(NXTKWINDOW hfwnd, + FAR const struct nxgl_point_s *center, nxgl_coord_t radius, nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]) { @@ -98,10 +99,14 @@ int nxtk_drawcircletoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_point_s *cent vector.pt1.x = pts[i].x; vector.pt1.y = pts[i].y; - vector.pt2.x = pts[i+1].x; - vector.pt2.y = pts[i+1].y; + vector.pt2.x = pts[i + 1].x; + vector.pt2.y = pts[i + 1].y; - ret = nxtk_drawlinetoolbar(hfwnd, &vector, width, color, NX_LINECAP_PT1); + ret = nxtk_drawlinetoolbar(hfwnd, + &vector, + width, + color, + NX_LINECAP_PT1); if (ret != OK) { return ret; diff --git a/libs/libnx/nxtk/nxtk_drawcirclewindow.c b/libs/libnx/nxtk/nxtk_drawcirclewindow.c index 9a682dfdda..334911a91a 100644 --- a/libs/libnx/nxtk/nxtk_drawcirclewindow.c +++ b/libs/libnx/nxtk/nxtk_drawcirclewindow.c @@ -77,7 +77,8 @@ * ****************************************************************************/ -int nxtk_drawcirclewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_point_s *center, +int nxtk_drawcirclewindow(NXTKWINDOW hfwnd, + FAR const struct nxgl_point_s *center, nxgl_coord_t radius, nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]) { @@ -98,10 +99,14 @@ int nxtk_drawcirclewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_point_s *cente vector.pt1.x = pts[i].x; vector.pt1.y = pts[i].y; - vector.pt2.x = pts[i+1].x; - vector.pt2.y = pts[i+1].y; + vector.pt2.x = pts[i + 1].x; + vector.pt2.y = pts[i + 1].y; - ret = nxtk_drawlinewindow(hfwnd, &vector, width, color, NX_LINECAP_PT1); + ret = nxtk_drawlinewindow(hfwnd, + &vector, + width, + color, + NX_LINECAP_PT1); if (ret != OK) { return ret; diff --git a/libs/libnx/nxtk/nxtk_drawframe.c b/libs/libnx/nxtk/nxtk_drawframe.c index 0bc422b867..345066b516 100644 --- a/libs/libnx/nxtk/nxtk_drawframe.c +++ b/libs/libnx/nxtk/nxtk_drawframe.c @@ -172,7 +172,7 @@ int nxtk_drawframe(FAR struct nxtk_framedwindow_s *fwnd, #endif #endif - /* Draw left and right outer edges *****************************************/ + /* Draw left and right outer edges ****************************************/ /* Draw the shiny left out edge */ @@ -192,7 +192,7 @@ int nxtk_drawframe(FAR struct nxtk_framedwindow_s *fwnd, nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor2); #endif - /* Draw left and right central regions *************************************/ + /* Draw left and right central regions ************************************/ #if CONFIG_NXTK_BORDERWIDTH > 2 frame.pt1.x = 1; @@ -217,7 +217,8 @@ int nxtk_drawframe(FAR struct nxtk_framedwindow_s *fwnd, nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor1); #endif - /* Draw left and right inner sides *****************************************/ + /* Draw left and right inner sides ****************************************/ + /* This segment stops at the bottom of the toolbar. If there is a * tool bar, then we have to continue this to the top of the display * using g_bordercolor1 (see below) @@ -248,8 +249,8 @@ int nxtk_drawframe(FAR struct nxtk_framedwindow_s *fwnd, #endif #endif - /* Fix up the little line-seqments at the top inner edges that need to match - * the color of the toolbar. + /* Fix up the little line-seqments at the top inner edges that need to + * match the color of the toolbar. */ #if CONFIG_NXTK_BORDERWIDTH > 1 diff --git a/libs/libnx/nxtk/nxtk_drawlinetoolbar.c b/libs/libnx/nxtk/nxtk_drawlinetoolbar.c index ec467bc37d..8854b787e1 100644 --- a/libs/libnx/nxtk/nxtk_drawlinetoolbar.c +++ b/libs/libnx/nxtk/nxtk_drawlinetoolbar.c @@ -58,10 +58,11 @@ * ****************************************************************************/ -int nxtk_drawlinetoolbar(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector, - nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES], +int nxtk_drawlinetoolbar(NXTKWINDOW hfwnd, + FAR struct nxgl_vector_s *vector, + nxgl_coord_t width, + nxgl_mxpixel_t color[CONFIG_NX_NPLANES], uint8_t caps) - { struct nxgl_trapezoid_s trap[3]; struct nxgl_rect_s rect; @@ -80,7 +81,8 @@ int nxtk_drawlinetoolbar(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector, ret = nxgl_splitline(vector, trap, &rect, width); switch (ret) { - /* 0: Line successfully broken up into three trapezoids. Values in + /* 0: Line successfully broken up into three trapezoids. + * Values in * traps[0], traps[1], and traps[2] are valid. */ @@ -119,7 +121,9 @@ int nxtk_drawlinetoolbar(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector, return ERROR; } - /* Draw circular caps at each end of the line to support better line joins */ + /* Draw circular caps at each end of the line to support better line + * joins + */ if (caps != NX_LINECAP_NONE && width >= 3) { diff --git a/libs/libnx/nxtk/nxtk_drawlinewindow.c b/libs/libnx/nxtk/nxtk_drawlinewindow.c index a3fd0b0793..27f39c783b 100644 --- a/libs/libnx/nxtk/nxtk_drawlinewindow.c +++ b/libs/libnx/nxtk/nxtk_drawlinewindow.c @@ -57,10 +57,11 @@ * ****************************************************************************/ -int nxtk_drawlinewindow(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector, - nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES], +int nxtk_drawlinewindow(NXTKWINDOW hfwnd, + FAR struct nxgl_vector_s *vector, + nxgl_coord_t width, + nxgl_mxpixel_t color[CONFIG_NX_NPLANES], uint8_t caps) - { struct nxgl_trapezoid_s trap[3]; struct nxgl_rect_s rect; @@ -118,7 +119,9 @@ int nxtk_drawlinewindow(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector, return ERROR; } - /* Draw circular caps at each end of the line to support better line joins */ + /* Draw circular caps at each end of the line to support better line + * joins + */ if (caps != NX_LINECAP_NONE && width >= 3) { diff --git a/libs/libnx/nxtk/nxtk_events.c b/libs/libnx/nxtk/nxtk_events.c index 717da4eddf..45a934799f 100644 --- a/libs/libnx/nxtk/nxtk_events.c +++ b/libs/libnx/nxtk/nxtk_events.c @@ -97,9 +97,10 @@ static void nxtk_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, DEBUGASSERT(fwnd->fwcb != NULL); if (fwnd->fwcb->redraw) { - /* Clip the redraw rectangle so that it lies within the client sub-window - * bounds and move the rectangle to that it is relative to the client - * sub-window (i.e., (0,0) is the top left corner of the client sub-window). + /* Clip the redraw rectangle so that it lies within the client + * sub-window bounds and move the rectangle to that it is relative to + * the client sub-window + * (i.e., (0,0) is the top left corner of the client sub-window). */ nxtk_containerclip(fwnd, &intersection, rect, &fwnd->fwrect); @@ -110,7 +111,8 @@ static void nxtk_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, if (!nxgl_nullrect(&intersection)) { - fwnd->fwcb->redraw((NXTKWINDOW)fwnd, &intersection, false, fwnd->fwarg); + fwnd->fwcb->redraw((NXTKWINDOW)fwnd, + &intersection, false, fwnd->fwarg); } } @@ -120,9 +122,10 @@ static void nxtk_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, if (fwnd->tbcb && fwnd->tbcb->redraw) { - /* Clip the redraw rectangle so that it lies within the toolbar sub-window - * bounds and move the rectangle to that it is relative to the toolbar - * sub-window (i.e., (0,0) is the top left corner of the client sub-window). + /* Clip the redraw rectangle so that it lies within the toolbar + * sub-window bounds and move the rectangle to that it is relative to + * the toolbar sub-window + * (i.e., (0,0) is the top left corner of the client sub-window). */ nxtk_containerclip(fwnd, &intersection, rect, &fwnd->tbrect); @@ -133,7 +136,8 @@ static void nxtk_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, if (!nxgl_nullrect(&intersection)) { - fwnd->tbcb->redraw((NXTKWINDOW)fwnd, &intersection, false, fwnd->tbarg); + fwnd->tbcb->redraw((NXTKWINDOW)fwnd, + &intersection, false, fwnd->tbarg); } } @@ -151,7 +155,8 @@ static void nxtk_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, FAR const struct nxgl_rect_s *bounds, FAR void *arg) { - FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hwnd; + FAR struct nxtk_framedwindow_s *fwnd = + (FAR struct nxtk_framedwindow_s *)hwnd; struct nxgl_size_s subwindowsize; ginfo("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n", @@ -189,16 +194,18 @@ static void nxtk_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, static void nxtk_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg) { - FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hwnd; + FAR struct nxtk_framedwindow_s *fwnd = + (FAR struct nxtk_framedwindow_s *)hwnd; struct nxgl_point_s abspos; struct nxgl_point_s relpos; - /* Raise the window to the top if any mouse button was pressed or if auto-raise - * is configured. Do this before reporting the mouse event (because processing - * of the mouse event could change the ordering again). + /* Raise the window to the top if any mouse button was pressed or if + * auto-raise is configured. Do this before reporting the mouse event + * (because processing of the mouse event could change the ordering again). */ - /* REVISIT: This does not work correctly. In a scenario where (1) there are + /* REVISIT: + * This does not work correctly. In a scenario where (1) there are * multiple queued touchscreen events and (2) the result of the first input * was to switch windows, then this autoraise implementation will cause the * window to revert to the previous window. Not good behavior. @@ -298,7 +305,8 @@ static void nxtk_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nxtk_kbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch, FAR void *arg) { - FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hwnd; + FAR struct nxtk_framedwindow_s *fwnd = + (FAR struct nxtk_framedwindow_s *)hwnd; /* Only the client window gets keyboard input */ @@ -316,7 +324,8 @@ static void nxtk_kbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch, static void nxtk_event(NXWINDOW hwnd, enum nx_event_e event, FAR void *arg1, FAR void *arg2) { - FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hwnd; + FAR struct nxtk_framedwindow_s *fwnd = + (FAR struct nxtk_framedwindow_s *)hwnd; /* Forward the event to the window client */ diff --git a/libs/libnx/nxtk/nxtk_fillcircletoolbar.c b/libs/libnx/nxtk/nxtk_fillcircletoolbar.c index 16f4658e34..7c122584c4 100644 --- a/libs/libnx/nxtk/nxtk_fillcircletoolbar.c +++ b/libs/libnx/nxtk/nxtk_fillcircletoolbar.c @@ -58,7 +58,8 @@ * ****************************************************************************/ -int nxtk_fillcircletoolbar(NXWINDOW hfwnd, FAR const struct nxgl_point_s *center, +int nxtk_fillcircletoolbar(NXWINDOW hfwnd, + FAR const struct nxgl_point_s *center, nxgl_coord_t radius, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]) { diff --git a/libs/libnx/nxtk/nxtk_fillcirclewindow.c b/libs/libnx/nxtk/nxtk_fillcirclewindow.c index 7506a3842d..f4a8637e3d 100644 --- a/libs/libnx/nxtk/nxtk_fillcirclewindow.c +++ b/libs/libnx/nxtk/nxtk_fillcirclewindow.c @@ -58,7 +58,8 @@ * ****************************************************************************/ -int nxtk_fillcirclewindow(NXWINDOW hfwnd, FAR const struct nxgl_point_s *center, +int nxtk_fillcirclewindow(NXWINDOW hfwnd, + FAR const struct nxgl_point_s *center, nxgl_coord_t radius, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]) { diff --git a/libs/libnx/nxtk/nxtk_filltoolbar.c b/libs/libnx/nxtk/nxtk_filltoolbar.c index 9636fa835a..1d665c5e9f 100644 --- a/libs/libnx/nxtk/nxtk_filltoolbar.c +++ b/libs/libnx/nxtk/nxtk_filltoolbar.c @@ -41,7 +41,8 @@ * Name: nxtk_filltoolbar * * Description: - * Fill the specified rectangle in the client window with the specified color + * Fill the specified rectangle in the client window with the specified + * color * * Input Parameters: * hfwnd - The handle returned by nxtk_openwindow @@ -56,7 +57,8 @@ int nxtk_filltoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]) { - FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd; + FAR struct nxtk_framedwindow_s *fwnd = + (FAR struct nxtk_framedwindow_s *)hfwnd; struct nxgl_rect_s fillrect; #ifdef CONFIG_DEBUG_FEATURES diff --git a/libs/libnx/nxtk/nxtk_filltraptoolbar.c b/libs/libnx/nxtk/nxtk_filltraptoolbar.c index e4a10419fc..d8a91b849c 100644 --- a/libs/libnx/nxtk/nxtk_filltraptoolbar.c +++ b/libs/libnx/nxtk/nxtk_filltraptoolbar.c @@ -57,7 +57,8 @@ int nxtk_filltraptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_trapezoid_s *trap, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]) { - FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd; + FAR struct nxtk_framedwindow_s *fwnd = + (FAR struct nxtk_framedwindow_s *)hfwnd; struct nxgl_rect_s relclip; #ifdef CONFIG_DEBUG_FEATURES diff --git a/libs/libnx/nxtk/nxtk_filltrapwindow.c b/libs/libnx/nxtk/nxtk_filltrapwindow.c index d4ac851c73..cca083062f 100644 --- a/libs/libnx/nxtk/nxtk_filltrapwindow.c +++ b/libs/libnx/nxtk/nxtk_filltrapwindow.c @@ -41,7 +41,8 @@ * Name: nxtk_filltrapwindow * * Description: - * Fill the specified rectangle in the client window with the specified color + * Fill the specified rectangle in the client window with the specified + * color * * Input Parameters: * hfwnd - The window handle returned by nxtk_openwindow @@ -57,7 +58,8 @@ int nxtk_filltrapwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_trapezoid_s *trap, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]) { - FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd; + FAR struct nxtk_framedwindow_s *fwnd = + (FAR struct nxtk_framedwindow_s *)hfwnd; struct nxgl_rect_s relclip; struct nxgl_trapezoid_s reltrap; diff --git a/libs/libnx/nxtk/nxtk_fillwindow.c b/libs/libnx/nxtk/nxtk_fillwindow.c index b50d86f2e5..105cc4ac4a 100644 --- a/libs/libnx/nxtk/nxtk_fillwindow.c +++ b/libs/libnx/nxtk/nxtk_fillwindow.c @@ -41,7 +41,8 @@ * Name: nxtk_fillwindow * * Description: - * Fill the specified rectangle in the client window with the specified color + * Fill the specified rectangle in the client window with the specified + * color * * Input Parameters: * hfwnd - The window handle returned by nxtk_openwindow @@ -56,7 +57,8 @@ int nxtk_fillwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]) { - FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd; + FAR struct nxtk_framedwindow_s *fwnd = + (FAR struct nxtk_framedwindow_s *)hfwnd; struct nxgl_rect_s fillrect; #ifdef CONFIG_DEBUG_FEATURES diff --git a/libs/libnx/nxtk/nxtk_gettoolbar.c b/libs/libnx/nxtk/nxtk_gettoolbar.c index 5ae36771e1..3fc86211d8 100644 --- a/libs/libnx/nxtk/nxtk_gettoolbar.c +++ b/libs/libnx/nxtk/nxtk_gettoolbar.c @@ -62,7 +62,8 @@ int nxtk_gettoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, unsigned int plane, FAR uint8_t *dest, unsigned int deststride) { - FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd; + FAR struct nxtk_framedwindow_s *fwnd = + (FAR struct nxtk_framedwindow_s *)hfwnd; struct nxgl_rect_s getrect; #ifdef CONFIG_DEBUG_FEATURES diff --git a/libs/libnx/nxtk/nxtk_getwindow.c b/libs/libnx/nxtk/nxtk_getwindow.c index 3860970200..164465945a 100644 --- a/libs/libnx/nxtk/nxtk_getwindow.c +++ b/libs/libnx/nxtk/nxtk_getwindow.c @@ -62,7 +62,8 @@ int nxtk_getwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, unsigned int plane, FAR uint8_t *dest, unsigned int deststride) { - FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd; + FAR struct nxtk_framedwindow_s *fwnd = + (FAR struct nxtk_framedwindow_s *)hfwnd; struct nxgl_rect_s getrect; #ifdef CONFIG_DEBUG_FEATURES diff --git a/libs/libnx/nxtk/nxtk_movetoolbar.c b/libs/libnx/nxtk/nxtk_movetoolbar.c index 0722d4aa32..7078397c85 100644 --- a/libs/libnx/nxtk/nxtk_movetoolbar.c +++ b/libs/libnx/nxtk/nxtk_movetoolbar.c @@ -60,7 +60,8 @@ int nxtk_movetoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, FAR const struct nxgl_point_s *offset) { - FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd; + FAR struct nxtk_framedwindow_s *fwnd = + (FAR struct nxtk_framedwindow_s *)hfwnd; struct nxgl_rect_s srcrect; struct nxgl_point_s clipoffset; @@ -76,7 +77,8 @@ int nxtk_movetoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, * toolbar sub-window */ - nxtk_subwindowmove(fwnd, &srcrect, &clipoffset, rect, offset, &fwnd->tbrect); + nxtk_subwindowmove(fwnd, &srcrect, &clipoffset, + rect, offset, &fwnd->tbrect); /* Then move it within the toolbar window */ diff --git a/libs/libnx/nxtk/nxtk_movewindow.c b/libs/libnx/nxtk/nxtk_movewindow.c index 13f9e5bce9..314bb74eca 100644 --- a/libs/libnx/nxtk/nxtk_movewindow.c +++ b/libs/libnx/nxtk/nxtk_movewindow.c @@ -59,7 +59,8 @@ int nxtk_movewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, FAR const struct nxgl_point_s *offset) { - FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd; + FAR struct nxtk_framedwindow_s *fwnd = + (FAR struct nxtk_framedwindow_s *)hfwnd; struct nxgl_rect_s srcrect; struct nxgl_point_s clipoffset; @@ -75,7 +76,8 @@ int nxtk_movewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, * client sub-window */ - nxtk_subwindowmove(fwnd, &srcrect, &clipoffset, rect, offset, &fwnd->fwrect); + nxtk_subwindowmove(fwnd, &srcrect, &clipoffset, + rect, offset, &fwnd->fwrect); /* Then move it within the client window */ diff --git a/libs/libnx/nxtk/nxtk_setposition.c b/libs/libnx/nxtk/nxtk_setposition.c index 15ec9c8bf1..dd1050bea1 100644 --- a/libs/libnx/nxtk/nxtk_setposition.c +++ b/libs/libnx/nxtk/nxtk_setposition.c @@ -56,11 +56,14 @@ int nxtk_setposition(NXTKWINDOW hfwnd, FAR const struct nxgl_point_s *pos) { - FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd; + FAR struct nxtk_framedwindow_s *fwnd = + (FAR struct nxtk_framedwindow_s *)hfwnd; struct nxgl_point_s offset; struct nxgl_point_s newpos; - /* Calculate the offset that is requested and add that to the window origin. */ + /* Calculate the offset that is requested and add that to the window + * origin. + */ nxgl_vectsubtract(&offset, pos, &fwnd->fwrect.pt1); nxgl_vectoradd(&newpos, &offset, &fwnd->wnd.bounds.pt1); diff --git a/libs/libnx/nxtk/nxtk_setsubwindows.c b/libs/libnx/nxtk/nxtk_setsubwindows.c index 6d502a027a..01358c7fa3 100644 --- a/libs/libnx/nxtk/nxtk_setsubwindows.c +++ b/libs/libnx/nxtk/nxtk_setsubwindows.c @@ -84,7 +84,7 @@ void nxtk_setsubwindows(FAR struct nxtk_framedwindow_s *fwnd) if (fullheight > 2 * CONFIG_NXTK_BORDERWIDTH) { - /* Yes.. get the height of the toolbar */ + /* Yes.. get the height of the toolbar */ tbheight = fwnd->tbheight; if (tbheight >= fullheight - bdrheight) diff --git a/libs/libnx/nxtk/nxtk_subwindowclip.c b/libs/libnx/nxtk/nxtk_subwindowclip.c index 205a2717fc..215ae63e6e 100644 --- a/libs/libnx/nxtk/nxtk_subwindowclip.c +++ b/libs/libnx/nxtk/nxtk_subwindowclip.c @@ -74,9 +74,11 @@ void nxtk_subwindowclip(FAR struct nxtk_framedwindow_s *fwnd, nxgl_rectintersect(&tmp, &tmp, bounds); - /* Then move the rectangle so that is relative to the containing window, not the - * client subwindow + /* Then move the rectangle so that is relative to the containing window, + * not the client subwindow */ - nxgl_rectoffset(dest, &tmp, -fwnd->wnd.bounds.pt1.x, -fwnd->wnd.bounds.pt1.y); + nxgl_rectoffset(dest, &tmp, + -fwnd->wnd.bounds.pt1.x, + -fwnd->wnd.bounds.pt1.y); } diff --git a/libs/libnx/nxtk/nxtk_subwindowmove.c b/libs/libnx/nxtk/nxtk_subwindowmove.c index 0d2f1bd4d9..386eab6512 100644 --- a/libs/libnx/nxtk/nxtk_subwindowmove.c +++ b/libs/libnx/nxtk/nxtk_subwindowmove.c @@ -45,7 +45,8 @@ * * Input Parameters: * fwnd - The framed window within which the move is to be done. - * This must have been previously created by nxtk_openwindow(). + * This must have been previously created by + * nxtk_openwindow(). * destrect - The loccation to receive the clipped rectangle relative * to containing window * destoffset - The location to received the clipped offset. @@ -76,7 +77,9 @@ void nxtk_subwindowmove(FAR struct nxtk_framedwindow_s *fwnd, nxgl_rectintersect(&abssrc, &abssrc, &fwnd->fwrect); - /* Clip the source rectangle so that destination area is within the window. */ + /* Clip the source rectangle so that destination area is within the + * window. + */ destoffset->x = srcoffset->x; if (destoffset->x < 0) @@ -104,7 +107,6 @@ void nxtk_subwindowmove(FAR struct nxtk_framedwindow_s *fwnd, abssrc.pt2.y = bounds->pt2.y - destoffset->y; } - /* Then move the rectangle so that is relative to the containing window, * not the client subwindow */ diff --git a/libs/libnx/nxtk/nxtk_toolbarbounds.c b/libs/libnx/nxtk/nxtk_toolbarbounds.c index 677e4a1b16..6616715b46 100644 --- a/libs/libnx/nxtk/nxtk_toolbarbounds.c +++ b/libs/libnx/nxtk/nxtk_toolbarbounds.c @@ -59,11 +59,14 @@ int nxtk_toolbarbounds(NXTKWINDOW hfwnd, FAR struct nxgl_rect_s *bounds) { - FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd; + FAR struct nxtk_framedwindow_s *fwnd = + (FAR struct nxtk_framedwindow_s *)hfwnd; DEBUGASSERT(hfwnd && bounds); - /* Offset the rectangle by subtracting the current position of the window. */ + /* Offset the rectangle by subtracting the current position of the + * window. + */ nxgl_rectoffset(bounds, &fwnd->tbrect, -fwnd->wnd.bounds.pt1.x, -fwnd->wnd.bounds.pt1.y);