forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixup a4a9a50a09, unpaired backticks were not handled correctly

This commit is contained in:
Basile Burg 2020-04-01 12:48:47 +02:00
parent 31fceb321d
commit c224f46daf
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/u_messages.pas
View File

@ -619,7 +619,7 @@ var
x: integer; x: integer;
rc: TRect; rc: TRect;
r: TStringRange = (ptr:nil; pos:0; len: 0); r: TStringRange = (ptr:nil; pos:0; len: 0);
t: TStringRange = (ptr:nil; pos:0; len: 0); t: TStringRange;
s: string; s: string;
p: boolean = false; p: boolean = false;
c: array [boolean] of TColor; c: array [boolean] of TColor;
@ -647,18 +647,32 @@ begin
r.init(node.Text); r.init(node.Text);
while not r.empty do while not r.empty do
begin begin
p := false;
// non highlighted part
t := r.takeUntil('`'); t := r.takeUntil('`');
if p then
t.takeMore(1);
s := t.yield(); s := t.yield();
if p then
s := '`' + s + '`';
if not r.empty() then
r.popFront();
Sender.Canvas.font.Color:= c[p]; Sender.Canvas.font.Color:= c[p];
Sender.Canvas.TextOut(x, rc.Top, s); Sender.Canvas.TextOut(x, rc.Top, s);
x += sender.Canvas.TextWidth(s); x += sender.Canvas.TextWidth(s);
p := not p;
// possibly highlighted part
if not r.empty() and (r.front = '`') then
begin
r.popFront();
s := '`';
t := r.takeUntil('`');
p := not r.empty() and (r.front() = '`');
if p then
begin
t := t.takeMore(1);
r.popFront();
end;
s += t.yield();
Sender.Canvas.font.Color:= c[p];
Sender.Canvas.TextOut(x, rc.Top, s);
x += sender.Canvas.TextWidth(s);
end;
end; end;
end; end;