diff -r e6a39382bb9c -r c8fb4cf7b3ae textinput/ptienginev2/languages/PtiKeymappings_ITUT_44.cpp --- a/textinput/ptienginev2/languages/PtiKeymappings_ITUT_44.cpp Tue Apr 27 16:59:43 2010 +0300 +++ b/textinput/ptienginev2/languages/PtiKeymappings_ITUT_44.cpp Tue May 11 16:31:42 2010 +0300 @@ -1,8 +1,8 @@ /* -* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0"" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -97,192 +97,174 @@ // const TUint16 StandardQwertyData_table_Catalan[] = { - 0x31, - 0x32, - 0x33, - 0x34, - 0x35, - 0x36, - 0x37, - 0x38, - 0x39, - 0x30, - 0x3f, - 0x71, - 0x77, - 0x65,0xe9,0xeb,0xe8,0xea, - 0x72, - 0x74,0xfe, - 0x79, - 0x75,0xfc,0xfa,0xf9,0xfb, - 0x69,0xed,0xef,0xec,0xee, - 0x6f,0xf3,0xf6,0xf2,0xf4,0xf5,0xba,0xf8, - 0x70, - 0xf001,0xb4, - 0xbf, - 0x61,0xe1,0xaa,0xe4,0xe0,0xe2,0xe3,0xe5,0xe6, - 0x73,0xdf, - 0x64,0xf0, - 0x66, - 0x67, - 0x68, - 0x6a, - 0x6b, - 0x6c, - 0xf1,0xe7, - 0xf005,0x7e, - 0x7a, - 0x78, - 0x63,0xe7, - 0x76, - 0x62, - 0x6e,0xf1, - 0x6d, - 0x2c, - 0x2e, - 0x2d, - 0x40, - 0x22, - 0x23, - 0x2b, - 0x3d, - 0x2a, - 0x2f, - 0x28, - 0x29, - 0x27, - 0x21, - 0x51, - 0x57, - 0x45,0xc9,0xcb,0xc8,0xca, - 0x52, - 0x54,0xde, - 0x59,0xdd, - 0x55,0xdc,0xda,0xd9,0xdb, - 0x49,0xcd,0xcf,0xcc,0xce, - 0x4f,0xd3,0xd6,0xd2,0xd4,0xd5,0xba,0xd8, - 0x50, - 0xf002,0xa8, - 0xa1, - 0x41,0xc1,0xaa,0xc4,0xc0,0xc2,0xc3,0xc5,0xc6, - 0x53, - 0x44,0xd0, - 0x46, - 0x47, - 0x48, - 0x4a, - 0x4b, - 0x4c, - 0xd1,0xc7, - 0xf004,0x5e, - 0x5a, - 0x58, - 0x43,0xc7, - 0x56, - 0x42, - 0x4e,0xd1, - 0x4d, - 0x3b, - 0x3a, - 0xf003,0x60, + 0x0071, + 0x0077, + 0x0065,0x00E9, + 0x0072,0x0155, + 0x0074, + 0x0079,0x00FD, + 0x0075,0x00FA, + 0x0069,0x00ED, + 0x006F,0x00F3, + 0x0070, + 0xF001,0x00B4, + 0x0061,0x00E1, + 0x0073,0x015B, + 0x0064, + 0x0066, + 0x0067, + 0x0068, + 0x006A, + 0x006B, + 0x006C,0x013A, + 0x0140, + 0x00E7, + 0x007A,0x017A, + 0x0078, + 0x0063,0x0107, + 0x0076, + 0x0062, + 0x006E,0x0144, + 0x006D, + 0x002C, + 0x002E, + 0x003F, + 0x0021, + 0x0051, + 0x0057, + 0x0045,0x00C9, + 0x0052,0x0154, + 0x0054, + 0x0059,0x00DD, + 0x0055,0x00DA, + 0x0049,0x00CD, + 0x004F,0x00D3, + 0x0050, + 0xF001,0x00B4, + 0x0041,0x00C1, + 0x0053,0x015A, + 0x0044, + 0x0046, + 0x0047, + 0x0048, + 0x004A, + 0x004B, + 0x004C,0x0139, + 0x013F, + 0x00C7, + 0x005A,0x0179, + 0x0058, + 0x0043,0x0106, + 0x0056, + 0x0042, + 0x004E,0x0143, + 0x004D, + 0x0027, + 0x002D, + 0x00BF, + 0x00A1, }; -const TInt KStandardQwertyDataSize_Catalan = 159; +const TInt KStandardQwertyDataSize_Catalan = 92; const TPtiKeyBinding StandardQwertyKeyBindings_table_Catalan[] = { - {EPtiKeyQwerty1, EPtiCaseLower, 0, 1}, - {EPtiKeyQwerty2, EPtiCaseLower, 1, 1}, - {EPtiKeyQwerty3, EPtiCaseLower, 2, 1}, - {EPtiKeyQwerty4, EPtiCaseLower, 3, 1}, - {EPtiKeyQwerty5, EPtiCaseLower, 4, 1}, - {EPtiKeyQwerty6, EPtiCaseLower, 5, 1}, - {EPtiKeyQwerty7, EPtiCaseLower, 6, 1}, - {EPtiKeyQwerty8, EPtiCaseLower, 7, 1}, - {EPtiKeyQwerty9, EPtiCaseLower, 8, 1}, - {EPtiKeyQwerty0, EPtiCaseLower, 9, 1}, - {EPtiKeyQwertyPlus, EPtiCaseLower, 10, 1}, - {EPtiKeyQwertyQ, EPtiCaseLower, 11, 1}, - {EPtiKeyQwertyW, EPtiCaseLower, 12, 1}, - {EPtiKeyQwertyE, EPtiCaseLower, 13, 5}, - {EPtiKeyQwertyR, EPtiCaseLower, 18, 1}, - {EPtiKeyQwertyT, EPtiCaseLower, 19, 2}, - {EPtiKeyQwertyY, EPtiCaseLower, 21, 1}, - {EPtiKeyQwertyU, EPtiCaseLower, 22, 5}, - {EPtiKeyQwertyI, EPtiCaseLower, 27, 5}, - {EPtiKeyQwertyO, EPtiCaseLower, 32, 8}, - {EPtiKeyQwertyP, EPtiCaseLower, 40, 1}, - {EPtiKeyQwertyMinus, EPtiCaseLower, 41, 2}, - {EPtiKeyQwertyHash, EPtiCaseLower, 43, 1}, - {EPtiKeyQwertyA, EPtiCaseLower, 44, 9}, - {EPtiKeyQwertyS, EPtiCaseLower, 53, 2}, - {EPtiKeyQwertyD, EPtiCaseLower, 55, 2}, - {EPtiKeyQwertyF, EPtiCaseLower, 57, 1}, - {EPtiKeyQwertyG, EPtiCaseLower, 58, 1}, - {EPtiKeyQwertyH, EPtiCaseLower, 59, 1}, - {EPtiKeyQwertyJ, EPtiCaseLower, 60, 1}, - {EPtiKeyQwertyK, EPtiCaseLower, 61, 1}, - {EPtiKeyQwertyL, EPtiCaseLower, 62, 1}, - {EPtiKeyQwertySemicolon, EPtiCaseLower, 63, 2}, - {EPtiKeyQwertyApostrophe, EPtiCaseLower, 65, 2}, - {EPtiKeyQwertyZ, EPtiCaseLower, 67, 1}, - {EPtiKeyQwertyX, EPtiCaseLower, 68, 1}, - {EPtiKeyQwertyC, EPtiCaseLower, 69, 2}, - {EPtiKeyQwertyV, EPtiCaseLower, 71, 1}, - {EPtiKeyQwertyB, EPtiCaseLower, 72, 1}, - {EPtiKeyQwertyN, EPtiCaseLower, 73, 2}, - {EPtiKeyQwertyM, EPtiCaseLower, 75, 1}, - {EPtiKeyQwertyComma, EPtiCaseLower, 76, 1}, - {EPtiKeyQwertyFullstop, EPtiCaseLower, 77, 1}, - {EPtiKeyQwertySlash, EPtiCaseLower, 78, 1}, - {EPtiKeyQwerty1, EPtiCaseUpper, 79, 1}, - {EPtiKeyQwerty2, EPtiCaseUpper, 80, 1}, - {EPtiKeyQwerty3, EPtiCaseUpper, 81, 1}, - {EPtiKeyQwerty4, EPtiCaseUpper, 82, 1}, - {EPtiKeyQwerty5, EPtiCaseUpper, 83, 1}, - {EPtiKeyQwerty6, EPtiCaseUpper, 84, 1}, - {EPtiKeyQwerty7, EPtiCaseUpper, 85, 1}, - {EPtiKeyQwerty8, EPtiCaseUpper, 86, 1}, - {EPtiKeyQwerty9, EPtiCaseUpper, 87, 1}, - {EPtiKeyQwerty0, EPtiCaseUpper, 88, 1}, - {EPtiKeyQwertyPlus, EPtiCaseUpper, 89, 1}, - {EPtiKeyQwertyQ, EPtiCaseUpper, 90, 1}, - {EPtiKeyQwertyW, EPtiCaseUpper, 91, 1}, - {EPtiKeyQwertyE, EPtiCaseUpper, 92, 5}, - {EPtiKeyQwertyR, EPtiCaseUpper, 97, 1}, - {EPtiKeyQwertyT, EPtiCaseUpper, 98, 2}, - {EPtiKeyQwertyY, EPtiCaseUpper, 100, 2}, - {EPtiKeyQwertyU, EPtiCaseUpper, 102, 5}, - {EPtiKeyQwertyI, EPtiCaseUpper, 107, 5}, - {EPtiKeyQwertyO, EPtiCaseUpper, 112, 8}, - {EPtiKeyQwertyP, EPtiCaseUpper, 120, 1}, - {EPtiKeyQwertyMinus, EPtiCaseUpper, 121, 2}, - {EPtiKeyQwertyHash, EPtiCaseUpper, 123, 1}, - {EPtiKeyQwertyA, EPtiCaseUpper, 124, 9}, - {EPtiKeyQwertyS, EPtiCaseUpper, 133, 1}, - {EPtiKeyQwertyD, EPtiCaseUpper, 134, 2}, - {EPtiKeyQwertyF, EPtiCaseUpper, 136, 1}, - {EPtiKeyQwertyG, EPtiCaseUpper, 137, 1}, - {EPtiKeyQwertyH, EPtiCaseUpper, 138, 1}, - {EPtiKeyQwertyJ, EPtiCaseUpper, 139, 1}, - {EPtiKeyQwertyK, EPtiCaseUpper, 140, 1}, - {EPtiKeyQwertyL, EPtiCaseUpper, 141, 1}, - {EPtiKeyQwertySemicolon, EPtiCaseUpper, 142, 2}, - {EPtiKeyQwertyApostrophe, EPtiCaseUpper, 144, 2}, - {EPtiKeyQwertyZ, EPtiCaseUpper, 146, 1}, - {EPtiKeyQwertyX, EPtiCaseUpper, 147, 1}, - {EPtiKeyQwertyC, EPtiCaseUpper, 148, 2}, - {EPtiKeyQwertyV, EPtiCaseUpper, 150, 1}, - {EPtiKeyQwertyB, EPtiCaseUpper, 151, 1}, - {EPtiKeyQwertyN, EPtiCaseUpper, 152, 2}, - {EPtiKeyQwertyM, EPtiCaseUpper, 154, 1}, - {EPtiKeyQwertyComma, EPtiCaseUpper, 155, 1}, - {EPtiKeyQwertyFullstop, EPtiCaseUpper, 156, 1}, - {EPtiKeyQwertySlash, EPtiCaseUpper, 157, 2}, + {EPtiKeyQwertyAtCharacter, EPtiCaseLower, 0, 1}, + {EPtiKeyQwerty1, EPtiCaseLower, 1, 1}, + {EPtiKeyQwerty2, EPtiCaseLower, 2, 2}, + {EPtiKeyQwerty3, EPtiCaseLower, 4, 2}, + {EPtiKeyQwerty4, EPtiCaseLower, 6, 1}, + {EPtiKeyQwerty5, EPtiCaseLower, 7, 2}, + {EPtiKeyQwerty6, EPtiCaseLower, 9, 2}, + {EPtiKeyQwerty7, EPtiCaseLower, 11, 2}, + {EPtiKeyQwerty8, EPtiCaseLower, 13, 2}, + {EPtiKeyQwerty9, EPtiCaseLower, 15, 1}, + {EPtiKeyQwerty0, EPtiCaseLower, 16, 2}, + {EPtiKeyQwertyPlus, EPtiCaseLower, 18, 2}, + {EPtiKeyQwertyQ, EPtiCaseLower, 20, 2}, + {EPtiKeyQwertyW, EPtiCaseLower, 22, 1}, + {EPtiKeyQwertyE, EPtiCaseLower, 23, 1}, + {EPtiKeyQwertyR, EPtiCaseLower, 24, 1}, + {EPtiKeyQwertyT, EPtiCaseLower, 25, 1}, + {EPtiKeyQwertyY, EPtiCaseLower, 26, 1}, + {EPtiKeyQwertyU, EPtiCaseLower, 27, 1}, + {EPtiKeyQwertyI, EPtiCaseLower, 28, 2}, + {EPtiKeyQwertyO, EPtiCaseLower, 30, 1}, + {EPtiKeyQwertyP, EPtiCaseLower, 31, 1}, + {EPtiKeyQwertyMinus, EPtiCaseLower, 32, 0}, + {EPtiKeyQwertyHash, EPtiCaseLower, 32, 2}, + {EPtiKeyQwertyA, EPtiCaseLower, 34, 1}, + {EPtiKeyQwertyS, EPtiCaseLower, 35, 2}, + {EPtiKeyQwertyD, EPtiCaseLower, 37, 1}, + {EPtiKeyQwertyF, EPtiCaseLower, 38, 1}, + {EPtiKeyQwertyG, EPtiCaseLower, 39, 2}, + {EPtiKeyQwertyH, EPtiCaseLower, 41, 1}, + {EPtiKeyQwertyJ, EPtiCaseLower, 42, 1}, + {EPtiKeyQwertyK, EPtiCaseLower, 43, 1}, + {EPtiKeyQwertyL, EPtiCaseLower, 44, 1}, + {EPtiKeyQwertySemicolon, EPtiCaseLower, 45, 1}, + {EPtiKeyQwertyApostrophe, EPtiCaseLower, 46, 0}, + {0x5b, EPtiCaseLower, 46, 0}, + {EPtiKeyQwertyZ, EPtiCaseLower, 46, 0}, + {EPtiKeyQwertyX, EPtiCaseLower, 46, 0}, + {EPtiKeyQwertyC, EPtiCaseLower, 46, 0}, + {EPtiKeyQwertyV, EPtiCaseLower, 46, 0}, + {EPtiKeyQwertyB, EPtiCaseLower, 46, 0}, + {EPtiKeyQwertyN, EPtiCaseLower, 46, 0}, + {EPtiKeyQwertyM, EPtiCaseLower, 46, 0}, + {EPtiKeyQwertyComma, EPtiCaseLower, 46, 0}, + {EPtiKeyQwertyFullstop, EPtiCaseLower, 46, 0}, + {EPtiKeyQwertySlash, EPtiCaseLower, 46, 0}, + {EPtiKeyQwertyAtCharacter, EPtiCaseUpper, 46, 1}, + {EPtiKeyQwerty1, EPtiCaseUpper, 47, 1}, + {EPtiKeyQwerty2, EPtiCaseUpper, 48, 2}, + {EPtiKeyQwerty3, EPtiCaseUpper, 50, 2}, + {EPtiKeyQwerty4, EPtiCaseUpper, 52, 1}, + {EPtiKeyQwerty5, EPtiCaseUpper, 53, 2}, + {EPtiKeyQwerty6, EPtiCaseUpper, 55, 2}, + {EPtiKeyQwerty7, EPtiCaseUpper, 57, 2}, + {EPtiKeyQwerty8, EPtiCaseUpper, 59, 2}, + {EPtiKeyQwerty9, EPtiCaseUpper, 61, 1}, + {EPtiKeyQwerty0, EPtiCaseUpper, 62, 2}, + {EPtiKeyQwertyPlus, EPtiCaseUpper, 64, 2}, + {EPtiKeyQwertyQ, EPtiCaseUpper, 66, 2}, + {EPtiKeyQwertyW, EPtiCaseUpper, 68, 1}, + {EPtiKeyQwertyE, EPtiCaseUpper, 69, 1}, + {EPtiKeyQwertyR, EPtiCaseUpper, 70, 1}, + {EPtiKeyQwertyT, EPtiCaseUpper, 71, 1}, + {EPtiKeyQwertyY, EPtiCaseUpper, 72, 1}, + {EPtiKeyQwertyU, EPtiCaseUpper, 73, 1}, + {EPtiKeyQwertyI, EPtiCaseUpper, 74, 2}, + {EPtiKeyQwertyO, EPtiCaseUpper, 76, 1}, + {EPtiKeyQwertyP, EPtiCaseUpper, 77, 1}, + {EPtiKeyQwertyMinus, EPtiCaseUpper, 78, 0}, + {EPtiKeyQwertyHash, EPtiCaseUpper, 78, 2}, + {EPtiKeyQwertyA, EPtiCaseUpper, 80, 1}, + {EPtiKeyQwertyS, EPtiCaseUpper, 81, 2}, + {EPtiKeyQwertyD, EPtiCaseUpper, 83, 1}, + {EPtiKeyQwertyF, EPtiCaseUpper, 84, 1}, + {EPtiKeyQwertyG, EPtiCaseUpper, 85, 2}, + {EPtiKeyQwertyH, EPtiCaseUpper, 87, 1}, + {EPtiKeyQwertyJ, EPtiCaseUpper, 88, 1}, + {EPtiKeyQwertyK, EPtiCaseUpper, 89, 1}, + {EPtiKeyQwertyL, EPtiCaseUpper, 90, 1}, + {EPtiKeyQwertySemicolon, EPtiCaseUpper, 91, 1}, + {EPtiKeyQwertyApostrophe, EPtiCaseUpper, 92, 0}, + {0x5b, EPtiCaseUpper, 92, 0}, + {EPtiKeyQwertyZ, EPtiCaseUpper, 92, 0}, + {EPtiKeyQwertyX, EPtiCaseUpper, 92, 0}, + {EPtiKeyQwertyC, EPtiCaseUpper, 92, 0}, + {EPtiKeyQwertyV, EPtiCaseUpper, 92, 0}, + {EPtiKeyQwertyB, EPtiCaseUpper, 92, 0}, + {EPtiKeyQwertyN, EPtiCaseUpper, 92, 0}, + {EPtiKeyQwertyM, EPtiCaseUpper, 92, 0}, + {EPtiKeyQwertyComma, EPtiCaseUpper, 92, 0}, + {EPtiKeyQwertyFullstop, EPtiCaseUpper, 92, 0}, + {EPtiKeyQwertySlash, EPtiCaseUpper, 92, 0}, }; -const TInt KMaxStandardQwertyIndex_Catalan = 88; +const TInt KMaxStandardQwertyIndex_Catalan = 92; // @@ -290,23 +272,33 @@ // const TUint16 StandardQwertyDeadKeyData_table_Catalan[] = { - 13, 0x00E9,0x00EB,0x00E8,0x00EA,0xF000, - 16, 0x00FD,0xF000,0xF000,0xF000,0xF000, - 17, 0x00FA,0x00FC,0x00F9,0x00FB,0xF000, - 18, 0x0069,0x00ED,0x00EF,0x00EC,0x00EE, - 19, 0x00F3,0x00F6,0x00F2,0x00F4,0x00F5, - 23, 0x00E1,0x00E4,0x00E0,0x00E2,0x00E3, - 39, 0xF000,0xF000,0xF000,0xF000,0x00F1, - 57, 0x00C9,0x00CB,0x00C8,0x00CA,0xF000, - 60, 0x00DD,0xF000,0xF000,0xF000,0xF000, - 61, 0x00DA,0x00DC,0x00D9,0x00DB,0xF000, - 62, 0x00CD,0x00CF,0x00CC,0x00CE,0xF000, - 63, 0x00D3,0x00D6,0x00D2,0x00D4,0x00D5, - 67, 0x00C1,0x00C4,0x00C0,0x00C2,0x00C3, - 83, 0xF000,0xF000,0xF000,0xF000,0x00D1, + 2, 0x00E9,0xf000,0xf000,0xf000,0xf000, + 3, 0x0155,0xf000,0xf000,0xf000,0xf000, + 5, 0x00FD,0xf000,0xf000,0xf000,0xf000, + 6, 0x00FA,0xf000,0xf000,0xf000,0xf000, + 7, 0x00ED,0xf000,0xf000,0xf000,0xf000, + 8, 0x00F3,0xf000,0xf000,0xf000,0xf000, + 11, 0x00E1,0xf000,0xf000,0xf000,0xf000, + 12, 0x015B,0xf000,0xf000,0xf000,0xf000, + 19, 0x013A,0xf000,0xf000,0xf000,0xf000, + 22, 0x017A,0xf000,0xf000,0xf000,0xf000, + 24, 0x0107,0xf000,0xf000,0xf000,0xf000, + 27, 0x0144,0xf000,0xf000,0xf000,0xf000, + 35, 0x00C9,0xf000,0xf000,0xf000,0xf000, + 36, 0x0154,0xf000,0xf000,0xf000,0xf000, + 38, 0x00DD,0xf000,0xf000,0xf000,0xf000, + 39, 0x00DA,0xf000,0xf000,0xf000,0xf000, + 40, 0x00CD,0xf000,0xf000,0xf000,0xf000, + 41, 0x00D3,0xf000,0xf000,0xf000,0xf000, + 44, 0x00C1,0xf000,0xf000,0xf000,0xf000, + 45, 0x015A,0xf000,0xf000,0xf000,0xf000, + 52, 0x0139,0xf000,0xf000,0xf000,0xf000, + 55, 0x0179,0xf000,0xf000,0xf000,0xf000, + 57, 0x0106,0xf000,0xf000,0xf000,0xf000, + 60, 0x0143,0xf000,0xf000,0xf000,0xf000, }; -const TInt KStandardQwertyDeadKeyTableRows_Catalan = 14; +const TInt KStandardQwertyDeadKeyTableRows_Catalan = 24; // // MiniQwerty keymap data table