fix(builtin_fonts): fix static_bitmap checks and update generation script (#10721)

.github/workflows/code_generation.yml

@@ -56,7 +56,7 @@ jobs:
 
       - name: Install lv_font_conv
         env:
-          LV_FONT_CONV_REF: ed6084a0649046ba4061ef1f9312e13bdcfe6fbd
+          LV_FONT_CONV_REF: 2107ab79b615a6ff7051796fa9f7ae52f042437b
         run: |
           git clone https://github.com/lvgl/lv_font_conv.git "$RUNNER_TEMP/lv_font_conv"
           git -C "$RUNNER_TEMP/lv_font_conv" checkout "$LV_FONT_CONV_REF"
@@ -134,8 +134,8 @@ jobs:
         continue-on-error: true
         run: |
           python3 scripts/generators/built_in_font/generate_all.py
-          git add src/font
-          git diff --exit-code -- src/font \
+          git add -A -- src/font demos/benchmark/assets
+          git diff --cached --exit-code -- src/font demos/benchmark/assets \
           || (echo "::error::Generated built-in fonts are out of date. Run scripts/generators/built_in_font/generate_all.py and commit the result."; exit 1)
           git reset --hard
 

demos/benchmark/assets/lv_font_benchmark_montserrat_12_aligned.c

@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Size: 12 px
  * Bpp: 8
- * Opts: --no-compress --no-prefilter --bpp 8 --stride 16 --align 16 --size 12 --font Montserrat-Medium.ttf -r 0x20-0x7F,0xB0,0x2022 --font FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62189,62212,62810,63426,63650 --format lvgl -o lv_font_benchmark_montserrat_12_aligned.c --force-fast-kern-format
+ * Opts: --no-compress --no-prefilter --bpp 8 --stride 16 --align 16 --size 12 --font Montserrat-Medium.ttf -r 0x20-0x7F,0xB0,0x2022 --font FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_benchmark_montserrat_12_aligned.c --force-fast-kern-format
  ******************************************************************************/
 
 #ifdef __has_include
@@ -24,6 +24,10 @@
 
 #if LV_FONT_BENCHMARK_MONTSERRAT_12_ALIGNED
 
+#if !(LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10)
+    #error "At least LVGL v9.3 is required to use the stride attribute of the fonts"
+#endif
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -1820,7 +1824,6 @@ static LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitma
     0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-
 /*---------------------
  *  GLYPH DESCRIPTION
  *--------------------*/
@@ -2017,7 +2020,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
  *    KERNING
  *----------------*/
 
-
 /*Map glyph_ids to kern left classes*/
 static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
@@ -2444,7 +2446,6 @@ static const int8_t kern_class_values[] = {
     0, 0, 0, 0, 0
 };
 
-
 /*Collect the kern class' data in one place*/
 static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
@@ -2499,6 +2500,10 @@ lv_font_t lv_font_benchmark_montserrat_12_aligned = {
     .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
     .line_height = 15,          /*The maximum line height required by the font*/
     .base_line = 3,             /*Baseline measured from the bottom of the line*/
+#if LV_VERSION_CHECK(9, 6, 0) || LVGL_VERSION_MAJOR >= 10
+    .cap_height = 8,           /*Cap height of the font*/
+    .x_height = 6,               /*x-height of the font*/
+#endif
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
@@ -2507,7 +2512,7 @@ lv_font_t lv_font_benchmark_montserrat_12_aligned = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

demos/benchmark/assets/lv_font_benchmark_montserrat_14_aligned.c

@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Size: 14 px
  * Bpp: 8
- * Opts: --no-compress --no-prefilter --bpp 8 --stride 16 --align 16 --size 14 --font Montserrat-Medium.ttf -r 0x20-0x7F,0xB0,0x2022 --font FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62189,62212,62810,63426,63650 --format lvgl -o lv_font_benchmark_montserrat_14_aligned.c --force-fast-kern-format
+ * Opts: --no-compress --no-prefilter --bpp 8 --stride 16 --align 16 --size 14 --font Montserrat-Medium.ttf -r 0x20-0x7F,0xB0,0x2022 --font FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_benchmark_montserrat_14_aligned.c --force-fast-kern-format
  ******************************************************************************/
 
 #ifdef __has_include
@@ -24,6 +24,10 @@
 
 #if LV_FONT_BENCHMARK_MONTSERRAT_14_ALIGNED
 
+#if !(LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10)
+    #error "At least LVGL v9.3 is required to use the stride attribute of the fonts"
+#endif
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -2019,7 +2023,6 @@ static LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitma
     0x00, 0x00, 0x00, 0x33, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-
 /*---------------------
  *  GLYPH DESCRIPTION
  *--------------------*/
@@ -2216,7 +2219,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
  *    KERNING
  *----------------*/
 
-
 /*Map glyph_ids to kern left classes*/
 static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
@@ -2643,7 +2645,6 @@ static const int8_t kern_class_values[] = {
     0, 0, 0, 0, 0
 };
 
-
 /*Collect the kern class' data in one place*/
 static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
@@ -2698,6 +2699,10 @@ lv_font_t lv_font_benchmark_montserrat_14_aligned = {
     .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
     .line_height = 16,          /*The maximum line height required by the font*/
     .base_line = 3,             /*Baseline measured from the bottom of the line*/
+#if LV_VERSION_CHECK(9, 6, 0) || LVGL_VERSION_MAJOR >= 10
+    .cap_height = 10,           /*Cap height of the font*/
+    .x_height = 7,               /*x-height of the font*/
+#endif
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
@@ -2706,7 +2711,7 @@ lv_font_t lv_font_benchmark_montserrat_14_aligned = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

demos/benchmark/assets/lv_font_benchmark_montserrat_16_aligned.c

@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Size: 16 px
  * Bpp: 8
- * Opts: --no-compress --no-prefilter --bpp 8 --stride 16 --align 16 --size 16 --font Montserrat-Medium.ttf -r 0x20-0x7F,0xB0,0x2022 --font FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62189,62212,62810,63426,63650 --format lvgl -o lv_font_benchmark_montserrat_16_aligned.c --force-fast-kern-format
+ * Opts: --no-compress --no-prefilter --bpp 8 --stride 16 --align 16 --size 16 --font Montserrat-Medium.ttf -r 0x20-0x7F,0xB0,0x2022 --font FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_benchmark_montserrat_16_aligned.c --force-fast-kern-format
  ******************************************************************************/
 
 #ifdef __has_include
@@ -24,6 +24,10 @@
 
 #if LV_FONT_BENCHMARK_MONTSERRAT_16_ALIGNED
 
+#if !(LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10)
+    #error "At least LVGL v9.3 is required to use the stride attribute of the fonts"
+#endif
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -2227,7 +2231,6 @@ static LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitma
     0x00, 0x00, 0x00, 0x52, 0xae, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-
 /*---------------------
  *  GLYPH DESCRIPTION
  *--------------------*/
@@ -2424,7 +2427,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
  *    KERNING
  *----------------*/
 
-
 /*Map glyph_ids to kern left classes*/
 static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
@@ -2851,7 +2853,6 @@ static const int8_t kern_class_values[] = {
     0, 0, 0, 0, 0
 };
 
-
 /*Collect the kern class' data in one place*/
 static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
@@ -2906,6 +2907,10 @@ lv_font_t lv_font_benchmark_montserrat_16_aligned = {
     .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
     .line_height = 18,          /*The maximum line height required by the font*/
     .base_line = 3,             /*Baseline measured from the bottom of the line*/
+#if LV_VERSION_CHECK(9, 6, 0) || LVGL_VERSION_MAJOR >= 10
+    .cap_height = 11,           /*Cap height of the font*/
+    .x_height = 8,               /*x-height of the font*/
+#endif
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
@@ -2914,7 +2919,7 @@ lv_font_t lv_font_benchmark_montserrat_16_aligned = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

demos/benchmark/assets/lv_font_benchmark_montserrat_18_aligned.c

@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Size: 18 px
  * Bpp: 8
- * Opts: --no-compress --no-prefilter --bpp 8 --stride 16 --align 16 --size 18 --font Montserrat-Medium.ttf -r 0x20-0x7F,0xB0,0x2022 --font FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62189,62212,62810,63426,63650 --format lvgl -o lv_font_benchmark_montserrat_18_aligned.c --force-fast-kern-format
+ * Opts: --no-compress --no-prefilter --bpp 8 --stride 16 --align 16 --size 18 --font Montserrat-Medium.ttf -r 0x20-0x7F,0xB0,0x2022 --font FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_benchmark_montserrat_18_aligned.c --force-fast-kern-format
  ******************************************************************************/
 
 #ifdef __has_include
@@ -24,6 +24,10 @@
 
 #if LV_FONT_BENCHMARK_MONTSERRAT_18_ALIGNED
 
+#if !(LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10)
+    #error "At least LVGL v9.3 is required to use the stride attribute of the fonts"
+#endif
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -2473,7 +2477,6 @@ static LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitma
     0x00, 0x00, 0x00, 0x14, 0xb5, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-
 /*---------------------
  *  GLYPH DESCRIPTION
  *--------------------*/
@@ -2670,7 +2673,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
  *    KERNING
  *----------------*/
 
-
 /*Map glyph_ids to kern left classes*/
 static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
@@ -3097,7 +3099,6 @@ static const int8_t kern_class_values[] = {
     0, 0, 0, 0, 0
 };
 
-
 /*Collect the kern class' data in one place*/
 static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
@@ -3152,6 +3153,10 @@ lv_font_t lv_font_benchmark_montserrat_18_aligned = {
     .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
     .line_height = 21,          /*The maximum line height required by the font*/
     .base_line = 4,             /*Baseline measured from the bottom of the line*/
+#if LV_VERSION_CHECK(9, 6, 0) || LVGL_VERSION_MAJOR >= 10
+    .cap_height = 13,           /*Cap height of the font*/
+    .x_height = 10,               /*x-height of the font*/
+#endif
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
@@ -3160,7 +3165,7 @@ lv_font_t lv_font_benchmark_montserrat_18_aligned = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

demos/benchmark/assets/lv_font_benchmark_montserrat_20_aligned.c

@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Size: 20 px
  * Bpp: 8
- * Opts: --no-compress --no-prefilter --bpp 8 --stride 16 --align 16 --size 20 --font Montserrat-Medium.ttf -r 0x20-0x7F,0xB0,0x2022 --font FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62189,62212,62810,63426,63650 --format lvgl -o lv_font_benchmark_montserrat_20_aligned.c --force-fast-kern-format
+ * Opts: --no-compress --no-prefilter --bpp 8 --stride 16 --align 16 --size 20 --font Montserrat-Medium.ttf -r 0x20-0x7F,0xB0,0x2022 --font FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_benchmark_montserrat_20_aligned.c --force-fast-kern-format
  ******************************************************************************/
 
 #ifdef __has_include
@@ -24,6 +24,10 @@
 
 #if LV_FONT_BENCHMARK_MONTSERRAT_20_ALIGNED
 
+#if !(LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10)
+    #error "At least LVGL v9.3 is required to use the stride attribute of the fonts"
+#endif
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -2662,7 +2666,6 @@ static LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitma
     0x00, 0x00, 0x00, 0x00, 0x5e, 0xc6, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-
 /*---------------------
  *  GLYPH DESCRIPTION
  *--------------------*/
@@ -2859,7 +2862,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
  *    KERNING
  *----------------*/
 
-
 /*Map glyph_ids to kern left classes*/
 static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
@@ -3286,7 +3288,6 @@ static const int8_t kern_class_values[] = {
     0, 0, 0, 0, 0
 };
 
-
 /*Collect the kern class' data in one place*/
 static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
@@ -3341,6 +3342,10 @@ lv_font_t lv_font_benchmark_montserrat_20_aligned = {
     .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
     .line_height = 22,          /*The maximum line height required by the font*/
     .base_line = 4,             /*Baseline measured from the bottom of the line*/
+#if LV_VERSION_CHECK(9, 6, 0) || LVGL_VERSION_MAJOR >= 10
+    .cap_height = 14,           /*Cap height of the font*/
+    .x_height = 11,               /*x-height of the font*/
+#endif
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
@@ -3349,7 +3354,7 @@ lv_font_t lv_font_benchmark_montserrat_20_aligned = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

demos/benchmark/assets/lv_font_benchmark_montserrat_24_aligned.c

@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Size: 24 px
  * Bpp: 8
- * Opts: --no-compress --no-prefilter --bpp 8 --stride 16 --align 16 --size 24 --font Montserrat-Medium.ttf -r 0x20-0x7F,0xB0,0x2022 --font FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62189,62212,62810,63426,63650 --format lvgl -o lv_font_benchmark_montserrat_24_aligned.c --force-fast-kern-format
+ * Opts: --no-compress --no-prefilter --bpp 8 --stride 16 --align 16 --size 24 --font Montserrat-Medium.ttf -r 0x20-0x7F,0xB0,0x2022 --font FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_benchmark_montserrat_24_aligned.c --force-fast-kern-format
  ******************************************************************************/
 
 #ifdef __has_include
@@ -24,6 +24,10 @@
 
 #if LV_FONT_BENCHMARK_MONTSERRAT_24_ALIGNED
 
+#if !(LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10)
+    #error "At least LVGL v9.3 is required to use the stride attribute of the fonts"
+#endif
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -3100,7 +3104,6 @@ static LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitma
     0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0xaa, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-
 /*---------------------
  *  GLYPH DESCRIPTION
  *--------------------*/
@@ -3297,7 +3300,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
  *    KERNING
  *----------------*/
 
-
 /*Map glyph_ids to kern left classes*/
 static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
@@ -3724,7 +3726,6 @@ static const int8_t kern_class_values[] = {
     0, 0, 0, 0, 0
 };
 
-
 /*Collect the kern class' data in one place*/
 static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
@@ -3779,6 +3780,10 @@ lv_font_t lv_font_benchmark_montserrat_24_aligned = {
     .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
     .line_height = 27,          /*The maximum line height required by the font*/
     .base_line = 5,             /*Baseline measured from the bottom of the line*/
+#if LV_VERSION_CHECK(9, 6, 0) || LVGL_VERSION_MAJOR >= 10
+    .cap_height = 17,           /*Cap height of the font*/
+    .x_height = 13,               /*x-height of the font*/
+#endif
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
@@ -3787,7 +3792,7 @@ lv_font_t lv_font_benchmark_montserrat_24_aligned = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

demos/benchmark/assets/lv_font_benchmark_montserrat_26_aligned.c

@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Size: 26 px
  * Bpp: 8
- * Opts: --no-compress --no-prefilter --bpp 8 --stride 16 --align 16 --size 26 --font Montserrat-Medium.ttf -r 0x20-0x7F,0xB0,0x2022 --font FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62189,62212,62810,63426,63650 --format lvgl -o lv_font_benchmark_montserrat_26_aligned.c --force-fast-kern-format
+ * Opts: --no-compress --no-prefilter --bpp 8 --stride 16 --align 16 --size 26 --font Montserrat-Medium.ttf -r 0x20-0x7F,0xB0,0x2022 --font FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_benchmark_montserrat_26_aligned.c --force-fast-kern-format
  ******************************************************************************/
 
 #ifdef __has_include
@@ -24,6 +24,10 @@
 
 #if LV_FONT_BENCHMARK_MONTSERRAT_26_ALIGNED
 
+#if !(LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10)
+    #error "At least LVGL v9.3 is required to use the stride attribute of the fonts"
+#endif
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -3312,7 +3316,6 @@ static LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitma
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-
 /*---------------------
  *  GLYPH DESCRIPTION
  *--------------------*/
@@ -3509,7 +3512,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
  *    KERNING
  *----------------*/
 
-
 /*Map glyph_ids to kern left classes*/
 static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
@@ -3936,7 +3938,6 @@ static const int8_t kern_class_values[] = {
     0, 0, 0, 0, 0
 };
 
-
 /*Collect the kern class' data in one place*/
 static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
@@ -3991,6 +3992,10 @@ lv_font_t lv_font_benchmark_montserrat_26_aligned = {
     .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
     .line_height = 29,          /*The maximum line height required by the font*/
     .base_line = 5,             /*Baseline measured from the bottom of the line*/
+#if LV_VERSION_CHECK(9, 6, 0) || LVGL_VERSION_MAJOR >= 10
+    .cap_height = 18,           /*Cap height of the font*/
+    .x_height = 14,               /*x-height of the font*/
+#endif
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
@@ -3999,7 +4004,7 @@ lv_font_t lv_font_benchmark_montserrat_26_aligned = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

scripts/generators/built_in_font/built_in_font_gen.py

@@ -37,6 +37,16 @@ parser.add_argument('-o', '--output',
 					nargs='?',
 					metavar='file',
 					help='Output file name. E.g. my_font_20.c')
+parser.add_argument('--stride',
+					type=int,
+					metavar = 'bytes',
+					nargs='?',
+					help='Align every bitmap row to this many bytes (needs LVGL v9.3+)')
+parser.add_argument('--align',
+					type=int,
+					metavar = 'bytes',
+					nargs='?',
+					help='Align the start address of every glyph to this many bytes')
 parser.add_argument('--compressed', action='store_true',
 					help='Compress the bitmaps')
 parser.add_argument('--subpx', action='store_true',
@@ -64,7 +74,12 @@ if subpx:
     cmd.append(subpx)
 if compr:
     cmd.extend(compr.split())
-cmd.extend(["--bpp", str(args.bpp), "--size", str(args.size), "--font", args.font, "-r", args.range[0]])
+cmd.extend(["--bpp", str(args.bpp)])
+if args.stride:
+    cmd.extend(["--stride", str(args.stride)])
+if args.align:
+    cmd.extend(["--align", str(args.align)])
+cmd.extend(["--size", str(args.size), "--font", args.font, "-r", args.range[0]])
 if args.symbols[0]:
     cmd.extend(args.symbols[0].split())
 cmd.extend(["--font", "FontAwesome5-Solid+Brands+Regular.woff", "-r", syms, "--format", "lvgl"])

src/font/lv_font_dejavu_16_persian_hebrew.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_DEJAVU_16_PERSIAN_HEBREW
     #define LV_FONT_DEJAVU_16_PERSIAN_HEBREW 1
 #endif
 
 #if LV_FONT_DEJAVU_16_PERSIAN_HEBREW
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -6624,7 +6624,7 @@ lv_font_t lv_font_dejavu_16_persian_hebrew = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_10.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_10
     #define LV_FONT_MONTSERRAT_10 1
 #endif
 
 #if LV_FONT_MONTSERRAT_10
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -1671,7 +1671,7 @@ lv_font_t lv_font_montserrat_10 = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_12.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_12
     #define LV_FONT_MONTSERRAT_12 1
 #endif
 
 #if LV_FONT_MONTSERRAT_12
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -1932,7 +1932,7 @@ lv_font_t lv_font_montserrat_12 = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_14.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_14
     #define LV_FONT_MONTSERRAT_14 1
 #endif
 
 #if LV_FONT_MONTSERRAT_14
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -2208,7 +2208,7 @@ lv_font_t lv_font_montserrat_14 = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_16.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_16
     #define LV_FONT_MONTSERRAT_16 1
 #endif
 
 #if LV_FONT_MONTSERRAT_16
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -2477,7 +2477,7 @@ lv_font_t lv_font_montserrat_16 = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_18.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_18
     #define LV_FONT_MONTSERRAT_18 1
 #endif
 
 #if LV_FONT_MONTSERRAT_18
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -2877,7 +2877,7 @@ lv_font_t lv_font_montserrat_18 = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_20.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_20
     #define LV_FONT_MONTSERRAT_20 1
 #endif
 
 #if LV_FONT_MONTSERRAT_20
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -3234,7 +3234,7 @@ lv_font_t lv_font_montserrat_20 = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_22.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_22
     #define LV_FONT_MONTSERRAT_22 1
 #endif
 
 #if LV_FONT_MONTSERRAT_22
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -3663,7 +3663,7 @@ lv_font_t lv_font_montserrat_22 = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_24.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_24
     #define LV_FONT_MONTSERRAT_24 1
 #endif
 
 #if LV_FONT_MONTSERRAT_24
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -4074,7 +4074,7 @@ lv_font_t lv_font_montserrat_24 = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_26.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_26
     #define LV_FONT_MONTSERRAT_26 1
 #endif
 
 #if LV_FONT_MONTSERRAT_26
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -4609,7 +4609,7 @@ lv_font_t lv_font_montserrat_26 = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_28.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_28
     #define LV_FONT_MONTSERRAT_28 1
 #endif
 
 #if LV_FONT_MONTSERRAT_28
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -5158,7 +5158,7 @@ lv_font_t lv_font_montserrat_28 = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_28_compressed.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_28_COMPRESSED
     #define LV_FONT_MONTSERRAT_28_COMPRESSED 1
 #endif
 
 #if LV_FONT_MONTSERRAT_28_COMPRESSED
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -3288,7 +3288,7 @@ lv_font_t lv_font_montserrat_28_compressed = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 0,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_30.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_30
     #define LV_FONT_MONTSERRAT_30 1
 #endif
 
 #if LV_FONT_MONTSERRAT_30
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -5740,7 +5740,7 @@ lv_font_t lv_font_montserrat_30 = {
     .underline_thickness = 2,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_32.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_32
     #define LV_FONT_MONTSERRAT_32 1
 #endif
 
 #if LV_FONT_MONTSERRAT_32
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -6229,7 +6229,7 @@ lv_font_t lv_font_montserrat_32 = {
     .underline_thickness = 2,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_34.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_34
     #define LV_FONT_MONTSERRAT_34 1
 #endif
 
 #if LV_FONT_MONTSERRAT_34
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -7028,7 +7028,7 @@ lv_font_t lv_font_montserrat_34 = {
     .underline_thickness = 2,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_36.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_36
     #define LV_FONT_MONTSERRAT_36 1
 #endif
 
 #if LV_FONT_MONTSERRAT_36
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -7672,7 +7672,7 @@ lv_font_t lv_font_montserrat_36 = {
     .underline_thickness = 2,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_38.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_38
     #define LV_FONT_MONTSERRAT_38 1
 #endif
 
 #if LV_FONT_MONTSERRAT_38
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -8417,7 +8417,7 @@ lv_font_t lv_font_montserrat_38 = {
     .underline_thickness = 2,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_40.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_40
     #define LV_FONT_MONTSERRAT_40 1
 #endif
 
 #if LV_FONT_MONTSERRAT_40
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -9265,7 +9265,7 @@ lv_font_t lv_font_montserrat_40 = {
     .underline_thickness = 2,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_42.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_42
     #define LV_FONT_MONTSERRAT_42 1
 #endif
 
 #if LV_FONT_MONTSERRAT_42
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -10107,7 +10107,7 @@ lv_font_t lv_font_montserrat_42 = {
     .underline_thickness = 2,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_44.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_44
     #define LV_FONT_MONTSERRAT_44 1
 #endif
 
 #if LV_FONT_MONTSERRAT_44
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -10933,7 +10933,7 @@ lv_font_t lv_font_montserrat_44 = {
     .underline_thickness = 2,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_46.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_46
     #define LV_FONT_MONTSERRAT_46 1
 #endif
 
 #if LV_FONT_MONTSERRAT_46
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -11885,7 +11885,7 @@ lv_font_t lv_font_montserrat_46 = {
     .underline_thickness = 2,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_48.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_48
     #define LV_FONT_MONTSERRAT_48 1
 #endif
 
 #if LV_FONT_MONTSERRAT_48
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -12586,7 +12586,7 @@ lv_font_t lv_font_montserrat_48 = {
     .underline_thickness = 2,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_montserrat_8.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_MONTSERRAT_8
     #define LV_FONT_MONTSERRAT_8 1
 #endif
 
 #if LV_FONT_MONTSERRAT_8
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -1457,7 +1457,7 @@ lv_font_t lv_font_montserrat_8 = {
     .underline_thickness = 0,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_source_han_sans_sc_14_cjk.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_SOURCE_HAN_SANS_SC_14_CJK
     #define LV_FONT_SOURCE_HAN_SANS_SC_14_CJK 1
 #endif
 
 #if LV_FONT_SOURCE_HAN_SANS_SC_14_CJK
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -20915,7 +20915,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
  *    KERNING
  *----------------*/
 
-
 /*Map glyph_ids to kern left classes*/
 static const uint8_t kern_left_class_mapping[] = {
     0, 0, 0, 1, 0, 0, 0, 0,
@@ -24030,7 +24029,7 @@ lv_font_t lv_font_source_han_sans_sc_14_cjk = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_source_han_sans_sc_16_cjk.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_SOURCE_HAN_SANS_SC_16_CJK
     #define LV_FONT_SOURCE_HAN_SANS_SC_16_CJK 1
 #endif
 
 #if LV_FONT_SOURCE_HAN_SANS_SC_16_CJK
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -24631,7 +24631,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
  *    KERNING
  *----------------*/
 
-
 /*Map glyph_ids to kern left classes*/
 static const uint8_t kern_left_class_mapping[] = {
     0, 0, 0, 1, 0, 0, 0, 0,
@@ -27746,7 +27745,7 @@ lv_font_t lv_font_source_han_sans_sc_16_cjk = {
     .underline_thickness = 1,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_unscii_16.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_UNSCII_16
     #define LV_FONT_UNSCII_16 1
 #endif
 
 #if LV_FONT_UNSCII_16
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -662,7 +662,7 @@ lv_font_t lv_font_unscii_16 = {
     .underline_thickness = 0,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif
 

src/font/lv_font_unscii_8.c

@@ -18,14 +18,14 @@
     #include "../../lvgl.h"
 #endif
 
-
-
 #ifndef LV_FONT_UNSCII_8
     #define LV_FONT_UNSCII_8 1
 #endif
 
 #if LV_FONT_UNSCII_8
 
+
+
 /*-----------------
  *    BITMAPS
  *----------------*/
@@ -498,7 +498,7 @@ lv_font_t lv_font_unscii_8 = {
     .underline_thickness = 0,
 #endif
 
-#if LV_VERSION_CHECK(9, 3, 0)
+#if LV_VERSION_CHECK(9, 3, 0) || LVGL_VERSION_MAJOR >= 10
     .static_bitmap = 1,    /*Bitmaps are stored as const so they are always static if not compressed */
 #endif