From 28e5c5b476feda4894d7e7b69ea268d16584188b Mon Sep 17 00:00:00 2001
From: JianjunLiu <cqljj123@126.com>
Date: Tue, 5 Sep 2023 09:39:44 +0800
Subject: [PATCH] Update utslmemo.tsf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修正中文符号选取问题
---
 funcext/tvclib/utslmemo.tsf | 49 +++++++++++++++++++++++++++++++------
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/funcext/tvclib/utslmemo.tsf b/funcext/tvclib/utslmemo.tsf
index 7617406..b0768d7 100644
--- a/funcext/tvclib/utslmemo.tsf
+++ b/funcext/tvclib/utslmemo.tsf
@@ -1672,12 +1672,12 @@ type TCustomMemo = class(TCustomScrollControl,TCustomMemoCmd) //
             ci++;
             break;
             end	}   
-            if ivi=0xa1 or ivi=0xa3 then //�������ķ���
-            begin
+            if if_c_sym(s,cx,ls,lx) then //�������ķ���
+            begin 
                 cx++;
                 ci--;
-                break;    
-            end          
+                break;
+            end        
             if(ivi<48)or(ivi>57 and ivi<65)or(ivi>90 and ivi<95)or(ivi>95 and ivi<97)or(ivi>122 and ivi <= 127)then
             begin
                 ci++;
@@ -1705,9 +1705,9 @@ type TCustomMemo = class(TCustomScrollControl,TCustomMemoCmd) //
             //ivi := ord(vi);
             ivi := getchar(s,cx);
             //if (ivi<=0x2f) or (ivi>122 and ivi<=127) then break;
-            if ivi=0xa1 or ivi=0xa3 then //�������ķ���
-            begin
-                break;    
+            if if_c_sym(s,cx,ls) then //�������ķ���
+            begin 
+                break;
             end               
             if(ivi<48)or(ivi>57 and ivi<65)or(ivi>90 and ivi<95)or(ivi>95 and ivi<97)or(ivi>122 and ivi <= 127)then break;
             ci++;
@@ -3045,13 +3045,21 @@ type TSynHighLighter = class(TComponent) //
             begin 
                 SetTToken(tks,ctk,idx-1);   
             end else 
+            if if_c_sym(s,idx,len) then 
+            begin 
+                SetTToken(tks,ctk,idx-1); 
+                ctk := s[idx:(idx+1)];
+                idx++;
+                SetTToken(tks,ctk,idx);             
+            end             
+            {else 
             if idx<len and( ord(vi)=0xa3 or ord(vi)=0xa1) then 
             begin
                 SetTToken(tks,ctk,idx-1); 
                 ctk := s[idx:(idx+1)];
                 idx++;
                 SetTToken(tks,ctk,idx);                 
-            end 
+            end }
             else 
             begin
                 ctk+=vi;
@@ -4301,6 +4309,31 @@ type TSynMemoNorm = class(TsynCustomMemo) //
     FSheetTabFlage;   
 end 
 Implementation
+function if_c_sym(s,idx,len,lx);//�Ƿ�Ϊ���ķ���
+begin     
+    if lx then  //����
+    begin 
+        if not(idx<=len) then  return 0; 
+        if idx<2 then return 0;
+        c1 := getchar(s,idx-1);
+        if not(c1 .& 0xa0) then return 0; 
+        c2 := getchar(s,idx);
+    end else //����
+    begin 
+        if not(idx<len ) then return 0;   
+        c1 := getchar(s,idx);
+        if not(c1 .& 0xa0) then return 0;    
+        c2 := getchar(s,idx+1);    
+    end 
+    symv := static array(161,162,163,161,163,164,163,168,163,169,161,164,161,190,161,191,163,186,161,176,161,177,161,174,163,187,161,163,163,172);
+    for i:=0 to length(symv)-1 step 2 do 
+    begin
+        if c1=symv[i] and c2=symv[i+1] then
+        begin
+            return 1;
+        end 
+    end 
+end 
 
 function CreateATslMemoUndoItem(AReason,AStart,AEnd,ChangeText,SelMode);
 begin