mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

UPD: Use UnicodeToUTF8

Browse source
This commit is contained in:
Alexander Koblov 2015-03-06 21:29:55 +00:00
commit 8a94f5fa8b
2 changed files with 3 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

33
components/viewer/unicodeutils.pas
View file

@ -63,7 +63,6 @@ function Utf8ToUtf16LE(const s: string): string; // UTF16-LE 2 or 4 byte little
function Utf8ToUtf16BE(const s: string): string; // UTF16-BE 2 or 4 byte big endian
function UTF8ToUCS4(const UTF8Text: String): UCS4String;
function UCS4ToUTF8(UCS4Character: UCS4Char): String;
{en
Replaces invalid UTF-8 characters with '?'.
@ -483,38 +482,6 @@ begin
SetLength(Result, Index);
end;
function UCS4ToUTF8(UCS4Character: UCS4Char): String;
begin
// 1 byte length
if (UCS4Character < $80) then
begin
Result:= AnsiChar(UCS4Character);
end
// 2 bytes length
else if (UCS4Character < $800) then
begin
SetLength(Result, 2);
Result[1]:= AnsiChar($c0 or ((UCS4Character shr 6) and $1f));
Result[2]:= AnsiChar($80 or (UCS4Character and $3f));
end
// 3 bytes length
else if (UCS4Character < $1000) then
begin
SetLength(Result, 3);
Result[1]:= AnsiChar($c0 or ((UCS4Character shr 12) and $0f));
Result[2]:= AnsiChar($80 or ((UCS4Character shr 6) and $3f));
Result[3]:= AnsiChar($80 or (UCS4Character and $3f));
end
// 4 bytes length
else begin
SetLength(Result, 4);
Result[1]:= AnsiChar($c0 or ((UCS4Character shr 18) and $07));
Result[2]:= AnsiChar($80 or ((UCS4Character shr 12) and $3f));
Result[3]:= AnsiChar($80 or ((UCS4Character shr 6) and $3f));
Result[4]:= AnsiChar($80 or (UCS4Character and $3f));
end;
end;
function Utf8ReplaceBroken(const s: UTF8String): UTF8String;
var
Src, Dst, LastGoodPos: PByte;

6
src/uparitercontrols.pas
View file

@ -91,7 +91,7 @@ type
implementation
uses
Graphics, UnicodeUtils;
LazUTF8, Graphics, UnicodeUtils;
{ TSynDiffHighlighter }
@ -106,10 +106,10 @@ var
procedure AddTokenIfNeed(Symbol: UCS4Char; Kind: TChangeKind);
begin
if (Kind = LastKind) then // Same Kind, no need to change colors
LastToken := LastToken + UCS4ToUTF8(Symbol)
LastToken := LastToken + UnicodeToUTF8(Symbol)
else begin
fTokens.AddObject(LastToken, TObject(PtrInt(LastKind)));
LastToken := UCS4ToUTF8(Symbol);
LastToken := UnicodeToUTF8(Symbol);
LastKind := Kind;
end;
end;