github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Syncing uppdev

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1586 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-09-24 08:54:24 +00:00
parent 5a4eb7fc20
commit 3e98921fbe
2 changed files with 66 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

13
uppdev/Charset/Charset.cpp
View file

@ -4,6 +4,17 @@ using namespace Upp;
CONSOLE_APP_MAIN
{
DDUMP(ToCharset(CHARSET_UTF8, "XXX", CHARSET_TOASCII));
String h;
for(int i = 128; i < 256; i++)
h.Cat(i);
// int chrset = CHARSET_ARMSCII_8;
int chrset = CHARSET_CP1161;
WString w = ToUnicode(h, chrset);
for(int i = 0; i < 128; i++) {
if(i + 128 != (int)FromUnicode(w[i], chrset))
LOG(i + 128 << ' ' << (int)w[i] << ' ' << (int)FromUnicode(w[i], chrset) << " <-----");
else
LOG(i + 128 << ' ' << (int)w[i] << ' ' << (int)FromUnicode(w[i], chrset));
}
}

107
uppdev/Iml2/test.iml
View file

@ -101,56 +101,57 @@ IMAGE_DATA(245,35,143,231,79,17,124,9,99,231,249,95,13,18,251,178,0,0,0,0,0,0,0,
IMAGE_END_DATA(1248, 3)
IMAGE_BEGIN_DATA
IMAGE_DATA(120,156,237,88,217,79,92,85,24,63,195,101,102,152,25,6,134,109,4,4,10,178,47,101,47,75,65,2,65,8,33,12)
IMAGE_DATA(155,29,16,40,107,161,45,80,48,83,219,184,75,155,38,26,27,168,98,236,70,91,64,33,180,162,190,251,218,23,125,244)
IMAGE_DATA(169,137,79,62,244,69,163,47,254,7,248,251,122,207,129,203,117,46,29,64,239,208,120,127,205,47,119,202,61,223,57,223)
IMAGE_DATA(119,190,237,156,203,92,204,197,2,64,18,232,5,171,2,25,172,192,2,184,197,185,9,62,229,191,127,228,115,106,161,138)
IMAGE_DATA(143,221,212,24,231,227,243,120,53,116,125,170,241,46,144,113,155,92,239,64,32,244,76,82,253,127,63,88,80,172,231,229)
IMAGE_DATA(235,239,7,74,25,122,250,246,41,79,186,111,253,75,242,135,213,255,176,251,199,216,225,252,199,216,225,227,71,57,239,65)
IMAGE_DATA(226,87,137,131,230,143,63,93,159,159,191,26,197,224,160,201,191,159,121,188,10,250,152,246,198,40,231,32,210,166,108,105)
IMAGE_DATA(80,11,30,240,23,229,216,112,147,229,137,43,196,246,88,73,13,217,237,245,44,76,250,43,78,114,126,31,43,133,247,69)
IMAGE_DATA(135,216,155,212,212,146,133,220,31,144,187,141,49,36,119,13,156,9,64,126,91,86,181,158,230,28,10,217,5,13,217,61)
IMAGE_DATA(231,224,251,235,21,246,106,217,169,158,67,140,227,178,191,147,236,75,146,243,218,30,178,77,180,31,216,243,159,84,254,251)
IMAGE_DATA(153,251,230,87,45,57,90,139,124,167,225,255,63,249,218,223,249,219,31,146,165,61,161,49,146,100,250,205,17,110,189,24)
IMAGE_DATA(102,51,55,90,172,161,141,120,94,21,243,96,236,99,127,251,195,99,100,43,204,110,254,1,50,5,42,54,210,59,140,121)
IMAGE_DATA(194,229,119,205,225,150,156,179,98,93,190,166,90,190,128,235,190,204,229,118,205,33,214,134,206,159,250,147,85,200,139,53)
IMAGE_DATA(119,205,33,236,182,59,44,253,154,242,70,49,48,138,129,81,12,140,98,176,87,49,80,195,184,38,236,173,167,113,77,248)
IMAGE_DATA(167,46,129,194,184,38,104,227,72,92,19,14,131,45,213,243,48,115,4,107,125,3,6,254,127,40,197,63,66,12,115,7)
IMAGE_DATA(89,19,3,6,12,24,48,96,192,128,129,255,12,38,5,67,14,64,165,124,48,32,214,150,64,51,104,5,195,56,109,1)
IMAGE_DATA(80,140,181,114,121,137,233,107,143,221,108,54,103,71,70,70,214,199,196,196,180,128,173,177,177,177,158,184,184,184,14,176)
IMAGE_DATA(139,179,91,139,209,209,209,158,176,176,176,42,147,201,148,140,185,162,193,72,48,156,219,19,170,151,29,146,36,165,228,229)
IMAGE_DATA(229,77,118,116,116,124,214,219,219,123,171,175,175,239,14,177,191,191,127,9,207,37,60,239,41,57,48,48,112,95,73,175)
IMAGE_DATA(215,123,187,180,180,244,93,171,213,250,42,166,59,6,38,130,177,220,22,11,147,99,77,15,59,142,229,231,231,79,117,118)
IMAGE_DATA(118,126,206,245,191,75,54,144,142,167,79,159,126,48,50,50,178,58,62,62,190,118,246,236,217,245,51,103,206,172,13,13)
IMAGE_DATA(13,173,12,14,14,110,19,182,47,149,151,151,207,217,108,182,22,76,151,11,190,2,38,48,217,47,20,103,146,30,118,0)
IMAGE_DATA(14,236,101,1,226,163,57,62,62,190,43,33,33,161,39,49,49,113,32,57,57,121,172,168,168,232,157,238,238,238,91,164)
IMAGE_DATA(255,249,243,231,55,198,198,198,190,110,107,107,251,178,176,176,240,163,244,244,244,183,210,210,210,124,73,73,73,211,17,17)
IMAGE_DATA(17,61,33,33,33,53,152,139,62,185,166,51,217,39,46,157,237,16,32,255,83,28,80,60,36,68,69,69,121,218,219,219)
IMAGE_DATA(23,39,39,39,55,136,19,19,19,235,23,46,92,248,6,191,31,214,214,214,94,119,56,28,111,96,28,125,170,174,7,79)
IMAGE_DATA(50,246,236,98,151,3,166,128,113,160,147,233,24,87,10,80,62,82,94,218,145,183,39,90,90,90,174,251,124,190,111,135)
IMAGE_DATA(135,135,151,171,170,170,174,228,228,228,92,106,106,106,186,113,238,220,185,13,248,103,29,57,245,30,98,146,98,137,242,162)
IMAGE_DATA(18,44,100,178,47,226,217,78,76,233,150,231,42,59,76,136,143,228,226,226,98,31,116,93,69,142,44,33,118,38,160,239)
IMAGE_DATA(9,188,43,133,15,58,26,27,27,231,201,63,61,61,61,75,168,107,131,248,123,5,88,206,228,152,74,101,114,142,59,152)
IMAGE_DATA(92,123,69,63,209,27,22,183,219,237,129,254,119,145,11,43,5,5,5,111,194,6,218,103,138,151,34,178,5,117,25,38)
IMAGE_DATA(244,220,65,140,61,170,172,172,156,195,123,202,139,98,110,7,229,184,155,219,17,12,95,60,3,213,174,186,186,186,57,236)
IMAGE_DATA(247,122,115,115,243,39,168,65,39,185,110,164,35,217,147,11,127,229,195,95,151,167,166,166,54,168,46,195,174,83,252,29)
IMAGE_DATA(49,27,124,25,140,96,114,110,4,195,142,80,212,170,46,228,195,125,212,211,123,41,41,41,67,220,134,92,174,99,30,152)
IMAGE_DATA(6,186,157,78,103,3,124,114,19,53,108,29,53,237,50,108,43,227,99,242,249,24,138,45,234,241,122,215,42,242,69,114)
IMAGE_DATA(125,125,253,21,196,203,70,67,67,195,53,139,197,66,186,101,48,217,23,199,193,76,38,247,5,39,122,119,108,89,89,217)
IMAGE_DATA(165,233,233,233,141,214,214,214,121,228,77,147,191,113,76,255,216,50,33,47,218,208,243,30,140,142,142,46,35,183,199,216)
IMAGE_DATA(110,95,208,147,122,53,157,59,158,245,4,58,195,80,30,81,223,164,126,131,191,101,49,217,31,34,182,168,102,233,29,91)
IMAGE_DATA(174,138,138,138,183,103,103,103,31,161,207,205,35,47,106,153,92,67,53,247,152,114,169,164,164,228,34,122,204,13,236,193)
IMAGE_DATA(41,110,103,38,219,233,131,186,219,97,183,219,79,160,111,47,162,55,172,161,70,205,34,110,72,31,170,81,34,230,83,25)
IMAGE_DATA(125,186,148,125,33,250,154,5,231,203,44,228,74,29,108,162,241,84,167,146,56,233,183,232,131,122,217,17,154,145,145,49)
IMAGE_DATA(138,126,253,21,108,249,194,229,114,181,112,189,243,217,78,13,74,228,122,153,85,122,137,222,73,246,81,141,138,102,59,103)
IMAGE_DATA(94,27,211,49,63,80,107,18,144,215,87,103,102,102,30,162,111,191,143,189,165,186,68,251,75,241,36,122,130,178,254,168)
IMAGE_DATA(245,18,182,88,249,24,59,147,237,210,181,15,226,140,87,135,51,235,77,202,239,212,212,212,17,38,199,185,50,191,233,94)
IMAGE_DATA(177,87,172,43,239,95,161,10,234,217,203,67,51,51,51,199,112,6,89,241,120,60,11,176,233,53,38,215,127,138,41,242)
IMAGE_DATA(5,249,133,206,75,225,236,249,49,98,242,67,93,128,152,138,23,253,187,186,186,250,3,196,20,233,79,186,147,13,90,249)
IMAGE_DATA(125,228,128,254,85,73,117,138,206,82,184,79,140,51,89,111,170,83,199,249,147,106,79,48,250,192,190,128,187,82,47,245)
IMAGE_DATA(190,174,174,174,69,220,55,90,217,78,110,236,55,166,130,138,172,172,44,92,89,199,87,107,106,106,62,196,57,164,132,201)
IMAGE_DATA(118,100,115,166,178,23,32,166,8,116,182,192,185,246,99,156,15,95,231,223,59,40,142,168,206,82,174,139,59,246,145,142)
IMAGE_DATA(41,2,116,119,227,238,87,132,124,167,243,16,221,167,169,15,83,207,35,27,168,159,81,47,56,210,49,165,128,232,99,212)
IMAGE_DATA(195,168,39,71,49,217,15,116,23,10,198,253,250,160,16,223,63,213,223,16,201,6,127,253,251,40,67,216,34,122,178,196)
IMAGE_DATA(130,119,183,54,96,192,128,1,3,6,12,188,192,248,27,64,86,73,179,0,0,0,0,0,0,0,0,0,0,0,0,0)
IMAGE_END_DATA(1664, 6)
IMAGE_DATA(120,156,237,88,219,83,19,87,24,63,97,73,66,18,2,225,150,2,5,132,114,145,155,220,5,20,202,192,164,48,12,67)
IMAGE_DATA(68,168,129,114,21,16,148,123,39,86,167,247,162,195,76,59,117,196,214,78,189,161,130,173,12,90,219,190,247,213,151,246)
IMAGE_DATA(177,79,206,244,169,15,190,180,211,190,244,63,160,191,207,61,71,150,109,22,19,82,55,56,238,207,249,205,70,246,124,231)
IMAGE_DATA(124,223,249,110,231,44,115,49,23,11,2,25,160,15,172,15,102,176,2,203,224,38,231,3,240,49,255,253,51,159,83,11)
IMAGE_DATA(245,124,236,3,141,113,126,62,143,79,67,215,199,26,239,130,25,247,128,235,29,12,132,158,25,170,255,135,130,101,197,122)
IMAGE_DATA(62,190,126,40,80,202,208,211,31,162,60,233,190,249,63,201,135,171,127,184,251,199,88,120,254,99,44,252,248,81,206,187)
IMAGE_DATA(155,248,85,98,183,249,19,72,215,103,231,175,70,49,216,109,242,135,50,143,79,65,63,211,222,24,229,28,68,218,148,77)
IMAGE_DATA(13,106,193,11,254,166,28,27,107,178,60,114,69,217,30,42,169,33,251,116,61,11,147,254,73,145,156,63,38,75,177,253)
IMAGE_DATA(137,81,246,86,53,181,100,33,247,23,228,174,97,12,201,45,129,243,65,200,63,149,85,173,167,57,135,66,118,89,67,118)
IMAGE_DATA(199,57,248,254,250,132,189,90,118,170,231,16,227,184,236,159,36,251,138,228,92,218,65,182,149,246,3,123,254,139,202,127)
IMAGE_DATA(191,114,223,252,174,37,71,107,145,239,52,252,255,55,95,251,135,64,251,67,178,180,39,52,70,146,76,127,56,98,173,167)
IMAGE_DATA(99,108,102,143,197,26,237,193,243,188,152,7,99,31,6,218,31,30,35,155,49,118,243,79,144,41,85,209,67,239,48,230)
IMAGE_DATA(17,151,223,54,135,91,114,46,136,117,249,154,106,249,82,174,251,42,151,219,54,135,88,27,58,127,30,72,86,33,47,214)
IMAGE_DATA(220,54,135,176,219,238,176,12,104,202,27,197,224,249,23,3,98,56,197,128,201,1,186,235,98,160,146,15,169,24,4,144)
IMAGE_DATA(13,169,24,104,201,7,91,12,212,242,161,22,3,229,251,112,138,129,198,122,155,47,67,49,80,195,184,38,236,172,167,113)
IMAGE_DATA(77,248,175,46,193,194,184,38,104,99,79,92,19,194,193,166,234,25,206,28,145,90,223,128,129,151,15,85,248,71,72,98)
IMAGE_DATA(238,8,107,98,192,128,1,3,6,12,24,48,240,220,96,82,48,106,23,84,202,71,2,98,109,9,52,131,86,48,134,211)
IMAGE_DATA(22,4,197,88,43,151,151,152,190,246,216,205,102,243,254,248,248,248,230,164,164,164,118,176,35,57,57,217,155,146,146,210)
IMAGE_DATA(5,118,115,246,104,49,49,49,209,27,19,19,83,111,50,153,50,49,87,34,24,15,198,114,123,162,245,178,67,146,164,172)
IMAGE_DATA(226,226,226,233,174,174,174,47,250,250,250,174,246,247,247,95,39,14,12,12,172,224,185,130,231,77,37,7,7,7,111,41)
IMAGE_DATA(233,243,249,174,85,85,85,189,111,181,90,95,199,116,251,192,116,48,153,219,98,97,114,172,233,97,199,190,146,146,146,153)
IMAGE_DATA(163,71,143,126,201,245,191,65,54,144,142,67,67,67,183,71,71,71,239,76,76,76,220,61,121,242,228,250,137,19,39,238)
IMAGE_DATA(142,140,140,172,13,15,15,63,37,108,95,169,169,169,89,180,217,108,237,152,174,8,124,13,76,99,178,95,40,206,36,61)
IMAGE_DATA(236,0,28,216,203,82,196,71,91,106,106,106,119,90,90,90,111,122,122,250,96,102,102,230,120,121,121,249,123,61,61,61)
IMAGE_DATA(87,73,255,169,169,169,141,241,241,241,111,59,59,59,191,46,43,43,251,36,55,55,247,157,156,156,28,127,70,70,198,108)
IMAGE_DATA(92,92,92,111,84,84,84,3,230,162,79,174,185,76,246,137,75,103,59,4,200,255,20,7,20,15,105,9,9,9,222,35)
IMAGE_DATA(71,142,92,158,158,158,222,32,78,78,78,174,207,205,205,125,135,223,247,26,27,27,47,56,28,142,183,48,142,62,85,55)
IMAGE_DATA(131,135,25,123,114,177,43,4,179,192,20,208,201,116,140,43,5,40,31,41,47,237,200,219,131,237,237,237,23,252,126,255)
IMAGE_DATA(247,199,143,31,95,173,175,175,63,87,88,88,120,166,181,181,245,210,169,83,167,54,224,159,117,228,212,7,136,73,138,37)
IMAGE_DATA(202,139,58,176,140,201,190,72,101,91,49,165,91,158,171,236,48,33,62,50,43,42,42,252,208,245,14,114,100,5,177,51)
IMAGE_DATA(9,125,15,226,93,21,124,208,229,241,120,46,146,127,122,123,123,87,80,215,134,241,247,90,176,134,201,49,149,205,228,28)
IMAGE_DATA(119,48,185,246,138,126,162,55,44,110,183,219,11,253,111,32,23,214,74,75,75,223,134,13,180,207,20,47,229,100,11,234)
IMAGE_DATA(50,76,232,189,142,24,187,95,87,87,183,136,247,148,23,21,220,14,202,113,55,183,35,18,190,120,2,170,93,77,77,77)
IMAGE_DATA(139,216,239,245,182,182,182,207,80,131,14,115,221,72,71,178,167,8,254,42,129,191,206,206,204,204,108,80,93,134,93,199)
IMAGE_DATA(248,59,226,126,240,85,48,142,201,185,17,9,59,162,81,171,186,145,15,183,80,79,111,102,101,101,141,112,27,138,184,142)
IMAGE_DATA(197,96,14,232,118,58,157,45,240,201,21,212,176,117,212,180,179,176,173,154,143,41,225,99,40,182,168,199,235,93,171,200)
IMAGE_DATA(23,153,205,205,205,231,16,47,27,45,45,45,75,22,139,133,116,203,99,178,47,14,128,249,76,238,11,78,244,238,228,234)
IMAGE_DATA(234,234,51,179,179,179,27,29,29,29,23,145,55,173,129,198,49,253,99,203,132,188,232,68,207,187,61,54,54,182,138,220)
IMAGE_DATA(30,103,219,125,65,79,234,213,116,238,120,210,19,232,12,67,121,68,125,147,250,13,254,86,192,100,127,136,216,162,154,165)
IMAGE_DATA(119,108,185,106,107,107,223,93,88,88,184,143,62,119,17,121,209,200,228,26,170,185,199,148,75,149,149,149,167,209,99,46)
IMAGE_DATA(97,15,142,113,59,243,217,86,31,212,221,14,187,221,126,16,125,251,50,122,195,93,212,168,5,196,13,233,67,53,74,196)
IMAGE_DATA(124,54,163,79,151,178,47,68,95,179,224,124,89,128,92,105,130,77,52,158,234,84,6,39,253,22,125,80,47,59,162,243)
IMAGE_DATA(242,242,198,208,175,191,129,45,95,185,92,174,118,174,119,9,219,170,65,233,92,47,179,74,47,209,59,201,62,170,81,137)
IMAGE_DATA(108,235,204,107,99,58,230,7,106,77,26,242,250,252,252,252,252,61,244,237,15,177,183,84,151,104,127,41,158,68,79,80)
IMAGE_DATA(214,31,181,94,194,22,43,31,99,103,178,93,186,246,65,156,241,154,112,102,189,66,249,157,157,157,61,202,228,56,87,230)
IMAGE_DATA(55,221,43,118,138,117,229,253,43,90,65,61,123,121,116,126,126,254,56,206,32,107,94,175,119,25,54,189,193,228,250,79)
IMAGE_DATA(49,69,190,32,191,208,121,41,150,61,59,70,76,1,168,11,16,83,169,162,127,31,58,116,232,35,196,20,233,79,186,147)
IMAGE_DATA(13,90,249,189,231,128,254,85,71,117,138,206,82,184,79,76,48,89,111,170,83,7,248,147,106,79,36,250,64,72,192,93)
IMAGE_DATA(169,143,122,95,119,119,247,101,220,55,58,216,86,110,132,26,83,17,69,65,65,1,174,172,19,119,26,26,26,62,198,57)
IMAGE_DATA(164,146,201,118,236,231,204,102,47,64,76,17,232,108,129,115,237,167,56,31,190,201,191,119,80,28,81,157,165,92,23,119)
IMAGE_DATA(236,61,29,83,4,232,238,198,221,175,28,249,78,231,33,186,79,83,31,166,158,71,54,80,63,163,94,176,167,99,74,1)
IMAGE_DATA(209,199,168,135,81,79,78,96,178,31,232,46,20,137,251,245,110,33,190,127,170,191,33,146,13,129,250,247,94,134,176,69)
IMAGE_DATA(244,100,137,69,238,110,109,192,128,1,3,6,12,24,120,129,241,47,141,100,80,249,0,0,0,0,0,0,0,0,0,0)
IMAGE_END_DATA(1696, 6)