diff --git a/intl/uconv/ucvlatin/8859-7.uf b/intl/uconv/ucvlatin/8859-7.uf index 1cd94355dec..162b8fcf1d0 100644 --- a/intl/uconv/ucvlatin/8859-7.uf +++ b/intl/uconv/ucvlatin/8859-7.uf @@ -32,7 +32,7 @@ Begin of Item 0000 Format 0 srcBegin = 0000 - srcEnd = 00A0 + srcEnd = 007F destBegin = 0000 End of Item 0000 @@ -52,38 +52,48 @@ End of Item 0002 Begin of Item 0003 Format 1 - srcBegin = 00A3 + srcBegin = 00A0 srcEnd = 00BD mappingOffset = 0000 Mapping = - 00A3 FFFD FFFD 00A6 00A7 00A8 00A9 FFFD - 00AB 00AC 00AD FFFD FFFD 00B0 00B1 00B2 - 00B3 FFFD FFFD FFFD 00B7 FFFD FFFD FFFD - 00BB FFFD 00BD + 00A0 FFFD FFFD 00A3 FFFD FFFD 00A6 00A7 + 00A8 00A9 FFFD 00AB 00AC 00AD FFFD FFFD + 00B0 00B1 00B2 00B3 FFFD FFFD FFFD 00B7 + FFFD FFFD FFFD 00BB FFFD 00BD End of Item 0003 Begin of Item 0004 Format 1 - srcBegin = 0384 + srcBegin = 037A srcEnd = 038C - mappingOffset = 001B + mappingOffset = 001E Mapping = - 00B4 00B5 00B6 FFFD 00B8 00B9 00BA FFFD - 00BC + 00AA FFFD FFFD FFFD FFFD FFFD FFFD FFFD + FFFD FFFD 00B4 00B5 00B6 FFFD 00B8 00B9 + 00BA FFFD 00BC End of Item 0004 Begin of Item 0005 Format 1 srcBegin = 2015 srcEnd = 2019 - mappingOffset = 0024 + mappingOffset = 0031 Mapping = 00AF FFFD FFFD 00A1 00A2 End of Item 0005 +Begin of Item 0006 + Format 1 + srcBegin = 20AC + srcEnd = 20AF + mappingOffset = 0036 + Mapping = + 00A4 FFFD FFFD 00A5 +End of Item 0006 + ========================================================*/ /* Offset=0x0000 ItemOfList */ - 0x0006, + 0x0007, /*-------------------------------------------------------*/ /* Offset=0x0001 offsetToFormatArray */ 0x0004, @@ -92,30 +102,33 @@ End of Item 0005 0x0006, /*-------------------------------------------------------*/ /* Offset=0x0003 offsetToMappingTable */ - 0x0018, + 0x001B, /*-------------------------------------------------------*/ /* Offset=0x0004 Start of Format Array */ /* Total of Format 0 : 0x0003 */ -/* Total of Format 1 : 0x0003 */ +/* Total of Format 1 : 0x0004 */ /* Total of Format 2 : 0x0000 */ /* Total of Format 3 : 0x0000 */ -0x1000, 0x0011, +0x1000, 0x0111, /*-------------------------------------------------------*/ /* Offset=0x0006 Start of MapCell Array */ -/* 0000 */ 0x0000, 0x00A0, 0x0000, +/* 0000 */ 0x0000, 0x007F, 0x0000, /* 0001 */ 0x038E, 0x03A1, 0x00BE, /* 0002 */ 0x03A3, 0x03CE, 0x00D3, -/* 0003 */ 0x00A3, 0x00BD, 0x0000, -/* 0004 */ 0x0384, 0x038C, 0x001B, -/* 0005 */ 0x2015, 0x2019, 0x0024, +/* 0003 */ 0x00A0, 0x00BD, 0x0000, +/* 0004 */ 0x037A, 0x038C, 0x001E, +/* 0005 */ 0x2015, 0x2019, 0x0031, +/* 0006 */ 0x20AC, 0x20AF, 0x0036, /*-------------------------------------------------------*/ -/* Offset=0x0018 Start of MappingTable */ +/* Offset=0x001B Start of MappingTable */ -/* 0000 */ 0x00A3, 0xFFFD, 0xFFFD, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0xFFFD, -/* 0008 */ 0x00AB, 0x00AC, 0x00AD, 0xFFFD, 0xFFFD, 0x00B0, 0x00B1, 0x00B2, -/* 0010 */ 0x00B3, 0xFFFD, 0xFFFD, 0xFFFD, 0x00B7, 0xFFFD, 0xFFFD, 0xFFFD, -/* 0018 */ 0x00BB, 0xFFFD, 0x00BD, 0x00B4, 0x00B5, 0x00B6, 0xFFFD, 0x00B8, -/* 0020 */ 0x00B9, 0x00BA, 0xFFFD, 0x00BC, 0x00AF, 0xFFFD, 0xFFFD, 0x00A1, -/* 0028 */ 0x00A2, -/* End of table Total Length = 0x0041 * 2 */ +/* 0000 */ 0x00A0, 0xFFFD, 0xFFFD, 0x00A3, 0xFFFD, 0xFFFD, 0x00A6, 0x00A7, +/* 0008 */ 0x00A8, 0x00A9, 0xFFFD, 0x00AB, 0x00AC, 0x00AD, 0xFFFD, 0xFFFD, +/* 0010 */ 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0xFFFD, 0xFFFD, 0xFFFD, 0x00B7, +/* 0018 */ 0xFFFD, 0xFFFD, 0xFFFD, 0x00BB, 0xFFFD, 0x00BD, 0x00AA, 0xFFFD, +/* 0020 */ 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, +/* 0028 */ 0x00B4, 0x00B5, 0x00B6, 0xFFFD, 0x00B8, 0x00B9, 0x00BA, 0xFFFD, +/* 0030 */ 0x00BC, 0x00AF, 0xFFFD, 0xFFFD, 0x00A1, 0x00A2, 0x00A4, 0xFFFD, +/* 0038 */ 0xFFFD, 0x00A5, +/* End of table Total Length = 0x0055 * 2 */ diff --git a/intl/uconv/ucvlatin/8859-7.ut b/intl/uconv/ucvlatin/8859-7.ut index ee26fbf2dc0..87dc7105894 100644 --- a/intl/uconv/ucvlatin/8859-7.ut +++ b/intl/uconv/ucvlatin/8859-7.ut @@ -48,7 +48,7 @@ Begin of Item 0000 Format 0 srcBegin = 0000 - srcEnd = 00A0 + srcEnd = 007F destBegin = 0000 End of Item 0000 @@ -68,14 +68,14 @@ End of Item 0002 Begin of Item 0003 Format 1 - srcBegin = 00A1 + srcBegin = 00A0 srcEnd = 00BD mappingOffset = 0000 Mapping = - 2018 2019 00A3 FFFD FFFD 00A6 00A7 00A8 - 00A9 FFFD 00AB 00AC 00AD FFFD 2015 00B0 - 00B1 00B2 00B3 0384 0385 0386 00B7 0388 - 0389 038A 00BB 038C 00BD + 00A0 2018 2019 00A3 20AC 20AF 00A6 00A7 + 00A8 00A9 037A 00AB 00AC 00AD FFFD 2015 + 00B0 00B1 00B2 00B3 0384 0385 0386 00B7 + 0388 0389 038A 00BB 038C 00BD End of Item 0003 ========================================================*/ @@ -100,15 +100,15 @@ End of Item 0003 0x1000, 0x0000, /*-------------------------------------------------------*/ /* Offset=0x0006 Start of MapCell Array */ -/* 0000 */ 0x0000, 0x00A0, 0x0000, +/* 0000 */ 0x0000, 0x007F, 0x0000, /* 0001 */ 0x00BE, 0x00D1, 0x038E, /* 0002 */ 0x00D3, 0x00FE, 0x03A3, -/* 0003 */ 0x00A1, 0x00BD, 0x0000, +/* 0003 */ 0x00A0, 0x00BD, 0x0000, /*-------------------------------------------------------*/ /* Offset=0x0012 Start of MappingTable */ -/* 0000 */ 0x2018, 0x2019, 0x00A3, 0xFFFD, 0xFFFD, 0x00A6, 0x00A7, 0x00A8, -/* 0008 */ 0x00A9, 0xFFFD, 0x00AB, 0x00AC, 0x00AD, 0xFFFD, 0x2015, 0x00B0, -/* 0010 */ 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x0385, 0x0386, 0x00B7, 0x0388, -/* 0018 */ 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, -/* End of table Total Length = 0x002F * 2 */ +/* 0000 */ 0x00A0, 0x2018, 0x2019, 0x00A3, 0x20AC, 0x20AF, 0x00A6, 0x00A7, +/* 0008 */ 0x00A8, 0x00A9, 0x037A, 0x00AB, 0x00AC, 0x00AD, 0xFFFD, 0x2015, +/* 0010 */ 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x0385, 0x0386, 0x00B7, +/* 0018 */ 0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, +/* End of table Total Length = 0x0030 * 2 */ diff --git a/intl/uconv/ucvlatin/8859-8.uf b/intl/uconv/ucvlatin/8859-8.uf index fa736234b78..d598107869b 100644 --- a/intl/uconv/ucvlatin/8859-8.uf +++ b/intl/uconv/ucvlatin/8859-8.uf @@ -32,7 +32,7 @@ Begin of Item 0000 Format 0 srcBegin = 0000 - srcEnd = 00A0 + srcEnd = 007F destBegin = 0000 End of Item 0000 @@ -58,27 +58,33 @@ Begin of Item 0003 End of Item 0003 Begin of Item 0004 + Format 2 + srcBegin = 00A0 + destBegin = 00A0 +End of Item 0004 + +Begin of Item 0005 Format 1 srcBegin = 00BB srcEnd = 00BE mappingOffset = 0000 Mapping = 00BB 00BC 00BD 00BE -End of Item 0004 - -Begin of Item 0005 - Format 2 - srcBegin = 00D7 - destBegin = 00AA End of Item 0005 Begin of Item 0006 Format 2 - srcBegin = 00F7 - destBegin = 00BA + srcBegin = 00D7 + destBegin = 00AA End of Item 0006 Begin of Item 0007 + Format 2 + srcBegin = 00F7 + destBegin = 00BA +End of Item 0007 + +Begin of Item 0008 Format 1 srcBegin = 200E srcEnd = 2017 @@ -86,11 +92,11 @@ Begin of Item 0007 Mapping = 00FD 00FE FFFD FFFD FFFD FFFD FFFD FFFD FFFD 00DF -End of Item 0007 +End of Item 0008 ========================================================*/ /* Offset=0x0000 ItemOfList */ - 0x0008, + 0x0009, /*-------------------------------------------------------*/ /* Offset=0x0001 offsetToFormatArray */ 0x0004, @@ -99,28 +105,29 @@ End of Item 0007 0x0007, /*-------------------------------------------------------*/ /* Offset=0x0003 offsetToMappingTable */ - 0x001F, + 0x0022, /*-------------------------------------------------------*/ /* Offset=0x0004 Start of Format Array */ /* Total of Format 0 : 0x0004 */ /* Total of Format 1 : 0x0002 */ -/* Total of Format 2 : 0x0002 */ +/* Total of Format 2 : 0x0003 */ /* Total of Format 3 : 0x0000 */ -0x0000, 0x1221, 0x0000, +0x0000, 0x2212, 0x0001, /*-------------------------------------------------------*/ /* Offset=0x0007 Start of MapCell Array */ -/* 0000 */ 0x0000, 0x00A0, 0x0000, +/* 0000 */ 0x0000, 0x007F, 0x0000, /* 0001 */ 0x00A2, 0x00A9, 0x00A2, /* 0002 */ 0x00AB, 0x00B9, 0x00AB, /* 0003 */ 0x05D0, 0x05EA, 0x00E0, -/* 0004 */ 0x00BB, 0x00BE, 0x0000, -/* 0005 */ 0x00D7, 0x0000, 0x00AA, -/* 0006 */ 0x00F7, 0x0000, 0x00BA, -/* 0007 */ 0x200E, 0x2017, 0x0004, +/* 0004 */ 0x00A0, 0x0000, 0x00A0, +/* 0005 */ 0x00BB, 0x00BE, 0x0000, +/* 0006 */ 0x00D7, 0x0000, 0x00AA, +/* 0007 */ 0x00F7, 0x0000, 0x00BA, +/* 0008 */ 0x200E, 0x2017, 0x0004, /*-------------------------------------------------------*/ -/* Offset=0x001F Start of MappingTable */ +/* Offset=0x0022 Start of MappingTable */ /* 0000 */ 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00FD, 0x00FE, 0xFFFD, 0xFFFD, /* 0008 */ 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x00DF, -/* End of table Total Length = 0x002D * 2 */ +/* End of table Total Length = 0x0030 * 2 */ diff --git a/intl/uconv/ucvlatin/8859-8.ut b/intl/uconv/ucvlatin/8859-8.ut index a0d46c5c86c..791a5f0c38c 100644 --- a/intl/uconv/ucvlatin/8859-8.ut +++ b/intl/uconv/ucvlatin/8859-8.ut @@ -48,7 +48,7 @@ Begin of Item 0000 Format 0 srcBegin = 0000 - srcEnd = 00A0 + srcEnd = 007F destBegin = 0000 End of Item 0000 @@ -74,16 +74,20 @@ Begin of Item 0003 End of Item 0003 Begin of Item 0004 - Format 2 - srcBegin = 00AA - destBegin = 00D7 + Format 1 + srcBegin = 00A0 + srcEnd = 00AA + mappingOffset = 0000 + Mapping = + 00A0 FFFD FFFD FFFD FFFD FFFD FFFD FFFD + FFFD FFFD 00D7 End of Item 0004 Begin of Item 0005 Format 1 srcBegin = 00BA srcEnd = 00BE - mappingOffset = 0000 + mappingOffset = 000B Mapping = 00F7 00BB 00BC 00BD 00BE End of Item 0005 @@ -98,7 +102,7 @@ Begin of Item 0007 Format 1 srcBegin = 00FD srcEnd = 00FE - mappingOffset = 0005 + mappingOffset = 0010 Mapping = 200E 200F End of Item 0007 @@ -118,23 +122,25 @@ End of Item 0007 /*-------------------------------------------------------*/ /* Offset=0x0004 Start of Format Array */ /* Total of Format 0 : 0x0004 */ -/* Total of Format 1 : 0x0002 */ -/* Total of Format 2 : 0x0002 */ +/* Total of Format 1 : 0x0003 */ +/* Total of Format 2 : 0x0001 */ /* Total of Format 3 : 0x0000 */ -0x0000, 0x1212, 0x0000, +0x0000, 0x1211, 0x0000, /*-------------------------------------------------------*/ /* Offset=0x0007 Start of MapCell Array */ -/* 0000 */ 0x0000, 0x00A0, 0x0000, +/* 0000 */ 0x0000, 0x007F, 0x0000, /* 0001 */ 0x00A2, 0x00A9, 0x00A2, /* 0002 */ 0x00AB, 0x00B9, 0x00AB, /* 0003 */ 0x00E0, 0x00FA, 0x05D0, -/* 0004 */ 0x00AA, 0x0000, 0x00D7, -/* 0005 */ 0x00BA, 0x00BE, 0x0000, +/* 0004 */ 0x00A0, 0x00AA, 0x0000, +/* 0005 */ 0x00BA, 0x00BE, 0x000B, /* 0006 */ 0x00DF, 0x0000, 0x2017, -/* 0007 */ 0x00FD, 0x00FE, 0x0005, +/* 0007 */ 0x00FD, 0x00FE, 0x0010, /*-------------------------------------------------------*/ /* Offset=0x001F Start of MappingTable */ -/* 0000 */ 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x200E, 0x200F, -/* End of table Total Length = 0x0026 * 2 */ +/* 0000 */ 0x00A0, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, +/* 0008 */ 0xFFFD, 0xFFFD, 0x00D7, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, +/* 0010 */ 0x200E, 0x200F, +/* End of table Total Length = 0x0031 * 2 */