feat(lv_bidi): Add set custom neutrals api

Signed-off-by: qinshijing <[email protected]>
lvgl · Apr 29, 2024 · f69015f · f69015f
1 parent 5a6f8b7
commit f69015f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/misc/lv_bidi.c b/src/misc/lv_bidi.c
@@ -64,6 +64,7 @@ static uint32_t get_txt_len(const char * txt, uint32_t max_len);
  **********************/
 static const uint8_t bracket_left[] = {"<({["};
 static const uint8_t bracket_right[] = {">)}]"};
+static char * custom_neutrals = NULL;
 
 /**********************
  * MACROS
@@ -281,6 +282,11 @@ void lv_bidi_calculate_align(lv_text_align_t * align, lv_base_dir_t * base_dir,
  }
 }
 
+void lv_bidi_set_custom_neutrals_static(const char * neutrals)
+{
+ custom_neutrals = neutrals;
+}
+
 /**********************
  * STATIC FUNCTIONS
  **********************/
@@ -365,8 +371,12 @@ static bool lv_bidi_letter_is_neutral(uint32_t letter)
 {
  uint16_t i;
  static const char neutrals[] = " \t\n\r.,:;'\"`!?%/\\-=()[]{}<>@#&$|";
- for(i = 0; neutrals[i] != '\0'; i++) {
- if(letter == (uint32_t)neutrals[i]) return true;
+ if(custom_neutrals == NULL) {
+ custom_neutrals = neutrals;
+ }
+
+ for(i = 0; custom_neutrals[i] != '\0'; i++) {
+ if(letter == (uint32_t)custom_neutrals[i]) return true;
  }
 
  return false;

diff --git a/src/misc/lv_bidi.h b/src/misc/lv_bidi.h
@@ -115,6 +115,12 @@ void _lv_bidi_process_paragraph(const char * str_in, char * str_out, uint32_t le
  */
 void lv_bidi_calculate_align(lv_text_align_t * align, lv_base_dir_t * base_dir, const char * txt);
 
+/**
+ * Set custom neutrals string
+ * @param str default " \t\n\r.,:;'\"`!?%/\\-=()[]{}<>@#&$|"
+ */
+void lv_bidi_set_custom_neutrals_static(const char * str);
+
 /**********************
  * MACROS
  **********************/