From b971b1916cb6c19a1d8dfb62910a19e7687bb138 Mon Sep 17 00:00:00 2001 From: "METANEOCORTEX\\Kotti" Date: Mon, 3 Oct 2022 15:29:58 +0200 Subject: [PATCH] +enh: more powerful "Modify Lines" feature (using tinyexpr) --- language/np3_af_za/dialogs_af_za.rc | 12 +- language/np3_be_by/dialogs_be_by.rc | 12 +- language/np3_de_de/dialogs_de_de.rc | 12 +- language/np3_el_gr/dialogs_el_gr.rc | 12 +- language/np3_en_gb/dialogs_en_gb.rc | 12 +- language/np3_en_us/dialogs_en_us.rc | 12 +- language/np3_es_es/dialogs_es_es.rc | 12 +- language/np3_es_mx/dialogs_es_mx.rc | 12 +- language/np3_fr_fr/dialogs_fr_fr.rc | 12 +- language/np3_hi_in/dialogs_hi_in.rc | 12 +- language/np3_hu_hu/dialogs_hu_hu.rc | 12 +- language/np3_id_id/dialogs_id_id.rc | 12 +- language/np3_it_it/dialogs_it_it.rc | 12 +- language/np3_ja_jp/dialogs_ja_jp.rc | 12 +- language/np3_ko_kr/dialogs_ko_kr.rc | 12 +- language/np3_nl_nl/dialogs_nl_nl.rc | 12 +- language/np3_pl_pl/dialogs_pl_pl.rc | 12 +- language/np3_pt_br/dialogs_pt_br.rc | 12 +- language/np3_pt_pt/dialogs_pt_pt.rc | 12 +- language/np3_ru_ru/dialogs_ru_ru.rc | 12 +- language/np3_sk_sk/dialogs_sk_sk.rc | 12 +- language/np3_sv_se/dialogs_sv_se.rc | 12 +- language/np3_tr_tr/dialogs_tr_tr.rc | 12 +- language/np3_vi_vn/dialogs_vi_vn.rc | 12 +- language/np3_zh_cn/dialogs_zh_cn.rc | 12 +- language/np3_zh_tw/dialogs_zh_tw.rc | 12 +- src/Edit.c | 320 +++++++++++++++------------- src/Helpers.h | 3 + src/tinyexpr/tinyexpr.c | 9 +- 29 files changed, 332 insertions(+), 312 deletions(-) diff --git a/language/np3_af_za/dialogs_af_za.rc b/language/np3_af_za/dialogs_af_za.rc index f04042bcb..7185c984b 100644 --- a/language/np3_af_za/dialogs_af_za.rc +++ b/language/np3_af_za/dialogs_af_za.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,125,7,50,14 PUSHBUTTON "Kanselleer",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Dokumenlynnommer.",IDC_STATIC3,57,72,150,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Deurlopende nommer.",IDC_STATIC4,57,82,150,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Deurlopende nommer (nul-gebaseer).",IDC_STATIC5,57,92,150,8 END diff --git a/language/np3_be_by/dialogs_be_by.rc b/language/np3_be_by/dialogs_be_by.rc index 3f9a4c79c..7a40a219c 100644 --- a/language/np3_be_by/dialogs_be_by.rc +++ b/language/np3_be_by/dialogs_be_by.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,126,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,153,7,50,14 PUSHBUTTON "Скасаваць",IDCANCEL,153,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Нумар радка дакумента",IDC_STATIC3,57,72,83,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Паслядоўны лік",IDC_STATIC4,57,82,54,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Паслядоўны лік (з нуля)",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc index da6e57a7c..a26330637 100644 --- a/language/np3_de_de/dialogs_de_de.rc +++ b/language/np3_de_de/dialogs_de_de.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,125,7,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Document Zeilen-Nummer.",IDC_STATIC3,57,72,120,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Fortlaufend (mit 1 beginnend).",IDC_STATIC4,57,82,120,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Fortlaufende (mit 0 beginnend).",IDC_STATIC5,57,92,120,8 END diff --git a/language/np3_el_gr/dialogs_el_gr.rc b/language/np3_el_gr/dialogs_el_gr.rc index 2353cf2d6..d83acdc08 100644 --- a/language/np3_el_gr/dialogs_el_gr.rc +++ b/language/np3_el_gr/dialogs_el_gr.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "&Εντάξει",IDOK,125,7,50,14 PUSHBUTTON "Ά&κυρο",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Αριθμός γραμμής εγγράφου.",IDC_STATIC3,57,72,100,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Συνεχείς αριθμοί (με αρχή το 1).",IDC_STATIC4,57,82,100,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Συνεχείς αριθμοί (με αρχή το 0).",IDC_STATIC5,57,92,100,8 END diff --git a/language/np3_en_gb/dialogs_en_gb.rc b/language/np3_en_gb/dialogs_en_gb.rc index 5363142fb..ccfb2f35e 100644 --- a/language/np3_en_gb/dialogs_en_gb.rc +++ b/language/np3_en_gb/dialogs_en_gb.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,125,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Document line number.",IDC_STATIC3,57,72,74,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Continuous number.",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Continuous number (zero-based).",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_en_us/dialogs_en_us.rc b/language/np3_en_us/dialogs_en_us.rc index f6d221afe..60706e9d4 100644 --- a/language/np3_en_us/dialogs_en_us.rc +++ b/language/np3_en_us/dialogs_en_us.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,125,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Document line number.",IDC_STATIC3,57,72,74,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Continuous number.",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Continuous number (zero-based).",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_es_es/dialogs_es_es.rc b/language/np3_es_es/dialogs_es_es.rc index 7d66e71c2..9450d9815 100644 --- a/language/np3_es_es/dialogs_es_es.rc +++ b/language/np3_es_es/dialogs_es_es.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "Aceptar",IDOK,125,7,50,14 PUSHBUTTON "Cancelar",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Número de línea del documento.",IDC_STATIC3,57,72,120,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Números contínuos.",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Números contínuos (base cero).",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_es_mx/dialogs_es_mx.rc b/language/np3_es_mx/dialogs_es_mx.rc index b9381a0c4..29b58c8a4 100644 --- a/language/np3_es_mx/dialogs_es_mx.rc +++ b/language/np3_es_mx/dialogs_es_mx.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "Aceptar",IDOK,125,7,50,14 PUSHBUTTON "Cancelar",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Número de línea del documento.",IDC_STATIC3,57,72,120,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Números contínuos.",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Números contínuos (base cero).",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc index 6a3d03e24..602b6b8c1 100644 --- a/language/np3_fr_fr/dialogs_fr_fr.rc +++ b/language/np3_fr_fr/dialogs_fr_fr.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,125,7,50,14 PUSHBUTTON "Annuler",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Numéro de ligne du document.",IDC_STATIC3,57,72,94,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Numéros Continus.",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Numéros Continus (base zéro).",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_hi_in/dialogs_hi_in.rc b/language/np3_hi_in/dialogs_hi_in.rc index ee2f6ba3d..29a3fe346 100644 --- a/language/np3_hi_in/dialogs_hi_in.rc +++ b/language/np3_hi_in/dialogs_hi_in.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "सही है",IDOK,125,7,50,14 PUSHBUTTON "रद्द करें",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "दस्तावेज़ रेखा संख्या",IDC_STATIC3,57,72,74,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "अनवरत संख्या",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "अनवरत संख्या (शून्य-आधारित)",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_hu_hu/dialogs_hu_hu.rc b/language/np3_hu_hu/dialogs_hu_hu.rc index 6a84ea966..b4cd81866 100644 --- a/language/np3_hu_hu/dialogs_hu_hu.rc +++ b/language/np3_hu_hu/dialogs_hu_hu.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,125,7,50,14 PUSHBUTTON "Mégsem",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Dokumentum sorok száma.",IDC_STATIC3,57,72,94,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Folytatólagos szám.",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Folytatólagos szám (nullától).",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_id_id/dialogs_id_id.rc b/language/np3_id_id/dialogs_id_id.rc index 7aa2dd101..b08a65f08 100644 --- a/language/np3_id_id/dialogs_id_id.rc +++ b/language/np3_id_id/dialogs_id_id.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,125,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Document line number.",IDC_STATIC3,57,72,74,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Continuous number.",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Continuous number (zero-based).",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_it_it/dialogs_it_it.rc b/language/np3_it_it/dialogs_it_it.rc index f028ba06e..c666bc1f7 100644 --- a/language/np3_it_it/dialogs_it_it.rc +++ b/language/np3_it_it/dialogs_it_it.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,125,7,50,14 PUSHBUTTON "Annulla",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Numero riga doc.",IDC_STATIC3,57,72,74,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Numerazione continua.",IDC_STATIC4,57,82,80,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Numerazione continua (base zero).",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_ja_jp/dialogs_ja_jp.rc b/language/np3_ja_jp/dialogs_ja_jp.rc index 11dc2ebce..6cd9b1aeb 100644 --- a/language/np3_ja_jp/dialogs_ja_jp.rc +++ b/language/np3_ja_jp/dialogs_ja_jp.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,125,7,50,14 PUSHBUTTON "キャンセル",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "文書内の行番号",IDC_STATIC3,57,72,74,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "1ずつ増加",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "1ずつ増加 (0で開始)",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_ko_kr/dialogs_ko_kr.rc b/language/np3_ko_kr/dialogs_ko_kr.rc index 7064d86c0..1b813dafc 100644 --- a/language/np3_ko_kr/dialogs_ko_kr.rc +++ b/language/np3_ko_kr/dialogs_ko_kr.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "확인",IDOK,125,7,50,14 PUSHBUTTON "취소",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,15,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,20,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,15,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,20,8 LTEXT "문서 줄 번호.",IDC_STATIC3,57,72,109,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,20,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,20,8 LTEXT "연속 번호.",IDC_STATIC4,57,82,109,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,15,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,20,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,15,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,20,8 LTEXT "연속 번호 (0부터).",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_nl_nl/dialogs_nl_nl.rc b/language/np3_nl_nl/dialogs_nl_nl.rc index 938d1a4a5..9e0e51302 100644 --- a/language/np3_nl_nl/dialogs_nl_nl.rc +++ b/language/np3_nl_nl/dialogs_nl_nl.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,125,7,50,14 PUSHBUTTON "Annuleren",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Document regelnummer.",IDC_STATIC3,57,72,74,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Doorlopende nummers.",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Doorlopende nummers (vanaf nul).",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_pl_pl/dialogs_pl_pl.rc b/language/np3_pl_pl/dialogs_pl_pl.rc index 663b1c2e3..1517d5a6a 100644 --- a/language/np3_pl_pl/dialogs_pl_pl.rc +++ b/language/np3_pl_pl/dialogs_pl_pl.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,125,7,50,14 PUSHBUTTON "Anuluj",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Numer wiersza dokumentu.",IDC_STATIC3,57,72,74,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Liczba ciągła.",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Liczba ciągła (oparte na zerze)",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_pt_br/dialogs_pt_br.rc b/language/np3_pt_br/dialogs_pt_br.rc index e67d99072..497a877f5 100644 --- a/language/np3_pt_br/dialogs_pt_br.rc +++ b/language/np3_pt_br/dialogs_pt_br.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,125,7,50,14 PUSHBUTTON "Cancelar",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Número da linha do documento.",IDC_STATIC3,57,72,100,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Número contínuo.",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Número contínuo (base-zero).",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_pt_pt/dialogs_pt_pt.rc b/language/np3_pt_pt/dialogs_pt_pt.rc index c9592c5a2..e99d01365 100644 --- a/language/np3_pt_pt/dialogs_pt_pt.rc +++ b/language/np3_pt_pt/dialogs_pt_pt.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,125,7,50,14 PUSHBUTTON "Cancelar",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Número da linha do documento.",IDC_STATIC3,57,72,109,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Número contínuo.",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Número contínuo (base zero).",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_ru_ru/dialogs_ru_ru.rc b/language/np3_ru_ru/dialogs_ru_ru.rc index c7e9c38ef..56a17f5f0 100644 --- a/language/np3_ru_ru/dialogs_ru_ru.rc +++ b/language/np3_ru_ru/dialogs_ru_ru.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,126,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,153,7,50,14 PUSHBUTTON "Отмена",IDCANCEL,153,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Номер строки документа",IDC_STATIC3,57,72,86,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Последовательное число",IDC_STATIC4,57,82,87,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Последовательное число (с нуля)",IDC_STATIC5,57,92,116,8 END diff --git a/language/np3_sk_sk/dialogs_sk_sk.rc b/language/np3_sk_sk/dialogs_sk_sk.rc index 58960bf1f..c744f3755 100644 --- a/language/np3_sk_sk/dialogs_sk_sk.rc +++ b/language/np3_sk_sk/dialogs_sk_sk.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,125,7,50,14 PUSHBUTTON "Zrušiť",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Číslo riadku dokumentu.",IDC_STATIC3,57,72,74,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Kontinuálne číslovanie.",IDC_STATIC4,57,82,77,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Kontinuálne číslovanie (so základom nula).",IDC_STATIC5,57,92,77,16 END diff --git a/language/np3_sv_se/dialogs_sv_se.rc b/language/np3_sv_se/dialogs_sv_se.rc index a48d2ef14..419b2dc35 100644 --- a/language/np3_sv_se/dialogs_sv_se.rc +++ b/language/np3_sv_se/dialogs_sv_se.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,125,7,50,14 PUSHBUTTON "Avbryt",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Dokumentets radnummer.",IDC_STATIC3,57,72,98,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Löpande nummer.",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Löpande nummer (nollbaserad).",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_tr_tr/dialogs_tr_tr.rc b/language/np3_tr_tr/dialogs_tr_tr.rc index da63bb4e9..b14b2b296 100644 --- a/language/np3_tr_tr/dialogs_tr_tr.rc +++ b/language/np3_tr_tr/dialogs_tr_tr.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "Tamam",IDOK,125,7,50,14 PUSHBUTTON "İptal",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Belge satır numarası.",IDC_STATIC3,57,72,74,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Sürekli numara.",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Sürekli numara (sıfırdan başlayan).",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_vi_vn/dialogs_vi_vn.rc b/language/np3_vi_vn/dialogs_vi_vn.rc index 8feb07497..13a5d842e 100644 --- a/language/np3_vi_vn/dialogs_vi_vn.rc +++ b/language/np3_vi_vn/dialogs_vi_vn.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,125,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "Document line number.",IDC_STATIC3,57,72,74,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "Continuous number.",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "Continuous number (zero-based).",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_zh_cn/dialogs_zh_cn.rc b/language/np3_zh_cn/dialogs_zh_cn.rc index fea0310a4..5b347dee4 100644 --- a/language/np3_zh_cn/dialogs_zh_cn.rc +++ b/language/np3_zh_cn/dialogs_zh_cn.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "确定",IDOK,125,7,50,14 PUSHBUTTON "取消",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "行号",IDC_STATIC3,57,72,74,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "连续的数字",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "连续的数字（从 0 开始）",IDC_STATIC5,57,92,109,8 END diff --git a/language/np3_zh_tw/dialogs_zh_tw.rc b/language/np3_zh_tw/dialogs_zh_tw.rc index 9fa575c55..8af81976b 100644 --- a/language/np3_zh_tw/dialogs_zh_tw.rc +++ b/language/np3_zh_tw/dialogs_zh_tw.rc @@ -521,14 +521,14 @@ BEGIN EDITTEXT IDC_MODLNS_ED_APPEND,7,48,98,14,ES_AUTOHSCROLL DEFPUSHBUTTON "確定",IDOK,125,7,50,14 PUSHBUTTON "取消",IDCANCEL,125,24,50,14 - LTEXT "$(L)",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 - LTEXT "$(0L)",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 + LTEXT "${L}",IDC_MODLNS_DOCLN_CANONIC,7,72,14,8 + LTEXT "${0L}",IDC_MODLNS_DOCLN_ZEROFLD,30,72,18,8 LTEXT "行號",IDC_STATIC3,57,72,74,8 - LTEXT "$(N)",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 - LTEXT "$(0N)",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 + LTEXT "${N}",IDC_MODLNS_CNTLN1_CANONIC,7,82,15,8 + LTEXT "${0N}",IDC_MODLNS_CNTLN1_ZEROFLD,30,82,19,8 LTEXT "連續的數字",IDC_STATIC4,57,82,66,8 - LTEXT "$(I)",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 - LTEXT "$(0I)",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 + LTEXT "${I}",IDC_MODLNS_CNTLN0_CANONIC,7,92,13,8 + LTEXT "${0I}",IDC_MODLNS_CNTLN0_ZEROFLD,30,92,17,8 LTEXT "連續的數字（從 0 開始）",IDC_STATIC5,57,92,109,8 END diff --git a/src/Edit.c b/src/Edit.c index 378a61f47..ab243ade9 100644 --- a/src/Edit.c +++ b/src/Edit.c @@ -3029,213 +3029,219 @@ void EditCopyMultiSelection(HWND hwnd) { // void EditModifyLines(const PENCLOSESELDATA pEnclData) { + #define EXPR_BEG "${" + #define EXPR_BEG0 "${0" + #define EXPR_END "}" + if (Sci_IsMultiOrRectangleSelection()) { InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_SELRECTORMULTI); return; } - char mszPrefix1[256 * 3] = { '\0' }; - char mszAppend1[256 * 3] = { '\0' }; - - DocPos iSelStart = SciCall_GetSelectionStart(); - DocPos iSelEnd = SciCall_GetSelectionEnd(); + char mszPrefix1[ENCLDATA_SIZE * 3] = { '\0' }; + char mszAppend1[ENCLDATA_SIZE * 3] = { '\0' }; + // No UTF-8 multi-byte character will have a string terminator byte ('\0'), so handle as char if (StrIsNotEmpty(pEnclData->pwsz1)) { - WideCharToMultiByteEx(Encoding_SciCP, 0, pEnclData->pwsz1, -1, mszPrefix1, COUNTOF(mszPrefix1), NULL, NULL); + WideCharToMultiByteEx(Encoding_SciCP, 0, pEnclData->pwsz1, -1, mszPrefix1, COUNTOF(mszPrefix1), NULL, NULL); } if (StrIsNotEmpty(pEnclData->pwsz2)) { WideCharToMultiByteEx(Encoding_SciCP, 0, pEnclData->pwsz2, -1, mszAppend1, COUNTOF(mszAppend1), NULL, NULL); } + DocPos const iSelStart = SciCall_GetSelectionStart(); + DocPos const iSelEnd = SciCall_GetSelectionEnd(); DocLn iLineStart = SciCall_LineFromPosition(iSelStart); DocLn iLineEnd = SciCall_LineFromPosition(iSelEnd); - //if (iSelStart > SciCall_PositionFromLine(iLineStart)) // iLineStart++; - if (iSelEnd <= SciCall_PositionFromLine(iLineEnd)) { if ((iLineEnd - iLineStart) >= 1) { --iLineEnd; } } - bool bPrefixNum = false; - DocLn iPrefixNum = 0; - int iPrefixNumWidth = 1; - DocLn iAppendNum = 0; - int iAppendNumWidth = 1; char pszPrefixNumPad[2] = { '\0', '\0' }; char pszAppendNumPad[2] = { '\0', '\0' }; - char mszPrefix2[256 * 3] = { '\0' }; - char mszAppend2[256 * 3] = { '\0' }; + char mszPrefix2[ENCLDATA_SIZE * 3] = { '\0' }; + char mszAppend2[ENCLDATA_SIZE * 3] = { '\0' }; + char mszTinyExprPre[ENCLDATA_SIZE] = { '\0' }; + char mszTinyExprPost[ENCLDATA_SIZE] = { '\0' }; + + bool bPrefixNum = false; if (!StrIsEmptyA(mszPrefix1)) { - char* p = StrStrA(mszPrefix1, "$("); + char* p = StrStrA(mszPrefix1, EXPR_BEG); while (!bPrefixNum && p) { - - if (StrCmpNA(p, "$(I)", CONSTSTRGLEN("$(I)")) == 0) { - *p = 0; - StringCchCopyA(mszPrefix2, COUNTOF(mszPrefix2), p + CONSTSTRGLEN("$(I)")); + char* q = p + CONSTSTRGLEN(EXPR_BEG); + char* t = q; + q = StrStrA(q, EXPR_END); + if (q) { bPrefixNum = true; - iPrefixNum = 0; - for (DocLn i = iLineEnd - iLineStart; i >= 10; i = i / 10) { - iPrefixNumWidth++; + pszPrefixNumPad[0] = StrStrA(p, EXPR_BEG0) ? '0' : '\0'; + if (pszPrefixNumPad[0] == '0') { + ++t; } - pszPrefixNumPad[0] = '\0'; + *q = '\0'; // terminate tinyexpr + StringCchCopyA(mszTinyExprPre, COUNTOF(mszTinyExprPre), t); + StringCchCopyA(mszPrefix2, COUNTOF(mszPrefix2), q + CONSTSTRGLEN(EXPR_END)); + *p = '\0'; // mszPrefix1 terminate + p = StrStrA(q, EXPR_BEG); // next } - - else if (StrCmpNA(p, "$(0I)", CONSTSTRGLEN("$(0I)")) == 0) { - *p = 0; - StringCchCopyA(mszPrefix2, COUNTOF(mszPrefix2), p + CONSTSTRGLEN("$(0I)")); - bPrefixNum = true; - iPrefixNum = 0; - for (DocLn i = iLineEnd - iLineStart; i >= 10; i = i / 10) { - iPrefixNumWidth++; - } - pszPrefixNumPad[0] = '0'; + else { + p = NULL; // err } - - else if (StrCmpNA(p, "$(N)", CONSTSTRGLEN("$(N)")) == 0) { - *p = 0; - StringCchCopyA(mszPrefix2, COUNTOF(mszPrefix2), p + CONSTSTRGLEN("$(N)")); - bPrefixNum = true; - iPrefixNum = 1; - for (DocLn i = iLineEnd - iLineStart + 1; i >= 10; i = i / 10) { - iPrefixNumWidth++; - } - pszPrefixNumPad[0] = '\0'; - } - - else if (StrCmpNA(p, "$(0N)", CONSTSTRGLEN("$(0N)")) == 0) { - *p = 0; - StringCchCopyA(mszPrefix2, COUNTOF(mszPrefix2), p + CONSTSTRGLEN("$(0N)")); - bPrefixNum = true; - iPrefixNum = 1; - for (DocLn i = iLineEnd - iLineStart + 1; i >= 10; i = i / 10) { - iPrefixNumWidth++; - } - pszPrefixNumPad[0] = '0'; - } - - else if (StrCmpNA(p, "$(L)", CONSTSTRGLEN("$(L)")) == 0) { - *p = 0; - StringCchCopyA(mszPrefix2, COUNTOF(mszPrefix2), p + CONSTSTRGLEN("$(L)")); - bPrefixNum = true; - iPrefixNum = iLineStart + 1; - for (DocLn i = iLineEnd + 1; i >= 10; i = i / 10) { - iPrefixNumWidth++; - } - pszPrefixNumPad[0] = '\0'; - } - - else if (StrCmpNA(p, "$(0L)", CONSTSTRGLEN("$(0L)")) == 0) { - *p = 0; - StringCchCopyA(mszPrefix2, COUNTOF(mszPrefix2), p + CONSTSTRGLEN("$(0L)")); - bPrefixNum = true; - iPrefixNum = iLineStart + 1; - for (DocLn i = iLineEnd + 1; i >= 10; i = i / 10) { - iPrefixNumWidth++; - } - pszPrefixNumPad[0] = '0'; - } - p += CONSTSTRGLEN("$("); - p = StrStrA(p, "$("); // next } } bool bAppendNum = false; if (!StrIsEmptyA(mszAppend1)) { - char* p = StrStrA(mszAppend1, "$("); + char* p = StrStrA(mszAppend1, EXPR_BEG); while (!bAppendNum && p) { - - if (StrCmpNA(p, "$(I)", CONSTSTRGLEN("$(I)")) == 0) { - *p = 0; - StringCchCopyA(mszAppend2, COUNTOF(mszAppend2), p + CONSTSTRGLEN("$(I)")); + char* q = p + CONSTSTRGLEN(EXPR_BEG); + char* t = q; + q = StrStrA(q, EXPR_END); + if (q) { bAppendNum = true; - iAppendNum = 0; - for (DocLn i = iLineEnd - iLineStart; i >= 10; i = i / 10) { - iAppendNumWidth++; + pszAppendNumPad[0] = StrStrA(p, EXPR_BEG0) ? '0' : '\0'; + if (pszAppendNumPad[0] == '0') { + ++t; } - pszAppendNumPad[0] = '\0'; + *q = '\0'; // terminate tinyexpr + StringCchCopyA(mszTinyExprPost, COUNTOF(mszTinyExprPost), t); + StringCchCopyA(mszAppend2, COUNTOF(mszAppend2), q + CONSTSTRGLEN(EXPR_END)); + *p = '\0'; // mszPrefix1 terminate + p = StrStrA(q, EXPR_BEG); // next } - - else if (StrCmpNA(p, "$(0I)", CONSTSTRGLEN("$(0I)")) == 0) { - *p = 0; - StringCchCopyA(mszAppend2, COUNTOF(mszAppend2), p + CONSTSTRGLEN("$(0I)")); - bAppendNum = true; - iAppendNum = 0; - for (DocLn i = iLineEnd - iLineStart; i >= 10; i = i / 10) { - iAppendNumWidth++; - } - pszAppendNumPad[0] = '0'; + else { + p = NULL; // err } - - else if (StrCmpNA(p, "$(N)", CONSTSTRGLEN("$(N)")) == 0) { - *p = 0; - StringCchCopyA(mszAppend2, COUNTOF(mszAppend2), p + CONSTSTRGLEN("$(N)")); - bAppendNum = true; - iAppendNum = 1; - for (DocLn i = iLineEnd - iLineStart + 1; i >= 10; i = i / 10) { - iAppendNumWidth++; - } - pszAppendNumPad[0] = '\0'; - } - - else if (StrCmpNA(p, "$(0N)", CONSTSTRGLEN("$(0N)")) == 0) { - *p = 0; - StringCchCopyA(mszAppend2, COUNTOF(mszAppend2), p + CONSTSTRGLEN("$(0N)")); - bAppendNum = true; - iAppendNum = 1; - for (DocLn i = iLineEnd - iLineStart + 1; i >= 10; i = i / 10) { - iAppendNumWidth++; - } - pszAppendNumPad[0] = '0'; - } - - else if (StrCmpNA(p, "$(L)", CONSTSTRGLEN("$(L)")) == 0) { - *p = 0; - StringCchCopyA(mszAppend2, COUNTOF(mszAppend2), p + CONSTSTRGLEN("$(L)")); - bAppendNum = true; - iAppendNum = iLineStart + 1; - for (DocLn i = iLineEnd + 1; i >= 10; i = i / 10) { - iAppendNumWidth++; - } - pszAppendNumPad[0] = '\0'; - } - - else if (StrCmpNA(p, "$(0L)", CONSTSTRGLEN("$(0L)")) == 0) { - *p = 0; - StringCchCopyA(mszAppend2, COUNTOF(mszAppend2), p + CONSTSTRGLEN("$(0L)")); - bAppendNum = true; - iAppendNum = iLineStart + 1; - for (DocLn i = iLineEnd + 1; i >= 10; i = i / 10) { - iAppendNumWidth++; - } - pszAppendNumPad[0] = '0'; - } - p += CONSTSTRGLEN("$("); - p = StrStrA(p, "$("); // next } } + // calculate min/max field width (assuming steadily growing or falling tinyexpr(linenum)) + + double L = 0.0, I = 0.0, N = 1.0; + te_variable vars[] = { { "L", &L }, { "I", &I }, { "N", &N } }; + + int iNumWidthPre = 1; + bool tePreOk = true; + { + int iNumMaxPre = (int)iLineEnd + 1; + te_xint_t err; + + if (tePreOk) { + L = (double)(iLineStart + 1); + I = 0.0; + N = I + 1.0; + te_expr* pExprPre = te_compile(mszTinyExprPre, vars, 3, &err); + if (pExprPre) { + iNumMaxPre = double2int(te_eval(pExprPre)); + te_free(pExprPre); + } + else { + tePreOk = false; + } + } + + if (tePreOk) { + L = (double)(iLineEnd + 1); + I = (double)(iLineEnd - iLineStart); + N = I + 1.0; + te_expr* pExprPre = te_compile(mszTinyExprPre, vars, 3, &err); + if (pExprPre) { + int const result = double2int(te_eval(pExprPre)); + iNumMaxPre = max_i(iNumMaxPre, result); + te_free(pExprPre); + } + else { + tePreOk = false; + } + } + + if (!tePreOk) { + iNumMaxPre = (int)iLineEnd + 1; + } + for (int i = iNumMaxPre; i >= 10; i = i / 10) { + ++iNumWidthPre; + } + } + + int iNumWidthPost = 1; + bool tePostOk = true; + { + int iNumMaxPost = (int)iLineEnd + 1; + te_xint_t err; + + if (tePostOk) { + L = (double)(iLineStart + 1); + I = 0.0; + N = I + 1.0; + te_expr* pExprPost = te_compile(mszTinyExprPost, vars, 3, &err); + if (pExprPost) { + iNumMaxPost = double2int(te_eval(pExprPost)); + te_free(pExprPost); + } + else { + tePostOk = false; + } + } + + if (tePostOk) { + L = (double)(iLineEnd + 1); + I = (double)(iLineEnd - iLineStart); + N = I + 1.0; + te_expr* pExprPost = te_compile(mszTinyExprPost, vars, 3, &err); + if (pExprPost) { + int const result = double2int(te_eval(pExprPost)); + iNumMaxPost = max_i(iNumMaxPost, result); + te_free(pExprPost); + } + else { + tePostOk = false; + } + } + + if (!tePostOk) { + iNumMaxPost = (int)iLineEnd + 1; + } + for (int i = iNumMaxPost; i >= 10; i = i / 10) { + ++iNumWidthPost; + } + } + + // --- generate numbering --- + UndoTransActionBegin(); - for (DocLn iLine = iLineStart; iLine <= iLineEnd; ++iLine) { + char mszInsert[(ENCLDATA_SIZE << 1) * 3] = { '\0' }; + + for (DocLn iLine = iLineStart, count = 0; iLine <= iLineEnd; ++iLine, ++count) { if (StrIsNotEmpty(pEnclData->pwsz1)) { - char mszInsert[512 * 3] = { '\0' }; StringCchCopyA(mszInsert, COUNTOF(mszInsert), mszPrefix1); if (bPrefixNum) { char tchFmt[64] = { '\0' }; char tchNum[64] = { '\0' }; - StringCchPrintfA(tchFmt, COUNTOF(tchFmt), "%%%s%ii", pszPrefixNumPad, iPrefixNumWidth); + int iPrefixNum = (int)iLine + 1; + if (tePreOk) { + L = (double)iPrefixNum; + I = (double)count; + N = I + 1.0; + te_xint_t err; + te_expr* pExprPre = te_compile(mszTinyExprPre, vars, 3, &err); + if (pExprPre) { + iPrefixNum = double2int(te_eval(pExprPre)); + te_free(pExprPre); + } + } + StringCchPrintfA(tchFmt, COUNTOF(tchFmt), "%%%s%ii", pszPrefixNumPad, iNumWidthPre); StringCchPrintfA(tchNum, COUNTOF(tchNum), tchFmt, iPrefixNum); StringCchCatA(mszInsert, COUNTOF(mszInsert), tchNum); StringCchCatA(mszInsert, COUNTOF(mszInsert), mszPrefix2); - iPrefixNum++; } DocPos const iPos = SciCall_PositionFromLine(iLine); SciCall_SetTargetRange(iPos, iPos); @@ -3244,17 +3250,27 @@ void EditModifyLines(const PENCLOSESELDATA pEnclData) { if (StrIsNotEmpty(pEnclData->pwsz2)) { - char mszInsert[512 * 3] = { '\0' }; StringCchCopyA(mszInsert, COUNTOF(mszInsert), mszAppend1); if (bAppendNum) { char tchFmt[64] = { '\0' }; char tchNum[64] = { '\0' }; - StringCchPrintfA(tchFmt, COUNTOF(tchFmt), "%%%s%ii", pszAppendNumPad, iAppendNumWidth); + int iAppendNum = (int)iLine + 1; + if (tePostOk) { + L = (double)iAppendNum; + I = (double)count; + N = I + 1.0; + te_xint_t err; + te_expr* pExprPost = te_compile(mszTinyExprPost, vars, 3, &err); + if (pExprPost) { + iAppendNum = double2int(te_eval(pExprPost)); + te_free(pExprPost); + } + } + StringCchPrintfA(tchFmt, COUNTOF(tchFmt), "%%%s%ii", pszAppendNumPad, iNumWidthPost); StringCchPrintfA(tchNum, COUNTOF(tchNum), tchFmt, iAppendNum); StringCchCatA(mszInsert, COUNTOF(mszInsert), tchNum); StringCchCatA(mszInsert, COUNTOF(mszInsert), mszAppend2); - iAppendNum++; } DocPos const iPos = SciCall_GetLineEndPosition(iLine); SciCall_SetTargetRange(iPos, iPos); diff --git a/src/Helpers.h b/src/Helpers.h index b25bc48fe..b56186f24 100644 --- a/src/Helpers.h +++ b/src/Helpers.h @@ -196,6 +196,9 @@ __forceinline DocPosU clamppu(DocPosU x, DocPosU lower, DocPosU upper) { __forceinline int float2int(const float f) { return (int)lroundf(f); } +__forceinline int double2int(const double d) { + return (int)lround(d); +} __forceinline float Round10th(const float f) { return (float)float2int(f * 10.0f) / 10; } diff --git a/src/tinyexpr/tinyexpr.c b/src/tinyexpr/tinyexpr.c index e3bf2e455..9e34b8918 100644 --- a/src/tinyexpr/tinyexpr.c +++ b/src/tinyexpr/tinyexpr.c @@ -82,7 +82,7 @@ typedef struct state { int lookup_len; } state; -#define TE_INIT_STATE { NULL, NULL, 0, 0.0, NULL, NULL, 0 } +#define TE_INIT_STATE { NULL, NULL, TOK_END, 0.0, NULL, NULL, 0 } #if defined(TINYEXPR_USE_STATIC_MEMORY) static te_expr te_expr_array[TINYEXPR_MAX_EXPRESSIONS] = {0}; @@ -430,10 +430,11 @@ void next_token(state *s) { s->type = TOK_NUMBER; } else { /* Look for a variable or builtin function call. */ - if (s->next[0] >= 'a' && s->next[0] <= 'z') { + char ch = s->next[0]; + if ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z')) { + const char * const start = s->next; - char ch = s->next[0]; - while ((ch >= 'a' && ch <= 'z') || (ch >= '0' && ch <= '9') || (ch == '_')) { + while ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') || (ch >= '0' && ch <= '9') || (ch == '_')) { s->next++; ch = s->next[0]; };