--- a/textinput/ptienginev2/languages/PtiKeymappings_ITUT_49.cpp Tue Apr 27 16:59:43 2010 +0300
+++ b/textinput/ptienginev2/languages/PtiKeymappings_ITUT_49.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,204 +97,174 @@
//
const TUint16 StandardQwertyData_table_Estonian[] =
{
- 0x31,
- 0x32,
- 0x33,
- 0x34,
- 0x35,
- 0x36,
- 0x37,
- 0x38,
- 0x39,
- 0x30,
- 0x40,
- 0x71,
- 0x77,
- 0x65,0xe9,0x113,0x117,0x119,
- 0x72,0x157,
- 0x74,
- 0x7a,0x17e,
- 0x75,0x16b,0x173,
- 0x69,0x12b,0x12f,
- 0x6f,0xf5,0xf8,
- 0x70,
- 0xfc,
- 0x2b,
- 0x61,0x101,0x105,0xe5,0xe6,
- 0x73,0x161,0xdf,
- 0x64,
- 0x66,
- 0x67,0x123,
- 0x68,
- 0x6a,
- 0x6b,0x137,
- 0x6c,0x13c,
- 0xf6,
- 0xe4,
- 0x79,
- 0x78,
- 0x63,0x10d,
- 0x76,
- 0x62,
- 0x6e,0x146,
- 0x6d,
- 0x2c,
- 0x2e,
- 0x2d,
- 0x21,
- 0x22,
- 0x20ac,
- 0x2a,
- 0x2f,
- 0x28,
- 0x29,
- 0x3d,
- 0x3f,
- 0xdf,
- 0xf001,0x7e,
- 0x51,
- 0x57,
- 0x45,0xc9,0x112,0x116,0x118,
- 0x52,0x156,
- 0x54,
- 0x5a,0x17d,
- 0x55,0x16a,0x172,
- 0x49,0x12a,0x12e,
- 0x4f,0xd5,0xd8,
- 0x50,
- 0xdc,
- 0x23,
- 0x41,0x100,0x104,0xc5,0xc6,
- 0x53,0x160,
- 0x44,
- 0x46,
- 0x47,0x122,
- 0x48,
- 0x4a,
- 0x4b,0x136,
- 0x4c,0x13b,
- 0xd6,
- 0xc4,
- 0x59,
- 0x58,
- 0x43,0x10c,
- 0x56,
- 0x42,
- 0x4e,0x145,
- 0x4d,
- 0x3b,
- 0x3a,
- 0x27,
+ 0x0071,
+ 0x0077,
+ 0x0065,
+ 0x0072,
+ 0x0074,
+ 0x0079,
+ 0x0075,
+ 0x0069,
+ 0x006F,
+ 0x0070,
+ 0x00FC,
+ 0x0061,
+ 0x0073,
+ 0x0064,
+ 0x0066,
+ 0x0067,
+ 0x0068,
+ 0x006A,
+ 0x006B,
+ 0x006C,
+ 0x00F6,
+ 0x00E4,
+ 0x007A,
+ 0x0078,
+ 0x0063,
+ 0x0076,
+ 0x0062,
+ 0x006E,
+ 0x006D,
+ 0x002C,
+ 0x002E,
+ 0x003F,
+ 0x00F5,
+ 0x0051,
+ 0x0057,
+ 0x0045,
+ 0x0052,
+ 0x0054,
+ 0x0059,
+ 0x0055,
+ 0x0049,
+ 0x004F,
+ 0x0050,
+ 0x00DC,
+ 0x0041,
+ 0x0053,
+ 0x0044,
+ 0x0046,
+ 0x0047,
+ 0x0048,
+ 0x004A,
+ 0x004B,
+ 0x004C,
+ 0x00D6,
+ 0x00C4,
+ 0x005A,
+ 0x0058,
+ 0x0043,
+ 0x0056,
+ 0x0042,
+ 0x004E,
+ 0x004D,
+ 0x0027,
+ 0x002D,
+ 0x0021,
+ 0x00D5,
};
-const TInt KStandardQwertyDataSize_Estonian = 134;
+const TInt KStandardQwertyDataSize_Estonian = 66;
const TPtiKeyBinding StandardQwertyKeyBindings_table_Estonian[] =
{
- {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, 2},
- {EPtiKeyQwertyT, EPtiCaseLower, 20, 1},
- {EPtiKeyQwertyY, EPtiCaseLower, 21, 2},
- {EPtiKeyQwertyU, EPtiCaseLower, 23, 3},
- {EPtiKeyQwertyI, EPtiCaseLower, 26, 3},
- {EPtiKeyQwertyO, EPtiCaseLower, 29, 3},
- {EPtiKeyQwertyP, EPtiCaseLower, 32, 1},
- {EPtiKeyQwertyMinus, EPtiCaseLower, 33, 1},
- {EPtiKeyQwertyHash, EPtiCaseLower, 34, 1},
- {EPtiKeyQwertyA, EPtiCaseLower, 35, 5},
- {EPtiKeyQwertyS, EPtiCaseLower, 40, 3},
- {EPtiKeyQwertyD, EPtiCaseLower, 43, 1},
- {EPtiKeyQwertyF, EPtiCaseLower, 44, 1},
- {EPtiKeyQwertyG, EPtiCaseLower, 45, 2},
- {EPtiKeyQwertyH, EPtiCaseLower, 47, 1},
- {EPtiKeyQwertyJ, EPtiCaseLower, 48, 1},
- {EPtiKeyQwertyK, EPtiCaseLower, 49, 2},
- {EPtiKeyQwertyL, EPtiCaseLower, 51, 2},
- {EPtiKeyQwertySemicolon, EPtiCaseLower, 53, 1},
- {EPtiKeyQwertyApostrophe, EPtiCaseLower, 54, 1},
- {EPtiKeyQwertyZ, EPtiCaseLower, 55, 1},
- {EPtiKeyQwertyX, EPtiCaseLower, 56, 1},
- {EPtiKeyQwertyC, EPtiCaseLower, 57, 2},
- {EPtiKeyQwertyV, EPtiCaseLower, 59, 1},
- {EPtiKeyQwertyB, EPtiCaseLower, 60, 1},
- {EPtiKeyQwertyN, EPtiCaseLower, 61, 2},
- {EPtiKeyQwertyM, EPtiCaseLower, 63, 1},
- {EPtiKeyQwertyComma, EPtiCaseLower, 64, 1},
- {EPtiKeyQwertyFullstop, EPtiCaseLower, 65, 1},
- {EPtiKeyQwertySlash, EPtiCaseLower, 66, 1},
- {EPtiKeyQwerty1, EPtiCaseUpper, 67, 1},
- {EPtiKeyQwerty2, EPtiCaseUpper, 68, 1},
- {EPtiKeyQwerty3, EPtiCaseUpper, 69, 1},
- {EPtiKeyQwerty4, EPtiCaseUpper, 70, 1},
- {EPtiKeyQwerty5, EPtiCaseUpper, 71, 1},
- {EPtiKeyQwerty6, EPtiCaseUpper, 72, 1},
- {EPtiKeyQwerty7, EPtiCaseUpper, 73, 1},
- {EPtiKeyQwerty8, EPtiCaseUpper, 74, 1},
- {EPtiKeyQwerty9, EPtiCaseUpper, 75, 1},
- {EPtiKeyQwerty0, EPtiCaseUpper, 76, 1},
- {EPtiKeyQwertyPlus, EPtiCaseUpper, 77, 2},
- {EPtiKeyQwertyQ, EPtiCaseUpper, 79, 1},
- {EPtiKeyQwertyW, EPtiCaseUpper, 80, 1},
- {EPtiKeyQwertyE, EPtiCaseUpper, 81, 5},
- {EPtiKeyQwertyR, EPtiCaseUpper, 86, 2},
- {EPtiKeyQwertyT, EPtiCaseUpper, 88, 1},
- {EPtiKeyQwertyY, EPtiCaseUpper, 89, 2},
- {EPtiKeyQwertyU, EPtiCaseUpper, 91, 3},
- {EPtiKeyQwertyI, EPtiCaseUpper, 94, 3},
- {EPtiKeyQwertyO, EPtiCaseUpper, 97, 3},
- {EPtiKeyQwertyP, EPtiCaseUpper, 100, 1},
- {EPtiKeyQwertyMinus, EPtiCaseUpper, 101, 1},
- {EPtiKeyQwertyHash, EPtiCaseUpper, 102, 1},
- {EPtiKeyQwertyA, EPtiCaseUpper, 103, 5},
- {EPtiKeyQwertyS, EPtiCaseUpper, 108, 2},
- {EPtiKeyQwertyD, EPtiCaseUpper, 110, 1},
- {EPtiKeyQwertyF, EPtiCaseUpper, 111, 1},
- {EPtiKeyQwertyG, EPtiCaseUpper, 112, 2},
- {EPtiKeyQwertyH, EPtiCaseUpper, 114, 1},
- {EPtiKeyQwertyJ, EPtiCaseUpper, 115, 1},
- {EPtiKeyQwertyK, EPtiCaseUpper, 116, 2},
- {EPtiKeyQwertyL, EPtiCaseUpper, 118, 2},
- {EPtiKeyQwertySemicolon, EPtiCaseUpper, 120, 1},
- {EPtiKeyQwertyApostrophe, EPtiCaseUpper, 121, 1},
- {EPtiKeyQwertyZ, EPtiCaseUpper, 122, 1},
- {EPtiKeyQwertyX, EPtiCaseUpper, 123, 1},
- {EPtiKeyQwertyC, EPtiCaseUpper, 124, 2},
- {EPtiKeyQwertyV, EPtiCaseUpper, 126, 1},
- {EPtiKeyQwertyB, EPtiCaseUpper, 127, 1},
- {EPtiKeyQwertyN, EPtiCaseUpper, 128, 2},
- {EPtiKeyQwertyM, EPtiCaseUpper, 130, 1},
- {EPtiKeyQwertyComma, EPtiCaseUpper, 131, 1},
- {EPtiKeyQwertyFullstop, EPtiCaseUpper, 132, 1},
- {EPtiKeyQwertySlash, EPtiCaseUpper, 133, 1},
+ {EPtiKeyQwertyAtCharacter, EPtiCaseLower, 0, 1},
+ {EPtiKeyQwerty1, EPtiCaseLower, 1, 1},
+ {EPtiKeyQwerty2, EPtiCaseLower, 2, 1},
+ {EPtiKeyQwerty3, EPtiCaseLower, 3, 1},
+ {EPtiKeyQwerty4, EPtiCaseLower, 4, 1},
+ {EPtiKeyQwerty5, EPtiCaseLower, 5, 1},
+ {EPtiKeyQwerty6, EPtiCaseLower, 6, 1},
+ {EPtiKeyQwerty7, EPtiCaseLower, 7, 1},
+ {EPtiKeyQwerty8, EPtiCaseLower, 8, 1},
+ {EPtiKeyQwerty9, EPtiCaseLower, 9, 1},
+ {EPtiKeyQwerty0, EPtiCaseLower, 10, 1},
+ {EPtiKeyQwertyPlus, EPtiCaseLower, 11, 1},
+ {EPtiKeyQwertyQ, EPtiCaseLower, 12, 1},
+ {EPtiKeyQwertyW, EPtiCaseLower, 13, 1},
+ {EPtiKeyQwertyE, EPtiCaseLower, 14, 1},
+ {EPtiKeyQwertyR, EPtiCaseLower, 15, 1},
+ {EPtiKeyQwertyT, EPtiCaseLower, 16, 1},
+ {EPtiKeyQwertyY, EPtiCaseLower, 17, 1},
+ {EPtiKeyQwertyU, EPtiCaseLower, 18, 1},
+ {EPtiKeyQwertyI, EPtiCaseLower, 19, 1},
+ {EPtiKeyQwertyO, EPtiCaseLower, 20, 1},
+ {EPtiKeyQwertyP, EPtiCaseLower, 21, 1},
+ {EPtiKeyQwertyMinus, EPtiCaseLower, 22, 0},
+ {EPtiKeyQwertyHash, EPtiCaseLower, 22, 1},
+ {EPtiKeyQwertyA, EPtiCaseLower, 23, 1},
+ {EPtiKeyQwertyS, EPtiCaseLower, 24, 1},
+ {EPtiKeyQwertyD, EPtiCaseLower, 25, 1},
+ {EPtiKeyQwertyF, EPtiCaseLower, 26, 1},
+ {EPtiKeyQwertyG, EPtiCaseLower, 27, 1},
+ {EPtiKeyQwertyH, EPtiCaseLower, 28, 1},
+ {EPtiKeyQwertyJ, EPtiCaseLower, 29, 1},
+ {EPtiKeyQwertyK, EPtiCaseLower, 30, 1},
+ {EPtiKeyQwertyL, EPtiCaseLower, 31, 1},
+ {EPtiKeyQwertySemicolon, EPtiCaseLower, 32, 1},
+ {EPtiKeyQwertyApostrophe, EPtiCaseLower, 33, 0},
+ {0x5b, EPtiCaseLower, 33, 0},
+ {EPtiKeyQwertyZ, EPtiCaseLower, 33, 0},
+ {EPtiKeyQwertyX, EPtiCaseLower, 33, 0},
+ {EPtiKeyQwertyC, EPtiCaseLower, 33, 0},
+ {EPtiKeyQwertyV, EPtiCaseLower, 33, 0},
+ {EPtiKeyQwertyB, EPtiCaseLower, 33, 0},
+ {EPtiKeyQwertyN, EPtiCaseLower, 33, 0},
+ {EPtiKeyQwertyM, EPtiCaseLower, 33, 0},
+ {EPtiKeyQwertyComma, EPtiCaseLower, 33, 0},
+ {EPtiKeyQwertyFullstop, EPtiCaseLower, 33, 0},
+ {EPtiKeyQwertySlash, EPtiCaseLower, 33, 0},
+ {EPtiKeyQwertyAtCharacter, EPtiCaseUpper, 33, 1},
+ {EPtiKeyQwerty1, EPtiCaseUpper, 34, 1},
+ {EPtiKeyQwerty2, EPtiCaseUpper, 35, 1},
+ {EPtiKeyQwerty3, EPtiCaseUpper, 36, 1},
+ {EPtiKeyQwerty4, EPtiCaseUpper, 37, 1},
+ {EPtiKeyQwerty5, EPtiCaseUpper, 38, 1},
+ {EPtiKeyQwerty6, EPtiCaseUpper, 39, 1},
+ {EPtiKeyQwerty7, EPtiCaseUpper, 40, 1},
+ {EPtiKeyQwerty8, EPtiCaseUpper, 41, 1},
+ {EPtiKeyQwerty9, EPtiCaseUpper, 42, 1},
+ {EPtiKeyQwerty0, EPtiCaseUpper, 43, 1},
+ {EPtiKeyQwertyPlus, EPtiCaseUpper, 44, 1},
+ {EPtiKeyQwertyQ, EPtiCaseUpper, 45, 1},
+ {EPtiKeyQwertyW, EPtiCaseUpper, 46, 1},
+ {EPtiKeyQwertyE, EPtiCaseUpper, 47, 1},
+ {EPtiKeyQwertyR, EPtiCaseUpper, 48, 1},
+ {EPtiKeyQwertyT, EPtiCaseUpper, 49, 1},
+ {EPtiKeyQwertyY, EPtiCaseUpper, 50, 1},
+ {EPtiKeyQwertyU, EPtiCaseUpper, 51, 1},
+ {EPtiKeyQwertyI, EPtiCaseUpper, 52, 1},
+ {EPtiKeyQwertyO, EPtiCaseUpper, 53, 1},
+ {EPtiKeyQwertyP, EPtiCaseUpper, 54, 1},
+ {EPtiKeyQwertyMinus, EPtiCaseUpper, 55, 0},
+ {EPtiKeyQwertyHash, EPtiCaseUpper, 55, 1},
+ {EPtiKeyQwertyA, EPtiCaseUpper, 56, 1},
+ {EPtiKeyQwertyS, EPtiCaseUpper, 57, 1},
+ {EPtiKeyQwertyD, EPtiCaseUpper, 58, 1},
+ {EPtiKeyQwertyF, EPtiCaseUpper, 59, 1},
+ {EPtiKeyQwertyG, EPtiCaseUpper, 60, 1},
+ {EPtiKeyQwertyH, EPtiCaseUpper, 61, 1},
+ {EPtiKeyQwertyJ, EPtiCaseUpper, 62, 1},
+ {EPtiKeyQwertyK, EPtiCaseUpper, 63, 1},
+ {EPtiKeyQwertyL, EPtiCaseUpper, 64, 1},
+ {EPtiKeyQwertySemicolon, EPtiCaseUpper, 65, 1},
+ {EPtiKeyQwertyApostrophe, EPtiCaseUpper, 66, 0},
+ {0x5b, EPtiCaseUpper, 66, 0},
+ {EPtiKeyQwertyZ, EPtiCaseUpper, 66, 0},
+ {EPtiKeyQwertyX, EPtiCaseUpper, 66, 0},
+ {EPtiKeyQwertyC, EPtiCaseUpper, 66, 0},
+ {EPtiKeyQwertyV, EPtiCaseUpper, 66, 0},
+ {EPtiKeyQwertyB, EPtiCaseUpper, 66, 0},
+ {EPtiKeyQwertyN, EPtiCaseUpper, 66, 0},
+ {EPtiKeyQwertyM, EPtiCaseUpper, 66, 0},
+ {EPtiKeyQwertyComma, EPtiCaseUpper, 66, 0},
+ {EPtiKeyQwertyFullstop, EPtiCaseUpper, 66, 0},
+ {EPtiKeyQwertySlash, EPtiCaseUpper, 66, 0},
};
-const TInt KMaxStandardQwertyIndex_Estonian = 88;
-
-
-//
-// Dead key data table for StandardQwerty
-//
-const TUint16 StandardQwertyDeadKeyData_table_Estonian[] =
- {
- 19, 0x00f5,0xf000,0xf000,0xf000,0xf000,
- 63, 0x00d5,0xf000,0xf000,0xf000,0xf000,
- };
-
-const TInt KStandardQwertyDeadKeyTableRows_Estonian = 2;
+const TInt KMaxStandardQwertyIndex_Estonian = 92;
//
// MiniQwerty keymap data table
@@ -752,16 +722,3 @@
}
-const TUint16* CPtiLangDataImplEstonian::DeadKeyDataArray(TPtiKeyboardType aKeyboardType, TInt& aNumRowsInArray) const
- {
- if (aKeyboardType == EPtiKeyboardQwerty4x12)
- {
- aNumRowsInArray = KStandardQwertyDeadKeyTableRows_Estonian;
- return StandardQwertyDeadKeyData_table_Estonian;
- }
-
- aNumRowsInArray = 0;
- return NULL;
- }
-
-