regenerat fonts

fyyxxm · Nov 25, 2019 · a7bfaab · a7bfaab
1 parent f0863b4
commit a7bfaab
Show file tree

Hide file tree

Showing 9 changed files with 8,427 additions and 9,328 deletions.
diff --git a/scripts/built_in_font/FontAwesome.ttf b/scripts/built_in_font/FontAwesome.ttf
diff --git a/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff b/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff
diff --git a/scripts/built_in_font/built_in_font_gen.py b/scripts/built_in_font/built_in_font_gen.py
@@ -40,8 +40,8 @@
 	compr = ""
 
 #Built in symbols
-syms = "61441,61448,61451,61452,61453,61457,61459,61460,61461,61465,61468,61473,61478,61479,61480,61502,61504,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61671,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62099"
+syms = "61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650"
 
 #Run the command
-cmd = "lv_font_conv {} --bpp {} --size {} --font ./Roboto-Regular.woff -r {} --font FontAwesome.ttf -r {} --format lvgl -o {} --force-fast-kern-format".format(compr, args.bpp, args.size, args.range[0], syms, args.output)
+cmd = "lv_font_conv {} --bpp {} --size {} --font Roboto-Regular.woff -r {} --font FontAwesome5-Solid+Brands+Regular.woff -r {} --format lvgl -o {} --force-fast-kern-format".format(compr, args.bpp, args.size, args.range[0], syms, args.output)
 os.system(cmd)
diff --git a/src/lv_conf_checker.h b/src/lv_conf_checker.h
@@ -493,7 +493,12 @@
 #ifndef LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN
 #define LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN 3
 #endif
-
+
+/* The control character to use for signalling text recoloring. */
+#ifndef LV_TXT_COLOR_CMD
+#define LV_TXT_COLOR_CMD "#"
+#endif
+
 /* Support bidirectional texts.
  * Allows mixing Left-to-Right and Right-to-Left texts.
  * The direction will be processed according to the Unicode Bidirectioanl Algorithm: