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

SynEdit: More paint-token-breaker for future bidi support

Browse Source 
git-svn-id: trunk@38975 -
This commit is contained in:
martin 2012-10-06 16:26:25 +00:00
parent 6b0be7e56f
commit ab36fb82dc
4 changed files with 593 additions and 1028 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1033
components/synedit/lazsyntextarea.pp
View File

File diff suppressed because it is too large Load Diff

38
components/synedit/syneditmarkup.pp
View File

@ -30,6 +30,12 @@ uses
SynEditMiscClasses, Controls, SynEditHighlighter, LCLProc; SynEditMiscClasses, Controls, SynEditHighlighter, LCLProc;
type type
TLazSynDisplayTokenBound = record
Physical: Integer; // 1 based - May be in middle of char
Logical: Integer; // 1 based
Offset: Integer; // default 0. MultiWidth (e.g. Tab), if token starts in the middle of char
end;
TSynEditMarkupClass = class of TSynEditMarkup; TSynEditMarkupClass = class of TSynEditMarkup;
{ TSynEditMarkup } { TSynEditMarkup }
@ -91,7 +97,10 @@ type
Procedure EndMarkup; virtual; Procedure EndMarkup; virtual;
Function GetMarkupAttributeAtRowCol(const aRow, aCol : Integer) : TSynSelectedColor; virtual; abstract; Function GetMarkupAttributeAtRowCol(const aRow, aCol : Integer) : TSynSelectedColor; virtual; abstract;
Function GetNextMarkupColAfterRowCol(const aRow, aCol : Integer) : Integer; virtual; abstract; Function GetNextMarkupColAfterRowCol(const aRow, aCol : Integer) : Integer; virtual; abstract;
procedure MergeMarkupAttributeAtRowCol(const aRow, aCol, AEndCol : Integer; AMarkup: TSynSelectedColor); virtual; procedure MergeMarkupAttributeAtRowCol(const aRow: Integer;
const aStartCol, AEndCol :TLazSynDisplayTokenBound;
const AnIsRTL: Boolean;
AMarkup: TSynSelectedColor); virtual;
// Notifications about Changes to the text // Notifications about Changes to the text
Procedure TextChanged(aFirstCodeLine, aLastCodeLine: Integer); virtual; Procedure TextChanged(aFirstCodeLine, aLastCodeLine: Integer); virtual;
@ -147,7 +156,10 @@ type
Procedure EndMarkup; override; Procedure EndMarkup; override;
Function GetMarkupAttributeAtRowCol(const aRow, aCol : Integer) : TSynSelectedColor; override; Function GetMarkupAttributeAtRowCol(const aRow, aCol : Integer) : TSynSelectedColor; override;
Function GetNextMarkupColAfterRowCol(const aRow, aCol : Integer) : Integer; override; Function GetNextMarkupColAfterRowCol(const aRow, aCol : Integer) : Integer; override;
procedure MergeMarkupAttributeAtRowCol(const aRow, aCol, AEndCol : Integer; AMarkup: TSynSelectedColor); override; procedure MergeMarkupAttributeAtRowCol(const aRow: Integer;
const aStartCol, AEndCol :TLazSynDisplayTokenBound;
const AnIsRTL: Boolean;
AMarkup: TSynSelectedColor); override;
// Notifications about Changes to the text // Notifications about Changes to the text
Procedure TextChanged(aFirstCodeLine, aLastCodeLine: Integer); override; Procedure TextChanged(aFirstCodeLine, aLastCodeLine: Integer); override;
@ -357,14 +369,14 @@ procedure TSynEditMarkup.EndMarkup;
begin begin
end; end;
procedure TSynEditMarkup.MergeMarkupAttributeAtRowCol(const aRow, aCol, AEndCol: Integer; procedure TSynEditMarkup.MergeMarkupAttributeAtRowCol(const aRow: Integer; const aStartCol,
AMarkup: TSynSelectedColor); AEndCol: TLazSynDisplayTokenBound; const AnIsRTL: Boolean; AMarkup: TSynSelectedColor);
var var
c: TSynSelectedColor; c: TSynSelectedColor;
begin begin
c := GetMarkupAttributeAtRowCol(aRow, aCol); c := GetMarkupAttributeAtRowCol(aRow, aStartCol.Physical);
if assigned(c) then if assigned(c) then
AMarkup.Merge(c, aCol, AEndCol); AMarkup.Merge(c, aStartCol.Physical, AEndCol.Physical - 1);
end; end;
procedure TSynEditMarkup.TextChanged(aFirstCodeLine, aLastCodeLine: Integer); procedure TSynEditMarkup.TextChanged(aFirstCodeLine, aLastCodeLine: Integer);
@ -491,23 +503,25 @@ begin
TSynEditMarkup(fMarkUpList[i]).PrepareMarkupForRow(aRow); TSynEditMarkup(fMarkUpList[i]).PrepareMarkupForRow(aRow);
end; end;
procedure TSynEditMarkupManager.MergeMarkupAttributeAtRowCol procedure TSynEditMarkupManager.MergeMarkupAttributeAtRowCol(const aRow: Integer;
(const aRow, aCol, AEndCol: Integer; AMarkup: TSynSelectedColor); const aStartCol, AEndCol: TLazSynDisplayTokenBound; const AnIsRTL: Boolean;
AMarkup: TSynSelectedColor);
var var
i : integer; i : integer;
begin begin
for i := 0 to fMarkUpList.Count-1 do begin for i := 0 to fMarkUpList.Count-1 do begin
if TSynEditMarkup(fMarkUpList[i]).Enabled then if TSynEditMarkup(fMarkUpList[i]).Enabled then
TSynEditMarkup(fMarkUpList[i]).MergeMarkupAttributeAtRowCol TSynEditMarkup(fMarkUpList[i]).MergeMarkupAttributeAtRowCol
(aRow, aCol, AEndCol, AMarkup); (aRow, aStartCol, AEndCol, AnIsRTL, AMarkup);
end; end;
end; end;
function TSynEditMarkupManager.GetMarkupAttributeAtRowCol(const aRow, aCol : Integer) : TSynSelectedColor; function TSynEditMarkupManager.GetMarkupAttributeAtRowCol(const aRow, aCol : Integer) : TSynSelectedColor;
begin begin
Result := MarkupInfo; assert(false);
Result.Clear; //Result := MarkupInfo;
MergeMarkupAttributeAtRowCol(aRow, aCol, GetNextMarkupColAfterRowCol(aRow, aCol) - 1, Result); //Result.Clear;
//MergeMarkupAttributeAtRowCol(aRow, aCol, GetNextMarkupColAfterRowCol(aRow, aCol) - 1, Result);
end; end;
function TSynEditMarkupManager.GetNextMarkupColAfterRowCol(const aRow, aCol : Integer) : Integer; function TSynEditMarkupManager.GetNextMarkupColAfterRowCol(const aRow, aCol : Integer) : Integer;

1
components/synedit/syneditmarkupguttermark.pp
View File

@ -62,7 +62,6 @@ type
procedure PrepareMarkupForRow(ARow: Integer); override; procedure PrepareMarkupForRow(ARow: Integer); override;
function GetMarkupAttributeAtRowCol(const ARow, ACol: Integer): TSynSelectedColor; override; function GetMarkupAttributeAtRowCol(const ARow, ACol: Integer): TSynSelectedColor; override;
function GetNextMarkupColAfterRowCol(const ARow, ACol: Integer): Integer; override; function GetNextMarkupColAfterRowCol(const ARow, ACol: Integer): Integer; override;
//procedure MergeMarkupAttributeAtRowCol(const aRow, aCol, AEndCol : Integer; AMarkup: TSynSelectedColor); override;
end; end;
implementation implementation

