--- lbbs/src/lml.c 2025/06/03 01:26:52 1.4 +++ lbbs/src/lml.c 2025/06/14 10:03:32 1.8 @@ -66,16 +66,15 @@ static int lml_tag_color_filter(const ch #define LML_TAG_QUOTE_LEVEL_LOOP 3 static const char *lml_tag_quote_color[] = { - "\033[33m", - "\033[32m", - "\033[35m", + "\033[33m", // yellow + "\033[32m", // green + "\033[35m", // magenta }; static int lml_tag_quote_level = 0; static int lml_tag_quote_filter(const char *tag_name, const char *tag_param_buf, char *tag_output_buf, size_t tag_output_buf_len) { - if (strcasecmp(tag_name, "quote") == 0) { if (lml_tag_quote_level <= LML_TAG_QUOTE_MAX_LEVEL) @@ -90,14 +89,8 @@ static int lml_tag_quote_filter(const ch { lml_tag_quote_level--; } - if (lml_tag_quote_level > 0) - { - return snprintf(tag_output_buf, tag_output_buf_len, lml_tag_quote_color[lml_tag_quote_level % LML_TAG_QUOTE_LEVEL_LOOP]); - } - else - { - return snprintf(tag_output_buf, tag_output_buf_len, "\033[m"); - } + return snprintf(tag_output_buf, tag_output_buf_len, + (lml_tag_quote_level > 0 ? lml_tag_quote_color[lml_tag_quote_level % LML_TAG_QUOTE_LEVEL_LOOP] : "\033[m")); } return 0; @@ -106,18 +99,18 @@ static int lml_tag_quote_filter(const ch const static char *LML_tag_def[][3] = { {"left", "[", ""}, {"right", "]", NULL}, - {"bold", "\033[1m", ""}, - {"/bold", "\033[21m", NULL}, + {"bold", "\033[1m", ""}, // does not work in Fterm + {"/bold", "\033[22m", NULL}, {"b", "\033[1m", ""}, - {"/b", "\033[21m", NULL}, - {"italic", "\033[3m", ""}, - {"/italic", "\033[23m", NULL}, - {"i", "\033[3m", ""}, - {"/i", "\033[23m", NULL}, + {"/b", "\033[22m", NULL}, + {"italic", "\033[5m", ""}, // use blink instead + {"/italic", "\033[m", NULL}, // \033[25m does not work in Fterm + {"i", "\033[5m", ""}, + {"/i", "\033[m", NULL}, {"underline", "\033[4m", ""}, - {"/underline", "\033[24m", NULL}, + {"/underline", "\033[m", NULL}, // \033[24m does not work in Fterm {"u", "\033[4m", ""}, - {"/u", "\033[24m", NULL}, + {"/u", "\033[m", NULL}, {"color", NULL, (const char *)lml_tag_color_filter}, {"/color", "\033[m", NULL}, {"quote", NULL, (const char *)lml_tag_quote_filter}, @@ -168,6 +161,8 @@ int lml_plain(const char *str_in, char * int tag_end_pos = -1; int tag_param_pos = -1; int tag_output_len; + int new_line = 1; + int fb_quote_level = 0; lml_init(); @@ -175,6 +170,83 @@ int lml_plain(const char *str_in, char * for (i = 0; str_in[i] != '\0'; i++) { + if (new_line) + { + if (fb_quote_level > 0) + { + lml_tag_quote_level -= fb_quote_level; + + tag_output_len = snprintf(tag_output_buf, LML_TAG_OUTPUT_BUF_LEN, + (lml_tag_quote_level > 0 ? lml_tag_quote_color[lml_tag_quote_level % LML_TAG_QUOTE_LEVEL_LOOP] : "\033[m")); + if (j + tag_output_len >= buf_len) + { + log_error("Buffer is not longer enough for output string %d >= %d\n", j + tag_output_len, buf_len); + str_out[j] = '\0'; + return j; + } + memcpy(str_out + j, tag_output_buf, (size_t)tag_output_len); + j += tag_output_len; + + fb_quote_level = 0; + } + + while (str_in[i + fb_quote_level * 2] == ':' && str_in[i + fb_quote_level * 2 + 1] == ' ') // FB2000 quote leading str + { + fb_quote_level++; + } + + if (fb_quote_level > 0) + { + lml_tag_quote_level += fb_quote_level; + + tag_output_len = snprintf(tag_output_buf, LML_TAG_OUTPUT_BUF_LEN, + lml_tag_quote_color[(lml_tag_quote_level) % LML_TAG_QUOTE_LEVEL_LOOP]); + if (j + tag_output_len >= buf_len) + { + log_error("Buffer is not longer enough for output string %d >= %d\n", j + tag_output_len, buf_len); + str_out[j] = '\0'; + return j; + } + memcpy(str_out + j, tag_output_buf, (size_t)tag_output_len); + j += tag_output_len; + } + + new_line = 0; + } + + if (str_in[i] == '\033' && str_in[i + 1] == '[') // Escape sequence -- copy directly + { + for (k = i + 2; str_in[k] != '\0' && str_in[k] != 'm'; k++) + ; + + if (str_in[k] == 'm') // Valid + { + if (j + (k - i + 1) >= buf_len) + { + log_error("Buffer is not longer enough for output string %d >= %d\n", j + (k - i + 1), buf_len); + str_out[j] = '\0'; + return j; + } + memcpy(str_out + j, str_in + i, (size_t)(k - i + 1)); + i = k; + continue; + } + else // reach end of string + { + break; + } + } + + if (str_in[i] == '\n') + { + tag_start_pos = -1; // jump out of tag at end of line + new_line = 1; + } + else if (str_in[i] == '\r') + { + continue; // ignore '\r' + } + if (str_in[i] == '[') { tag_start_pos = i + 1; @@ -221,9 +293,9 @@ int lml_plain(const char *str_in, char * tag_output_len = ((lml_tag_filter_cb)LML_tag_def[k][2])( LML_tag_def[k][0], tag_param_buf, tag_output_buf, LML_TAG_OUTPUT_BUF_LEN); } - if (j + tag_output_len >= buf_len - 1) + if (j + tag_output_len >= buf_len) { - log_error("Buffer is not longer enough for output string %d >= %d\n", j + tag_output_len, buf_len - 1); + log_error("Buffer is not longer enough for output string %d >= %d\n", j + tag_output_len, buf_len); str_out[j] = '\0'; return j; } @@ -244,9 +316,9 @@ int lml_plain(const char *str_in, char * { if (str_in[i] < 0 || str_in[i] > 127) // GBK chinese character { - if (j + 2 >= buf_len - 1) + if (j + 2 >= buf_len) { - log_error("Buffer is not longer enough for output string %ld >= %d\n", j + 2, buf_len - 1); + log_error("Buffer is not longer enough for output string %ld >= %d\n", j + 2, buf_len); str_out[j] = '\0'; return j; } @@ -258,9 +330,9 @@ int lml_plain(const char *str_in, char * } } - if (j + 1 >= buf_len - 1) + if (j + 1 >= buf_len) { - log_error("Buffer is not longer enough for output string %ld >= %d\n", j + 1, buf_len - 1); + log_error("Buffer is not longer enough for output string %ld >= %d\n", j + 1, buf_len); str_out[j] = '\0'; return j; } @@ -272,7 +344,20 @@ int lml_plain(const char *str_in, char * } } + if (lml_tag_quote_level > 0) + { + tag_output_len = snprintf(tag_output_buf, LML_TAG_OUTPUT_BUF_LEN, "\033[m"); + if (j + tag_output_len >= buf_len) + { + log_error("Buffer is not longer enough for output string %d >= %d\n", j + tag_output_len, buf_len); + str_out[j] = '\0'; + return j; + } + memcpy(str_out + j, tag_output_buf, (size_t)tag_output_len); + j += tag_output_len; + } + str_out[j] = '\0'; return j; -} \ No newline at end of file +}