--- a/textinput/ptienginev2/languages/PtiKeymappings_ITUT_54.cpp Thu Aug 19 10:15:25 2010 +0300
+++ b/textinput/ptienginev2/languages/PtiKeymappings_ITUT_54.cpp Tue Aug 31 15:31:50 2010 +0300
@@ -1,8 +1,8 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
+* under the terms of "Eclipse Public License v1.0""
* which accompanies this distribution, and is available
* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
@@ -97,174 +97,192 @@
//
const TUint16 StandardQwertyData_table_Greek[] =
{
- 0x003B,
- 0x03C2,
- 0x03B5,0x03AD,
- 0x03C1,
- 0x03C4,
- 0x03C5,0x03CB,0x03CD,0x03B0,
- 0x03B8,
- 0x03B9,0x03CA,0x03AF,0x0390,
- 0x03BF,
- 0x03C0,
- 0xF003,0x0385,
- 0x03B1,0x03AC,
- 0x03C3,
- 0x03B4,
- 0x03C6,
- 0x03B3,
- 0x03B7,0x03AE,
- 0x03BE,
- 0x03BA,
- 0x03BB,
- 0xF002,0x0384,
- 0xF001,0x00A8,
- 0x03B6,
- 0x03C7,
- 0x03C8,
- 0x03C9,0x03CE,
- 0x03B2,
- 0x03BD,
- 0x03BC,
- 0x002C,
- 0x002E,
- 0x002D,
- 0x0021,
- 0x003B,
- 0x03C2,
- 0x0395,0x0388,
- 0x03A1,
- 0x03A4,
- 0x03A5,0x03AB,0x038E,
- 0x0398,
- 0x0399,0x03AA,0x038A,
- 0x039F,0x038C,
- 0x03A0,
- 0xF003,0x0385,
- 0x0391,0x0386,
- 0x03A3,
- 0x0394,
- 0x03A6,
- 0x0393,
- 0x0397,0x0389,
- 0x039E,
- 0x039A,
- 0x039B,
- 0xF002,0x0384,
- 0xF001,0x00A8,
- 0x0396,
- 0x03A7,
- 0x03A8,
- 0x03A9,0x038F,
- 0x0392,
- 0x039D,
- 0x039C,
- 0x0027,
- 0x0022,
- 0x002B,
- 0x002F,
+ 0x31,
+ 0x32,
+ 0x33,
+ 0x34,
+ 0x35,
+ 0x36,
+ 0x37,
+ 0x38,
+ 0x39,
+ 0x30,
+ 0x3b,
+ 0x387,
+ 0x3c2,
+ 0x3b5,0x3ad,
+ 0x3c1,
+ 0x3c4,
+ 0x3c5,0x3cd,0x3cb,0x3b0,
+ 0x3b8,
+ 0x3b9,0x3af,0x3ca,0x390,
+ 0x3bf,0x3cc,
+ 0x3c0,
+ 0x2d,
+ 0x2b,
+ 0x3b1,0x3ac,
+ 0x3c3,
+ 0x3b4,
+ 0x3c6,
+ 0x3b3,
+ 0x3b7,0x3ae,
+ 0x3be,
+ 0x3ba,
+ 0x3bb,
+ 0xf001,0x384,
+ 0xab,
+ 0x3b6,
+ 0x3c7,
+ 0x3c8,
+ 0x3c9,0x3ce,
+ 0x3b2,
+ 0x3bd,
+ 0x3bc,
+ 0x2c,
+ 0x2e,
+ 0x2f,
+ 0x21,
+ 0x40,
+ 0x23,
+ 0x24,
+ 0x25,
+ 0x20ac,
+ 0x26,
+ 0x5c,
+ 0x28,
+ 0x29,
+ 0x3a,
+ 0x387,
+ 0xf003,0x385,
+ 0x395,0x388,
+ 0x3a1,
+ 0x3a4,
+ 0x3a5,0x38e,0x3ab,
+ 0x398,
+ 0x399,0x38a,0x3aa,
+ 0x39f,0x38c,
+ 0x3a0,
+ 0x3d,
+ 0x2a,
+ 0x391,0x386,
+ 0x3a3,
+ 0x394,
+ 0x3a6,
+ 0x393,
+ 0x397,0x389,
+ 0x39e,
+ 0x39a,
+ 0x39b,
+ 0xf002,0xa8,
+ 0xbb,
+ 0x396,
+ 0x3a7,
+ 0x3a8,
+ 0x3a9,0x38f,
+ 0x392,
+ 0x39d,
+ 0x39c,
+ 0x3c,
+ 0x3e,
+ 0x3f,
};
-const TInt KStandardQwertyDataSize_Greek = 91;
+const TInt KStandardQwertyDataSize_Greek = 111;
const TPtiKeyBinding StandardQwertyKeyBindings_table_Greek[] =
{
- {EPtiKeyQwertyAtCharacter, EPtiCaseLower, 0, 1},
- {EPtiKeyQwerty1, EPtiCaseLower, 1, 1},
- {EPtiKeyQwerty2, EPtiCaseLower, 2, 2},
- {EPtiKeyQwerty3, EPtiCaseLower, 4, 1},
- {EPtiKeyQwerty4, EPtiCaseLower, 5, 1},
- {EPtiKeyQwerty5, EPtiCaseLower, 6, 4},
- {EPtiKeyQwerty6, EPtiCaseLower, 10, 1},
- {EPtiKeyQwerty7, EPtiCaseLower, 11, 4},
- {EPtiKeyQwerty8, EPtiCaseLower, 15, 1},
- {EPtiKeyQwerty9, EPtiCaseLower, 16, 1},
- {EPtiKeyQwerty0, EPtiCaseLower, 17, 2},
- {EPtiKeyQwertyPlus, EPtiCaseLower, 19, 2},
- {EPtiKeyQwertyQ, EPtiCaseLower, 21, 1},
- {EPtiKeyQwertyW, EPtiCaseLower, 22, 1},
- {EPtiKeyQwertyE, EPtiCaseLower, 23, 1},
- {EPtiKeyQwertyR, EPtiCaseLower, 24, 1},
- {EPtiKeyQwertyT, EPtiCaseLower, 25, 2},
- {EPtiKeyQwertyY, EPtiCaseLower, 27, 1},
- {EPtiKeyQwertyU, EPtiCaseLower, 28, 1},
- {EPtiKeyQwertyI, EPtiCaseLower, 29, 1},
- {EPtiKeyQwertyO, EPtiCaseLower, 30, 2},
- {EPtiKeyQwertyP, EPtiCaseLower, 32, 2},
- {EPtiKeyQwertyMinus, EPtiCaseLower, 34, 0},
- {EPtiKeyQwertyHash, EPtiCaseLower, 34, 1},
- {EPtiKeyQwertyA, EPtiCaseLower, 35, 1},
- {EPtiKeyQwertyS, EPtiCaseLower, 36, 1},
- {EPtiKeyQwertyD, EPtiCaseLower, 37, 2},
- {EPtiKeyQwertyF, EPtiCaseLower, 39, 1},
- {EPtiKeyQwertyG, EPtiCaseLower, 40, 1},
- {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, 1},
- {EPtiKeyQwerty4, EPtiCaseUpper, 51, 1},
- {EPtiKeyQwerty5, EPtiCaseUpper, 52, 3},
- {EPtiKeyQwerty6, EPtiCaseUpper, 55, 1},
- {EPtiKeyQwerty7, EPtiCaseUpper, 56, 3},
- {EPtiKeyQwerty8, EPtiCaseUpper, 59, 2},
- {EPtiKeyQwerty9, EPtiCaseUpper, 61, 1},
- {EPtiKeyQwerty0, EPtiCaseUpper, 62, 2},
- {EPtiKeyQwertyPlus, EPtiCaseUpper, 64, 2},
- {EPtiKeyQwertyQ, EPtiCaseUpper, 66, 1},
- {EPtiKeyQwertyW, EPtiCaseUpper, 67, 1},
- {EPtiKeyQwertyE, EPtiCaseUpper, 68, 1},
- {EPtiKeyQwertyR, EPtiCaseUpper, 69, 1},
- {EPtiKeyQwertyT, EPtiCaseUpper, 70, 2},
- {EPtiKeyQwertyY, EPtiCaseUpper, 72, 1},
- {EPtiKeyQwertyU, EPtiCaseUpper, 73, 1},
- {EPtiKeyQwertyI, EPtiCaseUpper, 74, 1},
- {EPtiKeyQwertyO, EPtiCaseUpper, 75, 2},
- {EPtiKeyQwertyP, EPtiCaseUpper, 77, 2},
- {EPtiKeyQwertyMinus, EPtiCaseUpper, 79, 0},
- {EPtiKeyQwertyHash, EPtiCaseUpper, 79, 1},
- {EPtiKeyQwertyA, EPtiCaseUpper, 80, 1},
- {EPtiKeyQwertyS, EPtiCaseUpper, 81, 1},
- {EPtiKeyQwertyD, EPtiCaseUpper, 82, 2},
- {EPtiKeyQwertyF, EPtiCaseUpper, 84, 1},
- {EPtiKeyQwertyG, EPtiCaseUpper, 85, 1},
- {EPtiKeyQwertyH, EPtiCaseUpper, 86, 1},
- {EPtiKeyQwertyJ, EPtiCaseUpper, 87, 1},
- {EPtiKeyQwertyK, EPtiCaseUpper, 88, 1},
- {EPtiKeyQwertyL, EPtiCaseUpper, 89, 1},
- {EPtiKeyQwertySemicolon, EPtiCaseUpper, 90, 1},
- {EPtiKeyQwertyApostrophe, EPtiCaseUpper, 91, 0},
- {0x5b, EPtiCaseUpper, 91, 0},
- {EPtiKeyQwertyZ, EPtiCaseUpper, 91, 0},
- {EPtiKeyQwertyX, EPtiCaseUpper, 91, 0},
- {EPtiKeyQwertyC, EPtiCaseUpper, 91, 0},
- {EPtiKeyQwertyV, EPtiCaseUpper, 91, 0},
- {EPtiKeyQwertyB, EPtiCaseUpper, 91, 0},
- {EPtiKeyQwertyN, EPtiCaseUpper, 91, 0},
- {EPtiKeyQwertyM, EPtiCaseUpper, 91, 0},
- {EPtiKeyQwertyComma, EPtiCaseUpper, 91, 0},
- {EPtiKeyQwertyFullstop, EPtiCaseUpper, 91, 0},
- {EPtiKeyQwertySlash, EPtiCaseUpper, 91, 0},
+ {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, 2},
+ {EPtiKeyQwertyR, EPtiCaseLower, 15, 1},
+ {EPtiKeyQwertyT, EPtiCaseLower, 16, 1},
+ {EPtiKeyQwertyY, EPtiCaseLower, 17, 4},
+ {EPtiKeyQwertyU, EPtiCaseLower, 21, 1},
+ {EPtiKeyQwertyI, EPtiCaseLower, 22, 4},
+ {EPtiKeyQwertyO, EPtiCaseLower, 26, 2},
+ {EPtiKeyQwertyP, EPtiCaseLower, 28, 1},
+ {EPtiKeyQwertyMinus, EPtiCaseLower, 29, 1},
+ {EPtiKeyQwertyHash, EPtiCaseLower, 30, 1},
+ {EPtiKeyQwertyA, EPtiCaseLower, 31, 2},
+ {EPtiKeyQwertyS, EPtiCaseLower, 33, 1},
+ {EPtiKeyQwertyD, EPtiCaseLower, 34, 1},
+ {EPtiKeyQwertyF, EPtiCaseLower, 35, 1},
+ {EPtiKeyQwertyG, EPtiCaseLower, 36, 1},
+ {EPtiKeyQwertyH, EPtiCaseLower, 37, 2},
+ {EPtiKeyQwertyJ, EPtiCaseLower, 39, 1},
+ {EPtiKeyQwertyK, EPtiCaseLower, 40, 1},
+ {EPtiKeyQwertyL, EPtiCaseLower, 41, 1},
+ {EPtiKeyQwertySemicolon, EPtiCaseLower, 42, 2},
+ {EPtiKeyQwertyApostrophe, EPtiCaseLower, 44, 1},
+ {EPtiKeyQwertyZ, EPtiCaseLower, 45, 1},
+ {EPtiKeyQwertyX, EPtiCaseLower, 46, 1},
+ {EPtiKeyQwertyC, EPtiCaseLower, 47, 1},
+ {EPtiKeyQwertyV, EPtiCaseLower, 48, 2},
+ {EPtiKeyQwertyB, EPtiCaseLower, 50, 1},
+ {EPtiKeyQwertyN, EPtiCaseLower, 51, 1},
+ {EPtiKeyQwertyM, EPtiCaseLower, 52, 1},
+ {EPtiKeyQwertyComma, EPtiCaseLower, 53, 1},
+ {EPtiKeyQwertyFullstop, EPtiCaseLower, 54, 1},
+ {EPtiKeyQwertySlash, EPtiCaseLower, 55, 1},
+ {EPtiKeyQwerty1, EPtiCaseUpper, 56, 1},
+ {EPtiKeyQwerty2, EPtiCaseUpper, 57, 1},
+ {EPtiKeyQwerty3, EPtiCaseUpper, 58, 1},
+ {EPtiKeyQwerty4, EPtiCaseUpper, 59, 1},
+ {EPtiKeyQwerty5, EPtiCaseUpper, 60, 1},
+ {EPtiKeyQwerty6, EPtiCaseUpper, 61, 1},
+ {EPtiKeyQwerty7, EPtiCaseUpper, 62, 1},
+ {EPtiKeyQwerty8, EPtiCaseUpper, 63, 1},
+ {EPtiKeyQwerty9, EPtiCaseUpper, 64, 1},
+ {EPtiKeyQwerty0, EPtiCaseUpper, 65, 1},
+ {EPtiKeyQwertyPlus, EPtiCaseUpper, 66, 1},
+ {EPtiKeyQwertyQ, EPtiCaseUpper, 67, 1},
+ {EPtiKeyQwertyW, EPtiCaseUpper, 68, 2},
+ {EPtiKeyQwertyE, EPtiCaseUpper, 70, 2},
+ {EPtiKeyQwertyR, EPtiCaseUpper, 72, 1},
+ {EPtiKeyQwertyT, EPtiCaseUpper, 73, 1},
+ {EPtiKeyQwertyY, EPtiCaseUpper, 74, 3},
+ {EPtiKeyQwertyU, EPtiCaseUpper, 77, 1},
+ {EPtiKeyQwertyI, EPtiCaseUpper, 78, 3},
+ {EPtiKeyQwertyO, EPtiCaseUpper, 81, 2},
+ {EPtiKeyQwertyP, EPtiCaseUpper, 83, 1},
+ {EPtiKeyQwertyMinus, EPtiCaseUpper, 84, 1},
+ {EPtiKeyQwertyHash, EPtiCaseUpper, 85, 1},
+ {EPtiKeyQwertyA, EPtiCaseUpper, 86, 2},
+ {EPtiKeyQwertyS, EPtiCaseUpper, 88, 1},
+ {EPtiKeyQwertyD, EPtiCaseUpper, 89, 1},
+ {EPtiKeyQwertyF, EPtiCaseUpper, 90, 1},
+ {EPtiKeyQwertyG, EPtiCaseUpper, 91, 1},
+ {EPtiKeyQwertyH, EPtiCaseUpper, 92, 2},
+ {EPtiKeyQwertyJ, EPtiCaseUpper, 94, 1},
+ {EPtiKeyQwertyK, EPtiCaseUpper, 95, 1},
+ {EPtiKeyQwertyL, EPtiCaseUpper, 96, 1},
+ {EPtiKeyQwertySemicolon, EPtiCaseUpper, 97, 2},
+ {EPtiKeyQwertyApostrophe, EPtiCaseUpper, 99, 1},
+ {EPtiKeyQwertyZ, EPtiCaseUpper, 100, 1},
+ {EPtiKeyQwertyX, EPtiCaseUpper, 101, 1},
+ {EPtiKeyQwertyC, EPtiCaseUpper, 102, 1},
+ {EPtiKeyQwertyV, EPtiCaseUpper, 103, 2},
+ {EPtiKeyQwertyB, EPtiCaseUpper, 105, 1},
+ {EPtiKeyQwertyN, EPtiCaseUpper, 106, 1},
+ {EPtiKeyQwertyM, EPtiCaseUpper, 107, 1},
+ {EPtiKeyQwertyComma, EPtiCaseUpper, 108, 1},
+ {EPtiKeyQwertyFullstop, EPtiCaseUpper, 109, 1},
+ {EPtiKeyQwertySlash, EPtiCaseUpper, 110, 1},
};
-const TInt KMaxStandardQwertyIndex_Greek = 92;
+const TInt KMaxStandardQwertyIndex_Greek = 88;
//
@@ -272,24 +290,36 @@
//
const TUint16 StandardQwertyDeadKeyData_table_Greek[] =
{
- 2, 0xf000,0x03AD,0xf000,0xf000,0xf000,
- 5, 0x03CB,0x03CD,0x03B0,0xf000,0xf000,
- 7, 0x03CA,0x03AF,0x0390,0xf000,0xf000,
- 8, 0xf000,0x03CC,0xf000,0xf000,0xf000,
- 11, 0xf000,0x03AC,0xf000,0xf000,0xf000,
- 16, 0xf000,0x03AE,0xf000,0xf000,0xf000,
- 25, 0xf000,0x03CE,0xf000,0xf000,0xf000,
- 35, 0xf000,0x0388,0xf000,0xf000,0xf000,
- 38, 0x03AB,0x038E,0xf000,0xf000,0xf000,
- 40, 0x03AA,0x038A,0xf000,0xf000,0xf000,
- 41, 0xf000,0x038C,0xf000,0xf000,0xf000,
- 44, 0xf000,0x0386,0xf000,0xf000,0xf000,
- 49, 0xf000,0x0389,0xf000,0xf000,0xf000,
- 58, 0xf000,0x038F,0xf000,0xf000,0xf000,
+ 13, 0x03AD,0xF000,0xF000,0xf000,0xf000,
+ 16, 0x03CD,0x03CB,0x03B0,0xf000,0xf000,
+ 18, 0x03AF,0x03CA,0x0390,0xf000,0xf000,
+ 19, 0x03CC,0xF000,0xF000,0xf000,0xf000,
+ 23, 0x03AC,0xF000,0xF000,0xf000,0xf000,
+ 28, 0x03AE,0xF000,0xF000,0xf000,0xf000,
+ 37, 0x03CE,0xF000,0xF000,0xf000,0xf000,
+ 57, 0x0388,0xF000,0xF000,0xf000,0xf000,
+ 60, 0x038E,0x03AB,0xF000,0xf000,0xf000,
+ 62, 0x038A,0x03AA,0xF000,0xf000,0xf000,
+ 63, 0x038C,0xF000,0xF000,0xf000,0xf000,
+ 67, 0x0386,0xF000,0xF000,0xf000,0xf000,
+ 72, 0x0389,0xF000,0xF000,0xf000,0xf000,
+ 81, 0x038F,0xF000,0xF000,0xf000,0xf000,
};
const TInt KStandardQwertyDeadKeyTableRows_Greek = 14;
+
+//
+// Numeric key data table for StandardQwerty
+//
+const TPtiNumericKeyBinding StandardQwertyNumericKeysData_table_Greek[] =
+ {
+ {'p',EPtiKeyQwertyP,EPtiCaseLower},
+ {'w',EPtiKeyQwertyW,EPtiCaseLower},
+ {'E',EPtiKeyQwertyE,EPtiCaseUpper},
+ };
+
+const TInt KNumStandardQwertyNumericKeysEntries_Greek = 3;
//
// MiniQwerty keymap data table
//
@@ -597,6 +627,12 @@
const TPtiNumericKeyBinding* CPtiLangDataImplGreek::NumericModeKeysTable(TPtiKeyboardType aKeyboardType, TInt& aNumEntries) const
{
+ if (aKeyboardType == EPtiKeyboardQwerty4x12)
+ {
+ aNumEntries = KNumStandardQwertyNumericKeysEntries_Greek;
+ return StandardQwertyNumericKeysData_table_Greek;
+ }
+
if (aKeyboardType == EPtiKeyboardQwerty4x10)
{
aNumEntries = KNumMiniQwertyNumericKeysEntries_Greek;
@@ -608,3 +644,10 @@
}
+
+TBool CPtiLangDataImplGreek::SuitableForLatinOnlyMode() const
+ {
+ return EFalse;
+ }
+
+