549
components/synedit/test/testsyntextarea.pas
View File

@ -6,8 +6,8 @@ unit TestSynTextArea;
interface interface
uses uses
Classes, SysUtils, fpcunit, testregistry, TestBase, LazSynTextArea, Classes, SysUtils, fpcunit, testregistry, TestBase, LazSynTextArea, SynEditTypes,
SynEditTypes, SynEditMarkupBracket, SynEdit, SynHighlighterPosition, Graphics; SynEditMarkupBracket, SynEdit, SynHighlighterPosition, SynEditMarkup, Graphics, Forms;
type type
@ -43,6 +43,11 @@ begin
inherited ReCreateEdit; inherited ReCreateEdit;
FTheHighLighter := CreateTheHighLighter; FTheHighLighter := CreateTheHighLighter;
SynEdit.Highlighter := FTheHighLighter; SynEdit.Highlighter := FTheHighLighter;
SynEdit.Color := clWhite;
SynEdit.Font.Color := clBlack;
SynEdit.SelectedColor.Foreground := clPurple;
FTokenBreaker.ForegroundColor := clBlack;
FTokenBreaker.BackgroundColor := clWhite;
end; end;
function TTestSynTextArea.CreateTheHighLighter: TSynPositionHighlighter; function TTestSynTextArea.CreateTheHighLighter: TSynPositionHighlighter;
@ -83,6 +88,7 @@ begin
'شس ي', 'شس ي',
'ABشس يCD', 'ABشس يCD',
#9'i'#9'12'#9, #9'i'#9'12'#9,
'ي'#9'شس', // 15
'' ''
]); ]);
end; end;
@ -94,28 +100,33 @@ var
Token: TLazSynDisplayTokenInfoEx; Token: TLazSynDisplayTokenInfoEx;
UseViewTokenOnly: Boolean; UseViewTokenOnly: Boolean;
SkipPreFirst: Boolean; SkipPreFirst: Boolean;
type
procedure TestToken(LStart, LEnd, PStart, PEnd, DStart, DEnd: Integer; IsRtl: Boolean; AText: String); TBoundExpectation = record
begin ExpPhys, ExpLog, ExpOffs: Integer;
AssertEquals(Name + 'LStart', LStart, Token.LogicalStart); WantOffs: Boolean;
AssertEquals(Name + 'LEnd', LEnd, Token.LogicalEnd);
AssertEquals(Name + 'PStart', PStart, Token.PhysicalStart);
AssertEquals(Name + 'PEnd', PEnd, Token.PhysicalEnd);
AssertEquals(Name + 'PaintStart', DStart, Token.PhysicalPaintStart);
AssertEquals(Name + 'PaintEnd', DEnd, Token.PhysicalPaintEnd);
AssertEquals(Name + 'IsRtl', IsRtl, Token.IsRtl);
AssertEquals(Name + 'Text', AText, copy(Token.Tk.TokenStart, 1, Token.Tk.TokenLength));
end; end;
procedure TestTokenNxt(LStart, PStart: Integer; IsRtl: Boolean; Offs: Integer = -1); function b(AExpPhys, AExpLog: Integer): TBoundExpectation;
begin begin
if LStart = -99 then exit; Result.ExpPhys := AExpPhys;
AssertEquals(Name + 'Nxt LStart', LStart, Token.NextLogicStart); Result.ExpLog := AExpLog;
AssertEquals(Name + 'Nxt PStart', PStart, Token.NextPhysicalPaintStart); Result.WantOffs := False;
if LStart < 0 then exit; end;
AssertEquals(Name + 'Nxt IsRtl', IsRtl, Token.NextIsRtl);
if Offs < 0 then exit; function b(AExpPhys, AExpLog, AExpOffs: Integer): TBoundExpectation;
AssertEquals(Name + 'Nxt Offs', Offs, Token.NextLogicStartPhysOffs); begin
Result.ExpPhys := AExpPhys;
Result.ExpLog := AExpLog;
Result.ExpOffs := AExpOffs;
Result.WantOffs := True;
end;
procedure TestBound(AName: String; ABound: TLazSynDisplayTokenBound; AExpect: TBoundExpectation);
begin
AssertEquals(AName + ' Bound.Phys', AExpect.ExpPhys, ABound.Physical);
AssertEquals(AName + ' Bound.Log', AExpect.ExpLog, ABound.Logical);
if AExpect.WantOffs then
AssertEquals(AName + ' Bound.Offs', AExpect.ExpOffs, ABound.Offset);
end; end;
procedure TestStart(AName: String; ALine, AFirst, ALast: Integer; ExpRLine: Integer = -1); procedure TestStart(AName: String; ALine, AFirst, ALast: Integer; ExpRLine: Integer = -1);
@ -133,17 +144,22 @@ var
FTokenBreaker.SetHighlighterTokensLine(ALine-1, RLine); FTokenBreaker.SetHighlighterTokensLine(ALine-1, RLine);
if ExpRLine >= 0 then if ExpRLine >= 0 then
AssertEquals(Name+'Got RealLine', ExpRLine-1, RLine); AssertEquals(Name+'Got RealLine', ExpRLine-1, RLine);
if not UseViewTokenOnly then
SynEdit.TextArea.MarkupManager.PrepareMarkupForRow(ALine);
end; end;
procedure TestPreFirst(LStart, PStart: Integer; IsRtl: Boolean; Offs: Integer = -1); procedure TestPreFirst(ExpNext: TBoundExpectation; ExpNxtIsRtl: Boolean);
var var
R: Boolean; R: Boolean;
begin begin
if SkipPreFirst then exit; if SkipPreFirst then exit;
Name := Format('%sL (Pre-First): ', [BaseName]); Name := Format('%sL (Pre-First): ', [BaseName]);
R := FTokenBreaker.GetNextHighlighterTokenFromView(Token, -1, 1); R := FTokenBreaker.GetNextHighlighterTokenFromView(Token, -1, 1);
AssertTrue(Name + 'Got Token', R); AssertTrue(Name + 'Got Token', R);
TestTokenNxt(LStart, PStart, IsRtl, Offs); TestBound(Name + ' Next(BOL)', Token.NextPos, ExpNext);
AssertEquals(Name + 'Nxt IsRtl', ExpNxtIsRtl, Token.NextIsRtl);
end; end;
procedure TestNext(ALimits: Array of Integer); procedure TestNext(ALimits: Array of Integer);
@ -160,16 +176,63 @@ var
if UseViewTokenOnly if UseViewTokenOnly
then R := FTokenBreaker.GetNextHighlighterTokenFromView(Token, PhysLimit, LogLimit) then R := FTokenBreaker.GetNextHighlighterTokenFromView(Token, PhysLimit, LogLimit)
else R := FTokenBreaker.GetNextHighlighterTokenEx(Token); else R := FTokenBreaker.GetNextHighlighterTokenEx(Token);
AssertTrue(Name + 'Got Token', R); AssertTrue(Name + 'Got Token', R);
end; end;
procedure TestNext(ALimits: Array of Integer; LStart, LEnd, PStart, PEnd, DStart, DEnd: Integer; procedure TestNext(ALimits: Array of Integer;
IsRtl: Boolean; AText: String; NxtLStart: Integer = -99; NxtPStart: Integer = -1; ExpStart, ExpEnd: TBoundExpectation;
NxtIsRtl: Boolean = False; NxtOffs: Integer = -1); ExpCharStart, ExpCharEnd: Integer; ExpClipStart, ExpClipEnd: Integer;
ExpIsRtl: Boolean; ExpText: String);
begin begin
TestNext(ALimits); TestNext(ALimits);
TestToken(LStart, LEnd, PStart, PEnd, DStart, DEnd, IsRtl, AText);
TestTokenNxt(NxtLStart, NxtPStart, NxtIsRtl, NxtOffs); TestBound(Name + ' Start', Token.StartPos, ExpStart);
TestBound(Name + ' End', Token.EndPos, ExpEnd);
AssertEquals(Name + ' PhysicalCharStart', ExpCharStart, Token.PhysicalCharStart);
AssertEquals(Name + ' PhysicalCharEnd', ExpCharEnd, Token.PhysicalCharEnd);
AssertEquals(Name + ' PhysicalClipStart', ExpClipStart, Token.PhysicalClipStart);
AssertEquals(Name + ' PhysicalClipEnd', ExpClipEnd, Token.PhysicalClipEnd);
AssertEquals(Name + ' ExpIsRtl', ExpIsRtl, Token.IsRtl);
AssertEquals(Name + ' Text', ExpText, copy(Token.Tk.TokenStart, 1, Token.Tk.TokenLength));
end;
procedure TestNext(ALimits: Array of Integer;
ExpStart, ExpEnd: TBoundExpectation;
ExpCharStart, ExpCharEnd: Integer; ExpClipStart, ExpClipEnd: Integer;
ExpIsRtl: Boolean; ExpText: String;
ExpFColor: TColor);
begin
TestNext(ALimits, ExpStart, ExpEnd, ExpCharStart, ExpCharEnd, ExpClipStart,
ExpClipEnd, ExpIsRtl, ExpText);
AssertEquals(Name + ' F-Color', ExpFColor, Token.Attr.Foreground);
end;
procedure TestNext(ALimits: Array of Integer;
ExpStart, ExpEnd: TBoundExpectation;
ExpCharStart, ExpCharEnd: Integer; ExpClipStart, ExpClipEnd: Integer;
ExpIsRtl: Boolean; ExpText: String;
ExpNext: TBoundExpectation; ExpNxtIsRtl: Boolean);
begin
TestNext(ALimits, ExpStart, ExpEnd, ExpCharStart, ExpCharEnd, ExpClipStart,
ExpClipEnd, ExpIsRtl, ExpText);
TestBound(Name + ' Next', Token.NextPos, ExpNext);
AssertEquals(Name + 'Nxt IsRtl', ExpNxtIsRtl, Token.NextIsRtl);
end;
procedure TestNext(ALimits: Array of Integer;
ExpStart, ExpEnd: TBoundExpectation;
ExpCharStart, ExpCharEnd: Integer; ExpClipStart, ExpClipEnd: Integer;
ExpIsRtl: Boolean; ExpText: String;
ExpFColor: TColor;
ExpNext: TBoundExpectation; ExpNxtIsRtl: Boolean);
begin
TestNext(ALimits, ExpStart, ExpEnd, ExpCharStart, ExpCharEnd, ExpClipStart,
ExpClipEnd, ExpIsRtl, ExpText, ExpNext, ExpNxtIsRtl);
AssertEquals(Name + ' F-Color', ExpFColor, Token.Attr.Foreground);
end; end;
procedure TestEnd; procedure TestEnd;
@ -184,6 +247,14 @@ var
AssertFalse(Name + ' No further Token', R); AssertFalse(Name + ' No further Token', R);
end; end;
procedure TestEnd(ExpStart: TBoundExpectation);
var
R: Boolean;
begin
TestEnd;
TestBound(Name + ' Start(EOL)', Token.StartPos, ExpStart);
end;
procedure DoTests; procedure DoTests;
begin begin
UseViewTokenOnly := True; UseViewTokenOnly := True;
@ -202,61 +273,61 @@ var
{%region full line} {%region full line}
TestStart('Scan full line / hl-token', 2, 1, 100, 2); TestStart('Scan full line / hl-token', 2, 1, 100, 2);
TestNext([100], 1, 10, 1, 10, 1, 10, False, 'interface', 10, 10, False, 0); TestNext([100], b( 1, 1, 0), b(10,10, 0), 1,10, 1,10, False, 'interface', clBlue, b(10,10, 0), False);
TestNext([100], 10, 12, 10, 12, 10, 12, False, '//'); //, 12, 12, False, 0); TestNext([100], b(10,10, 0), b(12,12, 0), 10,12, 10,12, False, '//', clBlack, b(12,12, 0), False);
TestEnd; TestEnd(b(12,12,0));
TestStart('Scan full line / hl-token', 2, 1, 100, 2); TestStart('Scan full line / hl-token', 2, 1, 100, 2);
TestPreFirst(1, 1, False, 0); TestPreFirst(b( 1, 1, 0), False);
TestNext([], 1, 10, 1, 10, 1, 10, False, 'interface', 10, 10, False, 0); TestNext([], b( 1, 1), b(10,10), 1,10, 1,10, False, 'interface', b(10,10, 0), False);
TestNext([], 10, 12, 10, 12, 10, 12, False, '//'); TestNext([], b(10,10), b(12,12), 10,12, 10,12, False, '//', b(12,12, 0), False);
TestEnd; TestEnd(b(12,12, 0));
{%endregion} {%endregion}
{%region cut off end of line} {%region cut off end of line}
TestStart('Cut off end', 2, 1, 5, 2); TestStart('Cut off end', 2, 1, 5, 2);
TestNext([100], 1, 5, 1, 5, 1, 5, False, 'inte'); TestNext([100], b( 1, 1), b( 5, 5), 1, 5, 1, 5, False, 'inte', b( 5, 5, 0), False);
TestEnd; TestEnd(b( 5, 5, 0));
{%endregion} {%endregion}
{%region cut off start of line} {%region cut off start of line}
TestStart('Cut off start', 2, 3, 100, 2); TestStart('Cut off start', 2, 3, 100, 2);
TestNext([100], 3, 10, 3, 10, 3, 10, False, 'terface'); TestNext([100], b( 3, 3), b(10,10), 3,10, 3,10, False, 'terface', b(10,10, 0), False);
TestNext([100], 10, 12, 10, 12, 10, 12, False, '//'); TestNext([100], b(10,10), b(12,12), 10,12, 10,12, False, '//', b(12,12, 0), False);
TestEnd; TestEnd(b(12,12, 0));
TestStart('Cut off start 1 tok', 2, 10, 100, 2); TestStart('Cut off start 1 tok', 2, 10, 100, 2);
TestNext([100], 10, 12, 10, 12, 10, 12, False, '//'); TestNext([100], b(10,10), b(12,12), 10,12, 10,12, False, '//', b(12,12, 0), False);
TestEnd; TestEnd(b(12,12, 0));
TestStart('Cut off start 1.5 tok', 2, 11, 100, 2); TestStart('Cut off start 1.5 tok', 2, 11, 100, 2);
TestNext([100], 11, 12, 11, 12, 11, 12, False, '/'); TestNext([100], b(11,11), b(12,12), 11,12, 11,12, False, '/', b(12,12, 0), False);
TestEnd; TestEnd(b(12,12, 0));
{%endregion} {%endregion}
{%region cut off both} {%region cut off both}
TestStart('Cut off both', 2, 3, 10, 2); TestStart('Cut off both', 2, 3, 10, 2);
TestNext([100], 3, 10, 3, 10, 3, 10, False, 'terface'); TestNext([100], b( 3, 3), b(10,10), 3,10, 3,10, False, 'terface');
//TestNext([100], 10, 12, 10, 12, 10, 12, False, '//'); //TestNext([100], b(10,10), b(12,12), 10,12, 10,12, False, '//');
TestEnd; TestEnd;
TestStart('Cut off both - 2 token', 2, 3, 11, 2); TestStart('Cut off both - 2 token', 2, 3, 11, 2);
TestNext([100], 3, 10, 3, 10, 3, 10, False, 'terface'); TestNext([100], b( 3, 3), b(10,10), 3,10, 3,10, False, 'terface');
TestNext([100], 10, 11, 10, 11, 10, 11, False, '/'); TestNext([100], b(10,10), b(11,11), 10,11, 10,11, False, '/');
TestEnd; TestEnd;
TestStart('Cut off both - 1 token, skip 1st', 2, 10, 11, 2); TestStart('Cut off both - 1 token, skip 1st', 2, 10,11, 2);
TestNext([100], 10, 11, 10, 11, 10, 11, False, '/'); TestNext([100], b(10,10), b(11,11), 10,11, 10,11, False, '/');
TestEnd; TestEnd;
{%endregion} {%endregion}
{%region 1 token 2 parts} {%region 1 token 2 parts}
TestStart('1 token 2 parts', 2, 1, 100, 2); TestStart('1 token 2 parts', 2, 1, 100, 2);
TestNext([ 3], 1, 3, 1, 3, 1, 3, False, 'in'); TestNext([ 3], b( 1, 1, 0), b( 3, 3, 0), 1, 3, 1, 3, False, 'in',clBlue );
TestNext([100], 3, 10, 3, 10, 3, 10, False, 'terface'); TestNext([100], b( 3, 3, 0), b(10,10, 0), 3,10, 3,10, False, 'terface', clBlue);
TestNext([100], 10, 12, 10, 12, 10, 12, False, '//'); TestNext([100], b(10,10, 0), b(12,12, 0), 10,12, 10,12, False, '//', clBlack);
TestEnd; TestEnd;
{%endregion} {%endregion}
@ -265,98 +336,98 @@ var
{%region cut off PART of char } {%region cut off PART of char }
// start at 1 // start at 1
TestStart('cut off PART of char (end)', 7, 1, 100, 7); TestStart('cut off PART of char (end)', 7, 1, 100, 7);
TestPreFirst(1, 1, False, 0); TestPreFirst(b( 1, 1, 0), False);
TestNext([ 3], 1, 2, 1, 5, 1, 3, False, #9, 1, 3, False, 2); TestNext([ 3], b( 1, 1, 0), b( 3, 2,-2), 1, 5, 1, 3, False, #9, b( 3, 1, 2), False);
TestNext([100], 1, 2, 1, 5, 3, 5, False, #9, 2, 5, False, 0); TestNext([100], b( 3, 1, 2), b( 5, 2, 0), 1, 5, 3, 5, False, #9, b( 5, 2, 0), False);
TestNext([100], 2, 3, 5, 6, 5, 6, False, 'i'); TestNext([100], b( 5, 2, 0), b( 6, 3, 0), 5, 6, 5, 6, False, 'i');
TestStart('cut off PART of char (end) next-limit', 7, 1, 100, 7); TestStart('cut off PART of char (end) next-limit', 7, 1, 100, 7);
TestPreFirst(1, 1, False, 0); TestPreFirst(b( 1, 1, 0), False);
TestNext([ 3], 1, 2, 1, 5, 1, 3, False, #9, 1, 3, False, 2); TestNext([ 3], b( 1, 1), b( 3, 2), 1, 5, 1, 3, False, #9, b( 3, 1, 2), False);
TestNext([ 5], 1, 2, 1, 5, 3, 5, False, #9, 2, 5, False, 0); TestNext([ 5], b( 3, 1), b( 5, 2), 1, 5, 3, 5, False, #9, b( 5, 2, 0), False);
TestNext([100], 2, 3, 5, 6, 5, 6, False, 'i'); TestNext([100], b( 5, 2), b( 6, 3), 5, 6, 5, 6, False, 'i');
TestStart('cut off PART of char (end) next-limit-log', 7, 1, 100, 7); TestStart('cut off PART of char (end) next-limit-log', 7, 1, 100, 7);
TestPreFirst(1, 1, False, 0); TestPreFirst(b( 1, 1, 0), False);
TestNext([ 3], 1, 2, 1, 5, 1, 3, False, #9, 1, 3, False, 2); TestNext([ 3], b( 1, 1), b( 3, 2), 1, 5, 1, 3, False, #9, b( 3, 1, 2), False);
TestNext([99,2], 1, 2, 1, 5, 3, 5, False, #9, 2, 5, False, 0); TestNext([99,2], b( 3, 1), b( 5, 2), 1, 5, 3, 5, False, #9, b( 5, 2, 0), False);
TestNext([100], 2, 3, 5, 6, 5, 6, False, 'i'); TestNext([100], b( 5, 2), b( 6, 3), 5, 6, 5, 6, False, 'i');
// start at 2 // start at 2
TestStart('cut off PART of char (begin)', 7, 2, 100, 7); TestStart('cut off PART of char (begin)', 7, 2, 100, 7);
TestPreFirst(1, 2, False, 1); TestPreFirst(b( 2, 1, 1), False);
TestNext([ 5], 1, 2, 1, 5, 2, 5, False, #9); TestNext([ 5], b( 2, 1), b( 5, 2), 1, 5, 2, 5, False, #9);
TestNext([100], 2, 3, 5, 6, 5, 6, False, 'i'); TestNext([100], b( 5, 2), b( 6, 3), 5, 6, 5, 6, False, 'i');
TestStart('cut off PART of char (both) continue', 7, 2, 100, 7); TestStart('cut off PART of char (both) continue', 7, 2, 100, 7);
TestPreFirst(1, 2, False, 1); TestPreFirst(b( 2, 1, 1), False);
TestNext([ 3], 1, 2, 1, 5, 2, 3, False, #9); TestNext([ 3], b( 2, 1), b( 3, 2), 1, 5, 2, 3, False, #9);
TestNext([100], 1, 2, 1, 5, 3, 5, False, #9); TestNext([100], b( 3, 1), b( 5, 2), 1, 5, 3, 5, False, #9);
TestNext([100], 2, 3, 5, 6, 5, 6, False, 'i'); TestNext([100], b( 5, 2), b( 6, 3), 5, 6, 5, 6, False, 'i');
TestStart('cut off PART of char (both) global-limit', 7, 2, 3, 7); TestStart('cut off PART of char (both) global-limit', 7, 2, 3, 7);
TestPreFirst(1, 2, False, 1); TestPreFirst(b( 2, 1, 1), False);
TestNext([100], 1, 2, 1, 5, 2, 3, False, #9); TestNext([100], b( 2, 1), b( 3, 2), 1, 5, 2, 3, False, #9);
TestEnd; TestEnd;
TestStart('cut off PART of char (both) next-limit', 7, 2, 100, 7); TestStart('cut off PART of char (both) next-limit', 7, 2, 100, 7);
TestPreFirst(1, 2, False, 1); TestPreFirst(b( 2, 1, 1), False);
TestNext([3], 1, 2, 1, 5, 2, 3, False, #9); TestNext([3], b( 2, 1), b( 3, 2), 1, 5, 2, 3, False, #9);
//TestEnd(3); //TestEnd(3);
// start at 3 // start at 3
TestStart('cut off PART of char (begin)', 7, 3, 100, 7); TestStart('cut off PART of char (begin)', 7, 3, 100, 7);
TestPreFirst(1, 3, False, 2); TestPreFirst(b( 3, 1, 2), False);
TestNext([ 5], 1, 2, 1, 5, 3, 5, False, #9); TestNext([ 5], b( 3, 1), b( 5, 2), 1, 5, 3, 5, False, #9);
TestNext([100], 2, 3, 5, 6, 5, 6, False, 'i'); TestNext([100], b( 5, 2), b( 6, 3), 5, 6, 5, 6, False, 'i');
// start at 4 // start at 4
TestStart('cut off PART of char (begin)', 7, 4, 100, 7); TestStart('cut off PART of char (begin)', 7, 4, 100, 7);
TestPreFirst(1, 4, False, 3); TestPreFirst(b( 4, 1, 3), False);
TestNext([ 5], 1, 2, 1, 5, 4, 5, False, #9); TestNext([ 5], b( 4, 1), b( 5, 2), 1, 5, 4, 5, False, #9);
TestNext([100], 2, 3, 5, 6, 5, 6, False, 'i'); TestNext([100], b( 5, 2), b( 6, 3), 5, 6, 5, 6, False, 'i');
// start at 5 // start at 5
TestStart('cut off PART of char (begin)', 7, 5, 100, 7); TestStart('cut off PART of char (begin)', 7, 5, 100, 7);
TestPreFirst(2, 5, False, 0); TestPreFirst(b( 5, 2, 0), False);
TestNext([100], 2, 3, 5, 6, 5, 6, False, 'i'); TestNext([100], b( 5, 2), b( 6, 3), 5, 6, 5, 6, False, 'i');
{%endregion} {%endregion}
{%region cut tab in many} {%region cut tab in many}
TestStart('cut tab in many', 9, 2, 100, 9); TestStart('cut tab in many', 9, 2, 100, 9);
TestNext([ 3], 1, 2, 1, 5, 2, 3, False, #9); TestNext([ 3], b( 2, 1), b( 3, 2), 1, 5, 2, 3, False, #9);
TestNext([ 6], 1, 3, 1, 9, 3, 6, False, #9#9); TestNext([ 6], b( 3, 1), b( 6, 3), 1, 9, 3, 6, False, #9#9);
TestNext([ 11], 2, 4, 5, 13, 6, 11, False, #9#9); TestNext([ 11], b( 6, 2), b(11, 4), 5,13, 6,11, False, #9#9);
TestNext([ 13], 3, 4, 9, 13, 11, 13, False, #9); TestNext([ 13], b(11, 3), b(13, 4), 9,13, 11, 13, False, #9);
TestNext([ 15], 4, 5, 13, 17, 13, 15, False, #9); TestNext([ 15], b(13, 4), b(15, 5), 13,17, 13, 15, False, #9);
{%endregion} {%endregion}
{%region break line // phys log} {%region break line // phys log}
TestStart('Scan full line', 14, 1, 100, 14); TestStart('Scan full line', 14, 1, 100, 14);
TestPreFirst(1, 1, False, 0); TestPreFirst(b( 1, 1, 0), False);
TestNext([-1, -1], 1, 7, 1, 13, 1, 13, False, #9'i'#9'12'#9); TestNext([-1, -1], b( 1, 1), b(13, 7), 1,13, 1,13, False, #9'i'#9'12'#9);
TestStart('Scan full line', 14, 1, 100, 14); TestStart('Scan full line', 14, 1, 100, 14);
TestPreFirst(1, 1, False, 0); TestPreFirst(b( 1, 1, 0), False);
TestNext([-1, 2], 1, 2, 1, 5, 1, 5, False, #9, 2, 5, False, 0); TestNext([-1, 2], b( 1, 1), b( 5, 2), 1, 5, 1, 5, False, #9, b( 5, 2, 0), False);
TestNext([-1, 3], 2, 3, 5, 6, 5, 6, False, 'i'); TestNext([-1, 3], b( 5, 2), b( 6, 3), 5, 6, 5, 6, False, 'i');
TestStart('Scan full line', 14, 1, 100, 14); TestStart('Scan full line', 14, 1, 100, 14);
TestPreFirst(1, 1, False, 0); TestPreFirst(b( 1, 1, 0), False);
TestNext([99, 2], 1, 2, 1, 5, 1, 5, False, #9, 2, 5, False, 0); TestNext([99, 2], b( 1, 1), b( 5, 2), 1, 5, 1, 5, False, #9, b( 5, 2, 0), False);
TestNext([-1, 3], 2, 3, 5, 6, 5, 6, False, 'i'); TestNext([-1, 3], b( 5, 2), b( 6, 3), 5, 6, 5, 6, False, 'i');
TestStart('Scan full line', 14, 1, 100, 14); TestStart('Scan full line', 14, 1, 100, 14);
TestPreFirst(1, 1, False, 0); TestPreFirst(b( 1, 1, 0), False);
TestNext([ 5, 2], 1, 2, 1, 5, 1, 5, False, #9, 2, 5, False, 0); TestNext([ 5, 2], b( 1, 1), b( 5, 2), 1, 5, 1, 5, False, #9, b( 5, 2, 0), False);
TestNext([-1, 3], 2, 3, 5, 6, 5, 6, False, 'i'); TestNext([-1, 3], b( 5, 2), b( 6, 3), 5, 6, 5, 6, False, 'i');
TestStart('Scan full line', 14, 1, 100, 14); TestStart('Scan full line', 14, 1, 100, 14);
TestPreFirst(1, 1, False, 0); TestPreFirst(b( 1, 1, 0), False);
TestNext([ 4, 2], 1, 2, 1, 5, 1, 4, False, #9, 1, 4, False, 3); TestNext([ 4, 2], b( 1, 1), b( 4, 2), 1, 5, 1, 4, False, #9, b( 4, 1, 3), False);
TestNext([-1, 2], 1, 2, 1, 5, 4, 5, False, #9, 2, 5, False, 0); TestNext([-1, 2], b( 4, 1), b( 5, 2), 1, 5, 4, 5, False, #9, b( 5, 2, 0), False);
TestNext([-1, 3], 2, 3, 5, 6, 5, 6, False, 'i'); TestNext([-1, 3], b( 5, 2), b( 6, 3), 5, 6, 5, 6, False, 'i');
{%endregion} {%endregion}
@ -371,74 +442,123 @@ var
PushBaseName('RTL-Only'); PushBaseName('RTL-Only');
{%region full line} {%region full line}
TestStart('Scan full line', 11, 1, 100, 11); TestStart('Scan full line', 11, 1, 100, 11);
TestPreFirst(1,3, True, 0); TestPreFirst(b( 3, 1, 0), True);
TestNext([100], 1, 5, 1, 3, 1, 3, True, 'شس'); TestNext([100], b( 3, 1, 0), b( 1, 5, 0), 1, 3, 1, 3, True, 'شس', b( 3, 5, 0), False);
TestEnd; TestEnd(b( 3, 5, 0));
TestStart('Scan full line', 11, 1, 100, 11); TestStart('Scan full line', 11, 1, 100, 11);
TestPreFirst(1, 3, True, 0); TestPreFirst(b( 3, 1, 0), True);
TestNext([], 1, 5, 1, 3, 1, 3, True, 'شس'); TestNext([], b( 3, 1, 0), b( 1, 5, 0), 1, 3, 1, 3, True, 'شس', b( 3, 5, 0), False);
TestEnd; TestEnd(b( 3, 5, 0));
TestStart('Scan full line (2 words)', 12, 1, 100, 12); TestStart('Scan full line (2 words)', 12, 1, 100, 12);
TestPreFirst(1, 5, True, 0); TestPreFirst(b( 5, 1, 0), True);
TestNext([100], 1, 8, 1, 5, 1, 5, True, 'شس ي'); TestNext([100], b( 5, 1, 0), b( 1, 8, 0), 1, 5, 1, 5, True, 'شس ي', b( 5, 8, 0), False);
TestEnd; TestEnd(b( 5, 8, 0));
{%endregion}
{%region Cut tab}
(*
Tab implemetation may change. currently it is calculated on the logical pos of the tab
*)
// tab will be 3 width
TestStart('Scan full line', 15, 3, 7, 15);
TestPreFirst(b( 7, 1, 0), True);
TestNext([], b( 7, 1, 0), b( 3, 4, 0), 3, 7, 3, 7, True, 'ي'#9, b( 7, 8, 0), False);
TestEnd(b( 7, 8, 0));
TestStart('Scan full line', 15, 4, 7, 15);
TestPreFirst(b( 7, 1, 0), True);
TestNext([], b( 7, 1, 0), b( 4, 4,-1), 3, 7, 4, 7, True, 'ي'#9, b( 7, 8, 0), False);
TestEnd(b( 7, 8, 0));
TestStart('Scan full line', 15, 5, 7, 15);
TestPreFirst(b( 7, 1, 0), True);
TestNext([], b( 7, 1, 0), b( 5, 4,-2), 3, 7, 5, 7, True, 'ي'#9, b( 7, 8, 0), False);
TestEnd(b( 7, 8, 0));
TestStart('Scan full line', 15, 1, 7, 15);
TestPreFirst(b( 7, 1, 0), True);
TestNext([], b( 7, 1, 0), b( 1, 8, 0), 1, 7, 1, 7, True, 'ي'#9'شس', b( 7, 8, 0), False);
TestEnd(b( 7, 8, 0));
TestStart('Scan full line', 15, 1, 6, 15);
TestPreFirst(b( 6, 3, 0), True);
// TODO NextPos and TestEnd: Phys pos is allowed to be 6 OR 7
TestNext([], b( 6, 3, 0), b( 1, 8, 0), 1, 6, 1, 6, True, #9'شس', b( 7, 8, 0), False);
TestEnd(b( 7, 8, 0));
TestStart('Scan full line', 15, 1, 5, 15);
TestPreFirst(b( 5, 3, 1), True);
TestNext([], b( 5, 3, 1), b( 1, 8, 0), 1, 6, 1, 5, True, #9'شس');
TestStart('Scan full line', 15, 1, 4, 15);
TestPreFirst(b( 4, 3, 2), True);
TestNext([], b( 4, 3, 2), b( 1, 8, 0), 1, 6, 1, 4, True, #9'شس');
// RTL tab in 2 pieces
TestStart('RTL tab in 2 pieces', 15, 1, 7, 15);
TestPreFirst(b( 7, 1, 0), True);
TestNext([5], b( 7, 1, 0), b( 5, 4,-2), 3, 7, 5, 7, True, 'ي'#9, b( 5, 3, 1), True);
TestNext([], b( 5, 3, 1), b( 1, 8, 0), 1, 6, 1, 5, True, #9'شس', b( 7, 8, 0), False);
TestEnd(b( 7, 8, 0));
{%endregion} {%endregion}
{%region part line} {%region part line}
// 1 char parts // 1 char parts
TestStart('part line - begin', 12, 1, 2, 12); TestStart('part line - begin', 12, 1, 2, 12);
TestPreFirst(6, 2, True, 0); TestPreFirst(b( 2, 6, 0), True);
TestNext([100], 6, 8, 1, 2, 1, 2, True, 'ي'); TestNext([100], b( 2, 6), b( 1, 8), 1, 2, 1, 2, True, 'ي', b( 5, 8, 0), False);
TestEnd; TestEnd(b( 5, 8, 0));
TestStart('part line - mid', 12, 2, 3, 12); TestStart('part line - mid', 12, 2, 3, 12);
TestPreFirst(5, 3, True, 0); TestPreFirst(b( 3, 5, 0), True);
TestNext([100], 5, 6, 2, 3, 2, 3, True, ' '); TestNext([100], b( 3, 5), b( 2, 6), 2, 3, 2, 3, True, ' ', b( 5, 8, 0), False);
TestEnd; TestEnd(b( 5, 8, 0));
TestStart('part line - mid', 12, 3, 4, 12); TestStart('part line - mid', 12, 3, 4, 12);
TestPreFirst(3, 4, True, 0); TestPreFirst(b( 4, 3, 0), True);
TestNext([100], 3, 5, 3, 4, 3, 4, True, 'س'); TestNext([100], b( 4, 3), b( 3, 5), 3, 4, 3, 4, True, 'س', b( 5, 8, 0), False);
TestEnd; TestEnd(b( 5, 8, 0));
TestStart('part line - end', 12, 4, 5, 12); TestStart('part line - end', 12, 4, 5, 12);
TestPreFirst(1, 5, True, 0); TestPreFirst(b( 5, 1, 0), True);
TestNext([100], 1, 3, 4, 5, 4, 5, True, 'ش'); TestNext([100], b( 5, 1), b( 4, 3), 4, 5, 4, 5, True, 'ش', b( 5, 8, 0), False);
TestEnd; TestEnd(b( 5, 8, 0));
// 2 char parts // 2 char parts
TestStart('part line - begin(2)', 12, 1, 3, 12); TestStart('part line - begin(2)', 12, 1, 3, 12);
TestPreFirst(5, 3, True, 0); TestPreFirst(b( 3, 5, 0), True);
TestNext([100], 5, 8, 1, 3, 1, 3, True, ' ي'); TestNext([100], b( 3, 5), b( 1, 8), 1, 3, 1, 3, True, ' ي');
TestEnd; TestEnd;
TestStart('part line - mid(2)', 12, 2, 4, 12); TestStart('part line - mid(2)', 12, 2, 4, 12);
TestPreFirst(3, 4, True, 0); TestPreFirst(b( 4, 3, 0), True);
TestNext([100], 3, 6, 2, 4, 2, 4, True, 'س '); TestNext([100], b( 4, 3), b( 2, 6), 2, 4, 2, 4, True, 'س ');
TestEnd; TestEnd;
TestStart('part line - end(2)', 12, 3, 5, 12); TestStart('part line - end(2)', 12, 3, 5, 12);
TestPreFirst(1, 5, True, 0); TestPreFirst(b( 5, 1, 0), True);
TestNext([100], 1, 5, 3, 5, 3, 5, True, 'شس'); TestNext([100], b( 5, 1), b( 3, 5), 3, 5, 3, 5, True, 'شس');
TestEnd; TestEnd;
// 1 char parts, several chunks // 1 char parts, several chunks
TestStart('part line - begin', 12, 1, 100, 12); TestStart('part line - begin', 12, 1, 100, 12);
TestPreFirst(1, 5, True, 0); TestPreFirst(b( 5, 1, 0), True);
TestNext([4], 1, 3, 4, 5, 4, 5, True, 'ش'); TestNext([4], b( 5, 1), b( 4, 3), 4, 5, 4, 5, True, 'ش', b( 4, 3, 0), True);
TestNext([3], 3, 5, 3, 4, 3, 4, True, 'س'); TestNext([3], b( 4, 3), b( 3, 5), 3, 4, 3, 4, True, 'س', b( 3, 5, 0), True);
TestNext([2], 5, 6, 2, 3, 2, 3, True, ' '); TestNext([2], b( 3, 5), b( 2, 6), 2, 3, 2, 3, True, ' ', b( 2, 6, 0), True);
TestNext([1], 6, 8, 1, 2, 1, 2, True, 'ي'); TestNext([1], b( 2, 6), b( 1, 8), 1, 2, 1, 2, True, 'ي', b( 5, 8, 0), False);
TestEnd; TestEnd(b( 5, 8, 0));
// 1 char parts, several chunks // 1 char parts, several chunks
TestStart('part line - begin', 12, 1, 100, 12); TestStart('part line - begin', 12, 1, 100, 12);
TestPreFirst(1, 5, True, 0); TestPreFirst(b( 5, 1, 0), True);
TestNext([4], 1, 3, 4, 5, 4, 5, True, 'ش'); TestNext([4], b( 5, 1), b( 4, 3), 4, 5, 4, 5, True, 'ش');
TestNext([3], 3, 5, 3, 4, 3, 4, True, 'س'); TestNext([3], b( 4, 3), b( 3, 5), 3, 4, 3, 4, True, 'س');
TestNext([0], 5, 8, 1, 3, 1, 3, True, ' ي'); TestNext([0], b( 3, 5), b( 1, 8), 1, 3, 1, 3, True, ' ي');
TestEnd; TestEnd;
//TestStart('part line - begin', 12, 1, 100, 12); //TestStart('part line - begin', 12, 1, 100, 12);
@ -448,7 +568,7 @@ var
// //
//TestStart('part line - begin', 12, 1, 100, 12); //TestStart('part line - begin', 12, 1, 100, 12);
//TestNext( 2, 1, 6, 2, 5, 2, 5, True, 'شس '); //TestNext( 2, 1, 6, 2, 5, 2, 5, True, 'شس ');
//TestNext([100], 1, 3, 4, 5, 4, 5, True, 'شس ي'); //TestNext([100], b( 5, 1), b( 4, 3), 4, 5, 4, 5, True, 'شس ي');
//TestEnd; //TestEnd;
{%endregion} {%endregion}
@ -460,48 +580,48 @@ var
PushBaseName('MIXED Rtl/Ltr'); PushBaseName('MIXED Rtl/Ltr');
{%region full line} {%region full line}
TestStart('Scan full line', 13, 1, 100, 13); TestStart('Scan full line', 13, 1, 100, 13);
TestPreFirst(1, 1, False, 0); TestPreFirst(b( 1, 1, 0), False);
TestNext([], 1, 3, 1, 3, 1, 3, False, 'AB', 3, 7, True, 0); TestNext([], b( 1, 1), b( 3, 3), 1, 3, 1, 3, False, 'AB', b( 7, 3, 0), True);
TestNext([], 3, 10, 3, 7, 3, 7, True, 'شس ي', 10, 7, False, 0); TestNext([], b( 7, 3), b( 3,10), 3, 7, 3, 7, True, 'شس ي', b( 7,10, 0), False);
TestNext([], 10, 12, 7, 9, 7, 9, False, 'CD'); //, 3, 7, True, 0); TestNext([], b( 7,10), b( 9,12), 7, 9, 7, 9, False, 'CD', b( 9,12, 0), False);
TestEnd; TestEnd(b( 9,12, 0));
{%endregion} {%endregion}
{%region parts} {%region parts}
TestStart('Scan part line, cut at start', 13, 2, 100, 13); TestStart('Scan part line, cut at start', 13, 2, 100, 13);
TestPreFirst(2, 2, False, 0); TestPreFirst(b( 2, 2, 0), False);
TestNext([], 2, 3, 2, 3, 2, 3, False, 'B', 3, 7, True, 0); TestNext([], b( 2, 2), b( 3, 3), 2, 3, 2, 3, False, 'B', b( 7, 3, 0), True);
TestNext([], 3, 10, 3, 7, 3, 7, True, 'شس ي', 10, 7, False, 0); TestNext([], b( 7, 3), b( 3,10), 3, 7, 3, 7, True, 'شس ي', b( 7,10, 0), False);
TestNext([], 10, 12, 7, 9, 7, 9, False, 'CD'); TestNext([], b( 7,10), b( 9,12), 7, 9, 7, 9, False, 'CD');
TestEnd; TestEnd;
TestStart('Scan part line, cut at start', 13, 3, 100, 13); TestStart('Scan part line, cut at start', 13, 3, 100, 13);
TestPreFirst(3, 7, True, 0); TestPreFirst(b( 7, 3, 0), True);
TestNext([], 3, 10, 3, 7, 3, 7, True, 'شس ي', 10, 7, False, 0); TestNext([], b( 7, 3), b( 3,10), 3, 7, 3, 7, True, 'شس ي', b( 7,10, 0), False);
TestNext([], 10, 12, 7, 9, 7, 9, False, 'CD'); TestNext([], b( 7,10), b( 9,12), 7, 9, 7, 9, False, 'CD');
TestEnd; TestEnd;
TestStart('Scan part line, cut at start', 13, 4, 100, 13); TestStart('Scan part line, cut at start', 13, 4, 100, 13);
TestPreFirst(3, 7, True, 0); TestPreFirst(b( 7, 3, 0), True);
TestNext([], 3, 8, 4, 7, 4, 7, True, 'شس ', 10, 7, False, 0); TestNext([], b( 7, 3), b( 4, 8), 4, 7, 4, 7, True, 'شس ', b( 7,10, 0), False);
TestNext([], 10, 12, 7, 9, 7, 9, False, 'CD'); TestNext([], b( 7,10), b( 9,12), 7, 9, 7, 9, False, 'CD');
TestEnd; TestEnd;
TestStart('Scan part line, cut at start', 13, 6, 100, 13); TestStart('Scan part line, cut at start', 13, 6, 100, 13);
TestPreFirst(3, 7, True, 0); TestPreFirst(b( 7, 3, 0), True);
TestNext([], 3, 5, 6, 7, 6, 7, True, 'ش', 10, 7, False, 0); TestNext([], b( 7, 3), b( 6, 5), 6, 7, 6, 7, True, 'ش', b( 7,10, 0), False);
TestNext([], 10, 12, 7, 9, 7, 9, False, 'CD'); TestNext([], b( 7,10), b( 9,12), 7, 9, 7, 9, False, 'CD');
TestEnd; TestEnd;
TestStart('Scan part line, cut at start', 13, 7, 100, 13); TestStart('Scan part line, cut at start', 13, 7, 100, 13);
TestPreFirst(10, 7, False, 0); TestPreFirst(b( 7,10, 0), False);
TestNext([], 10, 12, 7, 9, 7, 9, False, 'CD'); TestNext([], b( 7,10), b( 9,12), 7, 9, 7, 9, False, 'CD');
TestEnd; TestEnd;
TestStart('Scan part line, cut at start', 13, 8, 100, 13); TestStart('Scan part line, cut at start', 13, 8, 100, 13);
TestPreFirst(11, 8, False, 0); TestPreFirst(b( 8,11, 0), False);
TestNext([], 11, 12, 8, 9, 8, 9, False, 'D'); TestNext([], b( 8,11), b( 9,12), 8, 9, 8, 9, False, 'D');
TestEnd; TestEnd;
TestStart('Scan part line, cut at start', 13, 9, 100, 13); TestStart('Scan part line, cut at start', 13, 9, 100, 13);
@ -509,32 +629,32 @@ var
TestStart('Scan part line, cut at end', 13, 1, 8, 13); TestStart('Scan part line, cut at end', 13, 1, 8, 13);
TestNext([], 1, 3, 1, 3, 1, 3, False, 'AB', 3, 7, True, 0); TestNext([], b( 1, 1), b( 3, 3), 1, 3, 1, 3, False, 'AB', b( 7, 3, 0), True);
TestNext([], 3, 10, 3, 7, 3, 7, True, 'شس ي', 10, 7, False, 0); TestNext([], b( 7, 3), b( 3,10), 3, 7, 3, 7, True, 'شس ي', b( 7,10, 0), False);
TestNext([], 10, 11, 7, 8, 7, 8, False, 'C'); TestNext([], b( 7,10), b( 8,11), 7, 8, 7, 8, False, 'C');
TestEnd; TestEnd;
TestStart('Scan part line, cut at end', 13, 1, 7, 13); TestStart('Scan part line, cut at end', 13, 1, 7, 13);
TestNext([], 1, 3, 1, 3, 1, 3, False, 'AB', 3, 7, True, 0); TestNext([], b( 1, 1), b( 3, 3), 1, 3, 1, 3, False, 'AB', b( 7, 3, 0), True);
TestNext([], 3, 10, 3, 7, 3, 7, True, 'شس ي'); TestNext([], b( 7, 3), b( 3,10), 3, 7, 3, 7, True, 'شس ي');
TestEnd; TestEnd;
TestStart('Scan part line, cut at end', 13, 1, 6, 13); TestStart('Scan part line, cut at end', 13, 1, 6, 13);
TestNext([], 1, 3, 1, 3, 1, 3, False, 'AB', 5, 6, True, 0); TestNext([], b( 1, 1), b( 3, 3), 1, 3, 1, 3, False, 'AB', b( 6, 5, 0), True);
TestNext([], 5, 10, 3, 6, 3, 6, True, 'س ي'); TestNext([], b( 6, 5), b( 3,10), 3, 6, 3, 6, True, 'س ي');
TestEnd; TestEnd;
TestStart('Scan part line, cut at end', 13, 1, 4, 13); TestStart('Scan part line, cut at end', 13, 1, 4, 13);
TestNext([], 1, 3, 1, 3, 1, 3, False, 'AB', 8, 4, True, 0); TestNext([], b( 1, 1), b( 3, 3), 1, 3, 1, 3, False, 'AB', b( 4, 8, 0), True);
TestNext([], 8, 10, 3, 4, 3, 4, True, 'ي'); TestNext([], b( 4, 8), b( 3,10), 3, 4, 3, 4, True, 'ي');
TestEnd; TestEnd;
TestStart('Scan part line, cut at end', 13, 1, 3, 13); TestStart('Scan part line, cut at end', 13, 1, 3, 13);
TestNext([], 1, 3, 1, 3, 1, 3, False, 'AB'); TestNext([], b( 1, 1), b( 3, 3), 1, 3, 1, 3, False, 'AB');
TestEnd; TestEnd;
TestStart('Scan part line, cut at end', 13, 1, 2, 13); TestStart('Scan part line, cut at end', 13, 1, 2, 13);
TestNext([], 1, 2, 1, 2, 1, 2, False, 'A'); TestNext([], b( 1, 1), b( 2, 2), 1, 2, 1, 2, False, 'A');
TestEnd; TestEnd;
@ -544,6 +664,85 @@ var
{%endregion} {%endregion}
UseViewTokenOnly := False;
{%region LTR only }
PushBaseName('LTR-Only - WITH MARKUP');
{%region full line}
SynEdit.BlockBegin := Point( 1,1); // clear selection
TestStart('Scan full line / hl-token', 1, 1, 99, 1);
TestNext([], b( 1, 1, 0), b(10,10, 0), 1,10, 1,10, False, 'unit foo;', clBlack);
TestNext([], b(10,10, 0), b(99,99, 0), 10,99, 10,99, False, ' ', clBlack);
TestEnd;
SynEdit.BlockBegin := Point(2,1);
SynEdit.BlockEnd := Point(4,1);
TestStart('Scan full line / hl-token', 1, 1, 99, 1);
TestNext([], b( 1, 1, 0), b( 2, 2, 0), 1, 2, 1, 2, False, 'u', clBlack);
TestNext([], b( 2, 2, 0), b( 4, 4, 0), 2, 4, 2, 4, False, 'ni', clPurple);
TestNext([], b( 4, 4, 0), b(10,10, 0), 4,10, 4,10, False, 't foo;', clBlack);
TestNext([], b(10,10, 0), b(99,99, 0), 10,99, 10,99, False, ' ', clBlack);
TestEnd;
SynEdit.BlockBegin := Point(2,1);
SynEdit.BlockEnd := Point(4,1);
TestStart('Scan full line / hl-token', 1, 6, 99, 1);
TestNext([], b( 6, 6, 0), b(10,10, 0), 6,10, 6,10, False, 'foo;', clBlack);
TestNext([], b(10,10, 0), b(99,99, 0), 10,99, 10,99, False, ' ', clBlack);
TestEnd;
SynEdit.BlockBegin := Point(20,1);
SynEdit.BlockEnd := Point(30,1);
TestStart('Scan full line / hl-token', 1, 1, 99, 1);
TestNext([], b( 1, 1, 0), b(10,10, 0), 1,10, 1,10, False, 'unit foo;', clBlack);
TestNext([], b(10,10, 0), b(20,20, 0), 10,20, 10,20, False, ' ', clBlack);
TestNext([], b(20,20, 0), b(30,30, 0), 20,30, 20,30, False, ' ', clPurple);
TestNext([], b(30,30, 0), b(99,99, 0), 30,99, 30,99, False, ' ', clBlack);
TestEnd;
SynEdit.BlockBegin := Point( 8,1);
SynEdit.BlockEnd := Point(30,1);
TestStart('Scan full line / hl-token', 1, 1, 99, 1);
TestNext([], b( 1, 1, 0), b( 8, 8, 0), 1, 8, 1, 8, False, 'unit fo', clBlack);
TestNext([], b( 8, 8, 0), b(10,10, 0), 8,10, 8,10, False, 'o;', clPurple);
TestNext([], b(10,10, 0), b(30,30, 0), 10,30, 10,30, False, ' ', clPurple);
TestNext([], b(30,30, 0), b(99,99, 0), 30,99, 30,99, False, ' ', clBlack);
TestEnd;
// Paint eol only
SynEdit.BlockBegin := Point( 1,1); // clear selection
TestStart('Scan full line / hl-token', 1, 10, 99, 1);
TestNext([], b(10,10, 0), b(99,99, 0), 10,99, 10,99, False, ' ', clBlack);
TestEnd;
SynEdit.BlockBegin := Point(20,1);
SynEdit.BlockEnd := Point(30,1);
TestStart('Scan full line / hl-token', 1, 25, 99, 1);
TestNext([], b(25,25, 0), b(30,30, 0), 25,30, 25,30, False, ' ', clPurple);
TestNext([], b(30,30, 0), b(99,99, 0), 30,99, 30,99, False, ' ', clBlack);
TestEnd;
{%endregion}
{%endregion}
{%region RTL only }
PushBaseName('RTL-Only - WITH MARKUP');
{%region full line}
SynEdit.BlockBegin := Point( 1,1); // clear selection
TestStart('Scan full line', 11, 1, 90, 11);
TestPreFirst(b( 3, 1, 0), True);
TestNext([], b( 3, 1, 0), b( 1, 5, 0), 1, 3, 1, 3, True, 'شس', clBlack);
TestNext([], b( 3, 5, 0), b(90,92, 0), 3,90, 3,90, False, ' ', clBlack);
TestEnd;
{%endregion}
PopBaseName;
{%endregion}
SynEdit.ViewedTextBuffer.DisplayView.FinishHighlighterTokens; SynEdit.ViewedTextBuffer.DisplayView.FinishHighlighterTokens;
end; end;