paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-10 11:56:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: partly implement handling of space followed by combining mark. Issue #41228

Browse Source
This commit is contained in:
Martin 2024-11-24 18:01:09 +01:00
parent 79be6943b5
commit ed45ec5224
7 changed files with 90 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
components/synedit/lazsyntextarea.pp
View File

@ -35,6 +35,7 @@ type
ExpandedExtraBytes: Integer; // tab and space expansion ExpandedExtraBytes: Integer; // tab and space expansion
HasTabs: Boolean; // ExtraWidth may still be 0 HasTabs: Boolean; // ExtraWidth may still be 0
HasDoubleWidth: Boolean; HasDoubleWidth: Boolean;
NeedsEto: Boolean;
NextPos: TLazSynDisplayTokenBound; // Next toxen, may be BIDI NextPos: TLazSynDisplayTokenBound; // Next toxen, may be BIDI
NextRtlInfo: TLazSynDisplayRtlInfo; NextRtlInfo: TLazSynDisplayRtlInfo;
@ -463,6 +464,7 @@ begin
ATokenInfo.ExpandedExtraBytes := 0; ATokenInfo.ExpandedExtraBytes := 0;
ATokenInfo.HasTabs := False; ATokenInfo.HasTabs := False;
ATokenInfo.HasDoubleWidth := False; // TODO: True, but needs charwidth for painter ATokenInfo.HasDoubleWidth := False; // TODO: True, but needs charwidth for painter
ATokenInfo.NeedsEto := False;
end end
else begin else begin
if ATokenInfo.NextRtlInfo.IsRtl <> FCurMarkupNextRtlInfo.IsRtl then begin if ATokenInfo.NextRtlInfo.IsRtl <> FCurMarkupNextRtlInfo.IsRtl then begin
@ -740,7 +742,7 @@ var
PrevLogicIdx, PrevPhysPos: Integer; PrevLogicIdx, PrevPhysPos: Integer;
PhysTokenStop: Integer; PhysTokenStop: Integer;
TabExtra: Integer; TabExtra: Integer;
HasTabs, HasDouble: Boolean; HasTabs, HasDouble, NeedsEto: Boolean;
begin begin
ATokenInfo.Attr := nil; ATokenInfo.Attr := nil;
while True do begin while True do begin
@ -762,6 +764,7 @@ begin
LogicEnd := LogicIdx + FCurViewToken.TokenLength; LogicEnd := LogicIdx + FCurViewToken.TokenLength;
//assert(GetCharWidthData(LogicIdx)<>0, 'GetNextHighlighterTokenFromView: Token starts with char'); //assert(GetCharWidthData(LogicIdx)<>0, 'GetNextHighlighterTokenFromView: Token starts with char');
NeedsEto := False;
case FCurViewinRTL of case FCurViewinRTL of
False: // Left To Right False: // Left To Right
begin begin
@ -812,8 +815,13 @@ begin
else else
if j > 1 then if j > 1 then
HasDouble := True; HasDouble := True;
if c = ' ' then if c = ' ' then begin
inc(TabExtra, FSpaceExtraByteCount); inc(TabExtra, FSpaceExtraByteCount);
{$IfDef WINDOWS}
if not NeedsEto then
NeedsEto := IsCombiningCodePoint(FCurViewToken.TokenStart + i + 1);
{$ENDIF}
end;
end; end;
repeat repeat
@ -851,6 +859,7 @@ begin
ATokenInfo.ExpandedExtraBytes := TabExtra; ATokenInfo.ExpandedExtraBytes := TabExtra;
ATokenInfo.HasTabs := HasTabs; ATokenInfo.HasTabs := HasTabs;
ATokenInfo.HasDoubleWidth := HasDouble; ATokenInfo.HasDoubleWidth := HasDouble;
ATokenInfo.NeedsEto := NeedsEto;
assert(ATokenInfo.StartPos.Offset >= 0, 'FCurViewScannerPos.Offset >= 0'); assert(ATokenInfo.StartPos.Offset >= 0, 'FCurViewScannerPos.Offset >= 0');
assert(ATokenInfo.EndPos.Offset <= 0, 'FCurViewToken.EndPos.Offset <= 0'); assert(ATokenInfo.EndPos.Offset <= 0, 'FCurViewToken.EndPos.Offset <= 0');
@ -937,8 +946,13 @@ begin
else else
if j > 1 then if j > 1 then
HasDouble := True; HasDouble := True;
if c = ' ' then if c = ' ' then begin
inc(TabExtra, FSpaceExtraByteCount); inc(TabExtra, FSpaceExtraByteCount);
{$IfDef WINDOWS}
if not NeedsEto then
NeedsEto := IsCombiningCodePoint(FCurViewToken.TokenStart + i + 1);
{$ENDIF}
end;
end; end;
repeat repeat
@ -979,6 +993,7 @@ begin
ATokenInfo.ExpandedExtraBytes := TabExtra; ATokenInfo.ExpandedExtraBytes := TabExtra;
ATokenInfo.HasTabs := HasTabs; ATokenInfo.HasTabs := HasTabs;
ATokenInfo.HasDoubleWidth := HasDouble; ATokenInfo.HasDoubleWidth := HasDouble;
ATokenInfo.NeedsEto := NeedsEto;
assert(ATokenInfo.StartPos.Offset >= 0, 'FCurViewScannerPos.Offset >= 0'); assert(ATokenInfo.StartPos.Offset >= 0, 'FCurViewScannerPos.Offset >= 0');
assert(ATokenInfo.EndPos.Offset <= 0, 'FCurViewToken.EndPos.Offset <= 0'); assert(ATokenInfo.EndPos.Offset <= 0, 'FCurViewToken.EndPos.Offset <= 0');
@ -1634,7 +1649,7 @@ var
end; end;
NeedExpansion := (ATokenInfo.ExpandedExtraBytes > 0) or (ATokenInfo.HasTabs); NeedExpansion := (ATokenInfo.ExpandedExtraBytes > 0) or (ATokenInfo.HasTabs);
NeedTransform := FTextDrawer.NeedsEto or ATokenInfo.HasDoubleWidth or NeedExpansion NeedTransform := FTextDrawer.NeedsEto or ATokenInfo.HasDoubleWidth or ATokenInfo.NeedsEto or NeedExpansion
{$IFDEF Windows} or ATokenInfo.RtlInfo.IsRtl {$ENDIF} {$IFDEF Windows} or ATokenInfo.RtlInfo.IsRtl {$ENDIF}
; ;
Len := ATokenInfo.Tk.TokenLength; Len := ATokenInfo.Tk.TokenLength;
@ -1663,7 +1678,7 @@ var
end; end;
// Prepare FETOBuf // Prepare FETOBuf
if FTextDrawer.NeedsEto or ATokenInfo.HasDoubleWidth if FTextDrawer.NeedsEto or ATokenInfo.HasDoubleWidth or ATokenInfo.NeedsEto
{$IFDEF Windows} or ATokenInfo.RtlInfo.IsRtl {$ENDIF} // RTL may have script with ligature {$IFDEF Windows} or ATokenInfo.RtlInfo.IsRtl {$ENDIF} // RTL may have script with ligature
then begin then begin
FEtoBuf := FTextDrawer.Eto; FEtoBuf := FTextDrawer.Eto;
@ -1705,7 +1720,9 @@ var
if FetoBuf <> nil then FEtoBuf.EtoData[e] := c; if FetoBuf <> nil then FEtoBuf.EtoData[e] := c;
inc(e); inc(e);
end; end;
if (vscTabAtLast in FVisibleSpecialChars) and ((pl-1)^=' ') and (j < CWLen) then begin if (vscTabAtLast in FVisibleSpecialChars) and ((pl-1)^=' ') and (j < CWLen) and
(not IsCombiningCodePoint(pt+1))
then begin
(pl-1)^ := #194; (pl-1)^ := #194;
pl^ := #187; inc(pl); pl^ := #187; inc(pl);
if FetoBuf <> nil then FEtoBuf.EtoData[e] := c; if FetoBuf <> nil then FEtoBuf.EtoData[e] := c;
@ -1713,7 +1730,9 @@ var
end; end;
end; end;
' ': begin ' ': begin
if (vscSpace in FVisibleSpecialChars) and (j < CWLen) then begin if (vscSpace in FVisibleSpecialChars) and (j < CWLen) and
(not IsCombiningCodePoint(pt+1))
then begin
pl^ := #194; inc(pl); pl^ := #194; inc(pl);
pl^ := #183; inc(pl); pl^ := #183; inc(pl);
end end

