diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-08-17 23:32:53 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-08-17 23:32:53 +1000 |
| commit | a2b27a6f5c404a8b8883c0f7d50279550120035a (patch) | |
| tree | 6bf7bc58c59e6a94844f97e3596c2ffc84ced3c2 /src/gdisp/fonts/fonts.h | |
| parent | 964ebc6e4a4ac647ad6c28bf8820f60fedcc0a95 (diff) | |
| download | uGFX-a2b27a6f5c404a8b8883c0f7d50279550120035a.tar.gz uGFX-a2b27a6f5c404a8b8883c0f7d50279550120035a.tar.bz2 uGFX-a2b27a6f5c404a8b8883c0f7d50279550120035a.zip | |
Add new hand built bitmap fonts to replace old UI1 and UI2.
Allow scaled fonts to be staticly defined.
Update new fonts handling so UI1 and UI2 have Narrow and Double variants.
Update example gfxconf.h.
Fix new font rules.
Add support for an application program to add their own fonts.
Make system font handling includes root relative.
Diffstat (limited to 'src/gdisp/fonts/fonts.h')
| -rw-r--r-- | src/gdisp/fonts/fonts.h | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/src/gdisp/fonts/fonts.h b/src/gdisp/fonts/fonts.h index d0dd6c5b..7d696044 100644 --- a/src/gdisp/fonts/fonts.h +++ b/src/gdisp/fonts/fonts.h @@ -3,77 +3,92 @@ #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS10) && GDISP_INCLUDE_FONT_DEJAVUSANS10 #define GDISP_FONT_FOUND -#include "DejaVuSans10.c" +#include "../src/gdisp/fonts/DejaVuSans10.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS12_AA) && GDISP_INCLUDE_FONT_DEJAVUSANS12_AA #define GDISP_FONT_FOUND -#include "DejaVuSans12_aa.c" +#include "../src/gdisp/fonts/DejaVuSans12_aa.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS12) && GDISP_INCLUDE_FONT_DEJAVUSANS12 #define GDISP_FONT_FOUND -#include "DejaVuSans12.c" +#include "../src/gdisp/fonts/DejaVuSans12.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS16_AA) && GDISP_INCLUDE_FONT_DEJAVUSANS16_AA #define GDISP_FONT_FOUND -#include "DejaVuSans16_aa.c" +#include "../src/gdisp/fonts/DejaVuSans16_aa.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS16) && GDISP_INCLUDE_FONT_DEJAVUSANS16 #define GDISP_FONT_FOUND -#include "DejaVuSans16.c" +#include "../src/gdisp/fonts/DejaVuSans16.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS24_AA) && GDISP_INCLUDE_FONT_DEJAVUSANS24_AA #define GDISP_FONT_FOUND -#include "DejaVuSans24_aa.c" +#include "../src/gdisp/fonts/DejaVuSans24_aa.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS24) && GDISP_INCLUDE_FONT_DEJAVUSANS24 #define GDISP_FONT_FOUND -#include "DejaVuSans24.c" +#include "../src/gdisp/fonts/DejaVuSans24.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS32_AA) && GDISP_INCLUDE_FONT_DEJAVUSANS32_AA #define GDISP_FONT_FOUND -#include "DejaVuSans32_aa.c" +#include "../src/gdisp/fonts/DejaVuSans32_aa.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS32) && GDISP_INCLUDE_FONT_DEJAVUSANS32 #define GDISP_FONT_FOUND -#include "DejaVuSans32.c" +#include "../src/gdisp/fonts/DejaVuSans32.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA) && GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA #define GDISP_FONT_FOUND -#include "DejaVuSansBold12_aa.c" +#include "../src/gdisp/fonts/DejaVuSansBold12_aa.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12) && GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 #define GDISP_FONT_FOUND -#include "DejaVuSansBold12.c" +#include "../src/gdisp/fonts/DejaVuSansBold12.c" #endif #if defined(GDISP_INCLUDE_FONT_FIXED_10X20) && GDISP_INCLUDE_FONT_FIXED_10X20 #define GDISP_FONT_FOUND -#include "fixed_10x20.c" +#include "../src/gdisp/fonts/fixed_10x20.c" #endif #if defined(GDISP_INCLUDE_FONT_FIXED_5X8) && GDISP_INCLUDE_FONT_FIXED_5X8 #define GDISP_FONT_FOUND -#include "fixed_5x8.c" +#include "../src/gdisp/fonts/fixed_5x8.c" #endif #if defined(GDISP_INCLUDE_FONT_FIXED_7X14) && GDISP_INCLUDE_FONT_FIXED_7X14 #define GDISP_FONT_FOUND -#include "fixed_7x14.c" +#include "../src/gdisp/fonts/fixed_7x14.c" #endif #if defined(GDISP_INCLUDE_FONT_LARGENUMBERS) && GDISP_INCLUDE_FONT_LARGENUMBERS #define GDISP_FONT_FOUND -#include "LargeNumbers.c" +#include "../src/gdisp/fonts/LargeNumbers.c" +#endif + +#if defined(GDISP_INCLUDE_FONT_UI1) && GDISP_INCLUDE_FONT_UI1 +#define GDISP_FONT_FOUND +#include "../src/gdisp/fonts/UI1.c" +#endif + +#if defined(GDISP_INCLUDE_FONT_UI2) && GDISP_INCLUDE_FONT_UI2 +#define GDISP_FONT_FOUND +#include "../src/gdisp/fonts/UI2.c" +#endif + +#if defined(GDISP_INCLUDE_USER_FONTS) && GDISP_INCLUDE_USER_FONTS +#define GDISP_FONT_FOUND +#include "userfonts.h" #endif #ifndef GDISP_FONT_FOUND |