diff options
Diffstat (limited to 'src/gdisp/mcufont/mf_config.h')
-rw-r--r-- | src/gdisp/mcufont/mf_config.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gdisp/mcufont/mf_config.h b/src/gdisp/mcufont/mf_config.h index ac2262d4..5c6f4ea9 100644 --- a/src/gdisp/mcufont/mf_config.h +++ b/src/gdisp/mcufont/mf_config.h @@ -25,16 +25,21 @@ /* Mapping from uGFX settings to mcufont settings */ #if GDISP_NEED_UTF8 -#define MF_ENCODING MF_ENCODING_UTF8 + #define MF_ENCODING MF_ENCODING_UTF8 +#else + #define MF_ENCODING MF_ENCODING_ASCII +#endif + +#if GDISP_NEED_TEXT_WORDWRAP + #define MF_USE_ADVANCED_WORDWRAP 1 #else -#define MF_ENCODING MF_ENCODING_ASCII + #define MF_USE_ADVANCED_WORDWRAP 0 #endif #define MF_USE_KERNING GDISP_NEED_TEXT_KERNING #define MF_FONT_FILE_NAME "src/gdisp/fonts/fonts.h" /* These are not used for now */ -#define MF_USE_ADVANCED_WORDWRAP 0 #define MF_USE_JUSTIFY 0 /******************************************************* |