I am afraid that there are even more ReadXString/WriteXString usages that need changes.luowy wrote: and the TextModels.Attributes.Internalize/Externalize need Utf-8 conversions in ReadXString/WriteXString for the font.typeface also.
luowy
great! maybe a final solution for such issues.Zinn wrote:Why don't you insert the Utf8 conversion into the procedure ReadReadXString/WriteXString directly? Then you don't have to search for all other changes.
I will wait until I know what we do with the Luowy's problem. Do we stay on Josef's current solution or do we some further changes? Should we solve Luowy's problem here before we vote?Ivan Denisov wrote:Dear, Helmut, can you please create the voting for including this bug fix in master.
Code: Select all
Location Count
Std\Mod\Headers.odc 5
System\Mod\Controls.odc 5
System\Mod\Stores.odc 5
Cpc\Mod\ETHConv.odc 3
Std\Mod\ETHConv.odc 3
Std\Mod\Links.odc 2
Cpc\Mod\ETHConvV4Elems.odc 1
Ole\Mod\Client.odc 1
Std\Mod\Folds.odc 1
Std\Mod\Stamps.odc 1
System\Mod\Views.odc 1
Text\Mod\Models.odc 1
Code: Select all
(*
PROCEDURE (VAR rd: Reader) ReadXChar* (OUT x: CHAR), NEW;
VAR c: SHORTCHAR;
BEGIN
rd.rider.ReadByte(SYSTEM.VAL(BYTE,c)); x := c
END ReadXChar;
*)
PROCEDURE (VAR rd: Reader) ReadXChar* (OUT x: CHAR), NEW;
VAR c: SHORTCHAR;
VAR v: INTEGER;
BEGIN
rd.rider.ReadByte(SYSTEM.VAL(BYTE, c));
IF c < 80X THEN
v := ORD(c);
ELSIF c < 0E0X THEN
v := ORD(c) MOD 32;
rd.rider.ReadByte(SYSTEM.VAL(BYTE, c));
v := v * 64 + ORD(c) MOD 64
ELSE
v := ORD(c) MOD 16;
rd.rider.ReadByte(SYSTEM.VAL(BYTE, c));
v := v * 64 + ORD(c) MOD 64;
rd.rider.ReadByte(SYSTEM.VAL(BYTE, c));
v := v * 64 + ORD(c) MOD 64;
END;
x:=CHR(v);
END ReadXChar;
(*
PROCEDURE (VAR wr: Writer) WriteXChar* (x: CHAR), NEW;
VAR c: SHORTCHAR;
BEGIN
c := SHORT(x); wr.rider.WriteByte(SYSTEM.VAL(BYTE, c))
END WriteXChar;
*)
PROCEDURE (VAR wr: Writer) WriteXChar* (x: CHAR), NEW;
VAR c: SHORTCHAR;
BEGIN
IF x < 80X THEN
c:=SHORT(x);wr.rider.WriteByte(SYSTEM.VAL(BYTE, c))
ELSIF x < 800X THEN
c:=SHORT(CHR(0C0H + ORD(x) DIV 64 )); wr.rider.WriteByte(SYSTEM.VAL(BYTE, c));
c := SHORT(CHR( 80H + ORD(x) MOD 64 )); wr.rider.WriteByte(SYSTEM.VAL(BYTE, c));
ELSE
c := SHORT(CHR(0E0H + ORD(x) DIV 4096)); wr.rider.WriteByte(SYSTEM.VAL(BYTE, c));
c := SHORT(CHR(80H + ORD(x) DIV 64 MOD 64 )); wr.rider.WriteByte(SYSTEM.VAL(BYTE, c));
c := SHORT(CHR(80H + ORD(x) MOD 64 )); wr.rider.WriteByte(SYSTEM.VAL(BYTE, c));
END
END WriteXChar;
We can't change Read/WriteXChar, because it is used by StdETHConv. This module needs an unchanged Read/WriteXChar otherwise StdETHConv doesn't work.luowy wrote: Search for the ReadXString, get these modules list( at least)
...
for ReadXString use the ReadXChar, modify the ReadXChar/WriteXChar should get same result.
though this fixup can solve my problem, but the side effect is obvious.
I can't find a perfect solution.
luowy
Code: Select all
PROCEDURE (VAR rd: Reader) ReadXString* (OUT x: ARRAY OF CHAR), NEW;
VAR res: INTEGER; utf8: Kernel.Utf8Name;
BEGIN
rd.ReadSString(utf8); Strings.Utf8ToString(utf8, x, res); ASSERT(res = 0)
END ReadXString;
...
PROCEDURE (VAR wr: Writer) WriteXString* (IN x: ARRAY OF CHAR), NEW;
VAR res: INTEGER; utf8: Kernel.Utf8Name;
BEGIN
Strings.StringToUtf8(x, utf8, res); ASSERT(res = 0); wr.WriteSString(utf8)
END WriteXString;