paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-16 18:26:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

* CP819/IBM819 should be mapped to Windows code page 28591 (ISO8859-1)

Browse Source 
(mantis #30639)

git-svn-id: trunk@35397 -
This commit is contained in:
Jonas Maebe 2017-02-04 22:44:36 +00:00
parent b41989adfa
commit 6d5339cdb6
3 changed files with 95 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -15325,6 +15325,7 @@ tests/webtbs/tw30572.pp svneol=native#text/plain
tests/webtbs/tw30626.pp svneol=native#text/pascal
tests/webtbs/tw30626b.pp svneol=native#text/pascal
tests/webtbs/tw3063.pp svneol=native#text/plain
tests/webtbs/tw30639.pp svneol=native#text/plain
tests/webtbs/tw3064.pp svneol=native#text/plain
tests/webtbs/tw30666.pp svneol=native#text/plain
tests/webtbs/tw30706.pp svneol=native#text/plain

4
rtl/unix/unixcp.pp
View File

@ -279,8 +279,6 @@ const
(cp:1251; name:'MS-CYRL'),
(cp:1251; name:'WINDOWS-1251'),
(cp:1251; name:'windows-1251'), (* ANSI Cyrillic; Cyrillic (Windows) *)
(cp:1252; name:'CP819'),
(cp:1252; name:'IBM819'),
(cp:1252; name:'CP1252'),
(cp:1252; name:'MS-ANSI'),
(cp:1252; name:'WINDOWS-1252'),
@ -463,6 +461,8 @@ const
{$ifdef aix}
(cp:21866; name:'IBM-1124'), (* AIX *)
{$endif}
(cp:28591; name:'CP819'),
(cp:28591; name:'IBM819'),
(cp:28591; name:'ISO-8859-1'),
(cp:28591; name:'ISO-IR-100'),
(cp:28591; name:'ISO8859-1'),

92
tests/webtbs/tw30639.pp Normal file
View File

@ -0,0 +1,92 @@
program cp;
{$mode objfpc}
{$h+}
{$codepage utf8}
uses
SysUtils
{$ifdef unix}, cwstring
{$endif};
type
string1252 = type ansistring(1252);
function StrToHex(S: RawByteString): String;
var
i: Integer;
begin
Result := '';
for i := 1 to Length(S) do
begin
Result := Result + IntToHex(Ord(S[i]),2);
if i < Length(S) then Result := Result + #32;
end;
end;
function StrToHex(S: UnicodeString): String;
var
i: Integer;
begin
Result := '';
for i := 1 to Length(S) do
begin
Result := Result + IntToHex(Word(S[i]),4);
if i < Length(S) then Result := Result + #32;
end;
end;
function DebugString(S: RawByteString): String;
begin
Result := Format('[%.5d] %s',[StringCodePage(S),StrToHex(S)]);
end;
function DebugString(S: UnicodeString): String;
begin
Result := StrToHex(S);
end;
procedure Test(VarName: String; S: RawByteString; Expected: String);
begin
write(VarName,': ',DebugString(S));
if StrToHex(S) = Expected then
writeln(': Ok')
else
writeln(': FAIL: Expected: ',Expected);
end;
procedure Test(VarName: String; S: UnicodeString; Expected: String);
begin
write(VarName,': ',DebugString(S));
if StrToHex(S) = Expected then
writeln(': Ok')
else
writeln(': FAIL: Expected: ',Expected);
end;
var
s: string;
s1252: string1252;
sutf8: utf8string;
us: UnicodeString;
begin
writeln('DefaultSystemCodePage = ',DefaultSystemCodePage);
sutf8 := #$E2#$82#$AC; //eur symbol in UTF8 encoding
Test('sutf8',sutf8,'E2 82 AC');
s := sutf8;
SetCodePage(RawBytestring(s), 1252, true);
Test('s ', s, '80');
s1252 := sutf8;
Test('s1252', s1252, '80');
us := UnicodeString(sutf8);
Test('us ', us, '20AC');
us := UnicodeString(s1252);
Test('us ', us, '20AC');
end.