8
components/synedit/synbeautifier.pas
View File

@ -43,7 +43,7 @@ uses
Classes, SysUtils, Classes, SysUtils,
LazStringUtils, LazStringUtils,
SynEditMiscClasses, LazSynEditText, SynEditPointClasses, SynEditMiscClasses, LazSynEditText, SynEditPointClasses,
SynEditKeyCmds, SynEditTypes; SynEditKeyCmds, SynEditTypes, SynEditMiscProcs;
type type
@ -672,11 +672,7 @@ var
begin begin
p := PChar(Line); p := PChar(Line);
if Assigned(p) then begin if Assigned(p) then begin
Result := 0; Result := CountLeadWhiteSpace(p);
while p^ in [#1..#32] do begin
Inc(p);
Inc(Result);
end;
if Physical and (Result>0) then if Physical and (Result>0) then
Result := FCurrentLines.LogicalToPhysicalCol(Line, -1, Result+1)-1; // TODO, Need the real index of the line Result := FCurrentLines.LogicalToPhysicalCol(Line, -1, Result+1)-1; // TODO, Need the real index of the line
end else end else

16
components/synedit/synedit.pp
View File

@ -5805,9 +5805,7 @@ begin
ALine:=FTheLinesView[FBlockSelection.StartLinePos - 1]; ALine:=FTheLinesView[FBlockSelection.StartLinePos - 1];
x2:=length(ALine)+1; x2:=length(ALine)+1;
if not WithLeadSpaces then begin if not WithLeadSpaces then begin
x := FBlockSelection.StartBytePos; x := CountLeadWhiteSpace(PChar(ALine)) + 1;
while (x<length(ALine)) and (ALine[x] in [' ',#9]) do
inc(x);
FBlockSelection.StartLineBytePos := Point(x,MinMax(Value.y, 1, FTheLinesView.Count)); FBlockSelection.StartLineBytePos := Point(x,MinMax(Value.y, 1, FTheLinesView.Count));
while (x2 > x) and (ALine[X2-1] in [' ',#9]) do while (x2 > x) and (ALine[X2-1] in [' ',#9]) do
dec(x2); dec(x2);
@ -7476,7 +7474,9 @@ begin
Temp := Clipboard.AsText; Temp := Clipboard.AsText;
Helper := SelText; Helper := SelText;
if (Temp <> '') and (not (Temp[Length(Temp)] in [#10,#13, #9, #32])) and if (Temp <> '') and (not (Temp[Length(Temp)] in [#10,#13, #9, #32])) and
(not (Helper[1] in [#10,#13, #9, #32])) not( (Helper[1] in [#10,#13, #9, #32]) and
( (Length(Helper) = 1) or (not IsCombiningCodePoint(PChar(Helper)+1)))
)
then then
Temp := Temp + ' '; Temp := Temp + ' ';
Clipboard.AsText := Temp + Helper; Clipboard.AsText := Temp + Helper;
@ -9010,6 +9010,8 @@ begin
// scan over whitespaces // scan over whitespaces
while (p^ in [#9, #32]) do while (p^ in [#9, #32]) do
inc(p); inc(p);
if IsCombiningCodePoint(p) then
dec(p);
i := LogicalToPhysicalCol(PrevLine, iLine, p-@PrevLine[1]+1) - CaretX; i := LogicalToPhysicalCol(PrevLine, iLine, p-@PrevLine[1]+1) - CaretX;
end; end;
end; end;
@ -9321,7 +9323,7 @@ begin
j := 0; j := 0;
for i := 1 to FBlockTabIndent do begin for i := 1 to FBlockTabIndent do begin
i2 := fTabWidth; i2 := fTabWidth;
while (i2 > 0) and (Line[j] = #32) do begin while (i2 > 0) and IsSpaceChar(Line+j) do begin
dec(i2); dec(i2);
inc(j); inc(j);
end; end;
@ -9537,9 +9539,7 @@ begin
s := FTheLinesView[CaretXY.Y - 1]; s := FTheLinesView[CaretXY.Y - 1];
// search first non blank char pos // search first non blank char pos
FirstNonBlank := 1; FirstNonBlank := CountLeadWhiteSpace(PChar(s)) + 1;
while (FirstNonBlank <= length(s)) and (s[FirstNonBlank] in [#32, #9]) do
inc(FirstNonBlank);
if FirstNonBlank > length(s) then if FirstNonBlank > length(s) then
FirstNonBlank := -1; FirstNonBlank := -1;
end else end else

10
components/synedit/syneditmarkupfoldcoloring.pas
View File

@ -543,15 +543,11 @@ function TSynEditMarkupFoldColors.GetFirstCharacterColumn(pIndex: Integer
): TColumnCacheEntry; ): TColumnCacheEntry;
var var
l: String; l: String;
s, p: Integer; p: Integer;
begin begin
l := SynEdit.Lines[pIndex]; l := SynEdit.Lines[pIndex];
s := length(l); p := CountLeadWhiteSpace(PChar(l)) + 1;
p := 1; if p > length(l) then
while (p <= s)
//and (l[p] in [#9, #32, '/']) do inc(p);
and (l[p] in [#9, #32]) do inc(p);
if p > s then
exit(high(Result)); exit(high(Result));
Result := SynEdit.LogicalToPhysicalPos(Point(p, toPos(pIndex))).x; Result := SynEdit.LogicalToPhysicalPos(Point(p, toPos(pIndex))).x;
end; end;

9
components/synedit/syneditmarkupspecialchar.pp
View File

@ -27,7 +27,7 @@ interface
uses uses
Classes, SysUtils, Graphics, Controls, Classes, SysUtils, Graphics, Controls,
SynEditMarkup, SynEditTypes, SynEditMiscClasses; SynEditMarkup, SynEditTypes, SynEditMiscClasses, SynEditMiscProcs;
type type
@ -87,9 +87,10 @@ end;
function TSynEditMarkupSpecialChar.IsSpecial(pos: Integer): Boolean; function TSynEditMarkupSpecialChar.IsSpecial(pos: Integer): Boolean;
begin begin
if (pos < 1) or (pos > Length(FCurLine)) then exit(False); if (pos < 1) or (pos > Length(FCurLine)) then exit(False);
Result := ( (vscSpace in FVisibleSpecialChars) and (FCurLine[pos] in [' ']) ) or Result := ( ( (vscSpace in FVisibleSpecialChars) and (FCurLine[pos] in [' ']) ) or
( (FVisibleSpecialChars*[vscTabAtFirst, vscTabAtLast] <> []) and (FCurLine[pos] in [#9]) ) ( (FVisibleSpecialChars*[vscTabAtFirst, vscTabAtLast] <> []) and (FCurLine[pos] in [#9]) )
; ) and
(not IsCombiningCodePoint(PChar(FCurLine)+pos));
end; end;
constructor TSynEditMarkupSpecialChar.Create(ASynEdit : TSynEditBase); constructor TSynEditMarkupSpecialChar.Create(ASynEdit : TSynEditBase);

39
components/synedit/syneditmiscprocs.pp
View File

@ -82,6 +82,9 @@ function ToPos(AIdx: Integer): Integer; inline;
function YToIdx(APointWithYPos: TPoint): TPoint; inline; function YToIdx(APointWithYPos: TPoint): TPoint; inline;
function YToPos(APointWithYIdx: TPoint): TPoint; inline; function YToPos(APointWithYIdx: TPoint): TPoint; inline;
function IsCombiningCodePoint(const AChar: PChar): Boolean;
function IsSpaceChar(AText: PChar): Boolean; inline;
function CountLeadSpace(AText: PChar): integer; inline;
function CountLeadWhiteSpace(AText: PChar): integer; inline; function CountLeadWhiteSpace(AText: PChar): integer; inline;
function CountBackwardWhiteSpace(AText: PChar; AStart: Integer): integer; inline; function CountBackwardWhiteSpace(AText: PChar; AStart: Integer): integer; inline;
function CountLeadWhiteSpace(AText: PChar; out AnHasTab: boolean): integer; inline; function CountLeadWhiteSpace(AText: PChar; out AnHasTab: boolean): integer; inline;
@ -111,6 +114,38 @@ begin
inc(Result.Y); inc(Result.Y);
end; end;
function IsCombiningCodePoint(const AChar: PChar): Boolean;
begin
Result := (
( (AChar[0] = #$CC) ) or // Combining Diacritical Marks (belongs to previos char) 0300-036F
( (AChar[0] = #$CD) and (AChar[1] in [#$80..#$AF]) ) or // Combining Diacritical Marks
( (AChar[0] = #$D8) and (AChar[1] in [#$90..#$9A]) ) or // Arabic 0610 (d890)..061A (d89a)
( (AChar[0] = #$D9) and (AChar[1] in [#$8b..#$9f, #$B0]) ) or // Arabic 064B (d98b)..065F (d99f) // 0670 (d9b0)
( (AChar[0] = #$DB) and (AChar[1] in [#$96..#$9C, #$9F..#$A4, #$A7..#$A8, #$AA..#$AD]) ) or // Arabic 06D6 (db96).. .. ..06EA (dbaa)
( (AChar[0] = #$E0) and (AChar[1] = #$A3) and (AChar[2] in [#$A4..#$BE]) ) or // Arabic 08E4 (e0a3a4) ..08FE (e0a3be)
( (AChar[0] = #$E1) and (AChar[1] = #$B7) ) or // Combining Diacritical Marks Supplement 1DC0-1DFF
( (AChar[0] = #$E2) and (AChar[1] = #$83) and (AChar[2] in [#$90..#$FF]) ) or // Combining Diacritical Marks for Symbols 20D0-20FF
( (AChar[0] = #$EF) and (AChar[1] = #$B8) and (AChar[2] in [#$A0..#$AF]) ) // Combining half Marks FE20-FE2F
);
end;
function IsSpaceChar(AText: PChar): Boolean;
begin
Result := (AText^ = ' ') and not IsCombiningCodePoint(AText);
end;
function CountLeadSpace(AText: PChar): integer;
var
Run : PChar;
begin
Run := AText;
while (Run^ in [' ']) do
Inc(Run);
Result := Run - AText;
if (Result > 0) and IsCombiningCodePoint(Run) then
dec(Result);
end;
function CountLeadWhiteSpace(AText: PChar): integer; function CountLeadWhiteSpace(AText: PChar): integer;
var var
Run : PChar; Run : PChar;
@ -119,6 +154,8 @@ begin
while (Run^ in [' ', #9]) do while (Run^ in [' ', #9]) do
Inc(Run); Inc(Run);
Result := Run - AText; Result := Run - AText;
if (Result > 0) and IsCombiningCodePoint(Run) then
dec(Result);
end; end;
function CountBackwardWhiteSpace(AText: PChar; AStart: Integer): integer; function CountBackwardWhiteSpace(AText: PChar; AStart: Integer): integer;
@ -142,6 +179,8 @@ begin
while (Run^ in [' ', #9]) do while (Run^ in [' ', #9]) do
Inc(Run); Inc(Run);
Result := Run - AText; Result := Run - AText;
if (Result > 0) and IsCombiningCodePoint(Run) then
dec(Result);
end; end;
{* fontstyle utilities *} {* fontstyle utilities *}

30
components/synedit/synedittextbuffer.pp
View File

@ -206,7 +206,6 @@ type
procedure UndoEditLinesDelete(LogY, ACount: Integer); procedure UndoEditLinesDelete(LogY, ACount: Integer);
procedure IncreaseTextChangeStamp; procedure IncreaseTextChangeStamp;
procedure DoGetPhysicalCharWidths(Line: PChar; LineLen, Index: Integer; PWidths: PPhysicalCharWidth); override; procedure DoGetPhysicalCharWidths(Line: PChar; LineLen, Index: Integer; PWidths: PPhysicalCharWidth); override;
function LogicPosIsCombining(const AChar: PChar): Boolean; inline;
function GetDisplayView: TLazSynDisplayView; override; function GetDisplayView: TLazSynDisplayView; override;
@ -979,7 +978,7 @@ begin
#$80..#$BF: #$80..#$BF:
PWidths^ := 0; PWidths^ := 0;
else else
if LogicPosIsCombining(Line) then if IsCombiningCodePoint(Line) then
PWidths^ := 0 PWidths^ := 0
else else
PWidths^ := 1; PWidths^ := 1;
@ -1012,21 +1011,6 @@ begin
end; end;
function TSynEditStringList.LogicPosIsCombining(const AChar: PChar): Boolean;
begin
Result := (
( (AChar[0] = #$CC) ) or // Combining Diacritical Marks (belongs to previos char) 0300-036F
( (AChar[0] = #$CD) and (AChar[1] in [#$80..#$AF]) ) or // Combining Diacritical Marks
( (AChar[0] = #$D8) and (AChar[1] in [#$90..#$9A]) ) or // Arabic 0610 (d890)..061A (d89a)
( (AChar[0] = #$D9) and (AChar[1] in [#$8b..#$9f, #$B0]) ) or // Arabic 064B (d98b)..065F (d99f) // 0670 (d9b0)
( (AChar[0] = #$DB) and (AChar[1] in [#$96..#$9C, #$9F..#$A4, #$A7..#$A8, #$AA..#$AD]) ) or // Arabic 06D6 (db96).. .. ..06EA (dbaa)
( (AChar[0] = #$E0) and (AChar[1] = #$A3) and (AChar[2] in [#$A4..#$BE]) ) or // Arabic 08E4 (e0a3a4) ..08FE (e0a3be)
( (AChar[0] = #$E1) and (AChar[1] = #$B7) ) or // Combining Diacritical Marks Supplement 1DC0-1DFF
( (AChar[0] = #$E2) and (AChar[1] = #$83) and (AChar[2] in [#$90..#$FF]) ) or // Combining Diacritical Marks for Symbols 20D0-20FF
( (AChar[0] = #$EF) and (AChar[1] = #$B8) and (AChar[2] in [#$A0..#$AF]) ) // Combining half Marks FE20-FE2F
);
end;
function TSynEditStringList.GetDisplayView: TLazSynDisplayView; function TSynEditStringList.GetDisplayView: TLazSynDisplayView;
begin begin
Result := FDisplayView; Result := FDisplayView;
@ -1240,7 +1224,7 @@ begin
while (Result < l) and (ACount > 0) do begin while (Result < l) and (ACount > 0) do begin
inc(Result); inc(Result);
if (ALine[Result] in [#0..#127, #192..#255]) and if (ALine[Result] in [#0..#127, #192..#255]) and
( (lpStopAtCodePoint in AFlags) or (not LogicPosIsCombining(@ALine[Result])) ) ( (lpStopAtCodePoint in AFlags) or (not IsCombiningCodePoint(@ALine[Result])) )
then then
dec(ACount); dec(ACount);
end; end;
@ -1250,7 +1234,7 @@ begin
if (Result <= l) then if (Result <= l) then
while (Result > 1) and while (Result > 1) and
( (not(ALine[Result] in [#0..#127, #192..#255])) or ( (not(ALine[Result] in [#0..#127, #192..#255])) or
( (not(lpStopAtCodePoint in AFlags)) and LogicPosIsCombining(@ALine[Result]) ) ( (not(lpStopAtCodePoint in AFlags)) and IsCombiningCodePoint(@ALine[Result]) )
) )
do do
dec(Result); dec(Result);
@ -1259,7 +1243,7 @@ begin
dec(Result); dec(Result);
if (Result > l) or (Result = 1) or if (Result > l) or (Result = 1) or
( (ALine[Result] in [#0..#127, #192..#255]) and ( (ALine[Result] in [#0..#127, #192..#255]) and
( (lpStopAtCodePoint in AFlags) or (not LogicPosIsCombining(@ALine[Result])) ) ( (lpStopAtCodePoint in AFlags) or (not IsCombiningCodePoint(@ALine[Result])) )
) )
then then
inc(ACount); inc(ACount);
@ -1278,7 +1262,7 @@ begin
if Result then if Result then
Result := (ALogicalPos = 1) or Result := (ALogicalPos = 1) or
(lpStopAtCodePoint in AFlags) or (lpStopAtCodePoint in AFlags) or
(not LogicPosIsCombining(@ALine[ALogicalPos])); (not IsCombiningCodePoint(@ALine[ALogicalPos]));
end; end;
function TSynEditStringList.LogicPosAdjustToChar(const ALine: String; ALogicalPos: integer; function TSynEditStringList.LogicPosAdjustToChar(const ALine: String; ALogicalPos: integer;
@ -1292,7 +1276,7 @@ begin
while (Result <= length(ALine)) and while (Result <= length(ALine)) and
( (not(ALine[Result] in [#0..#127, #192..#255])) or ( (not(ALine[Result] in [#0..#127, #192..#255])) or
((Result <> 1) and ((Result <> 1) and
(not(lpStopAtCodePoint in AFlags)) and LogicPosIsCombining(@ALine[Result]) (not(lpStopAtCodePoint in AFlags)) and IsCombiningCodePoint(@ALine[Result])
) )
) )
do do
@ -1305,7 +1289,7 @@ begin
while (Result > 1) and while (Result > 1) and
( (not(ALine[Result] in [#0..#127, #192..#255])) or ( (not(ALine[Result] in [#0..#127, #192..#255])) or
( (not(lpStopAtCodePoint in AFlags)) and LogicPosIsCombining(@ALine[Result]) ) ( (not(lpStopAtCodePoint in AFlags)) and IsCombiningCodePoint(@ALine[Result]) )
) )
do do
dec(Result); dec(Result);