From b31b88717172e22b49c0493185f603b8f84989ec Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Wed, 4 Sep 2024 12:49:29 +0200 Subject: the ^EUq string building escape now respects the encoding (can insert bytes or codepoints) (refs #5) * This is trickier than it sounds because there isn't one single place to consult. It depends on the context. If the string argument relates to buffer contents - as in , , etc. - the buffer's encoding is consulted. If it goes into a register (EU), the register's encoding is consulted. Everything else (O, EN, EC, ES...) expects only Unicode codepoints. * This is communicated through a new field teco_machine_stringbuilding_t::codepage which must be set in the states' initial callback. * Seems overkill just for ^EUq, but it can be used for context-sensitive processing of all the other string building constructs as well. * ^V and ^W cannot be supported for Unicode characters for the time being without an Unicode-aware parser --- src/core-commands.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/core-commands.c') diff --git a/src/core-commands.c b/src/core-commands.c index ef4621f..a84d0ef 100644 --- a/src/core-commands.c +++ b/src/core-commands.c @@ -2494,8 +2494,7 @@ teco_state_ecommand_encoding(teco_machine_main_t *ctx, GError **error) gboolean colon_modified = teco_machine_main_eval_colon(ctx); - sptr_t old_cp = teco_interface_ssm(SCI_GETCODEPAGE, 0, 0) - ? : teco_interface_ssm(SCI_STYLEGETCHARACTERSET, STYLE_DEFAULT, 0); + guint old_cp = teco_interface_get_codepage(); if (!teco_expressions_args()) { /* get current code page */ @@ -2745,6 +2744,12 @@ teco_state_insert_initial(teco_machine_main_t *ctx, GError **error) if (ctx->mode > TECO_MODE_NORMAL) return TRUE; + /* + * Current document's encoding determines the behaviour of + * string building constructs. + */ + teco_undo_guint(ctx->expectstring.machine.codepage) = teco_interface_get_codepage(); + if (!teco_expressions_eval(FALSE, error)) return FALSE; guint args = teco_expressions_args(); -- cgit v1.2.3