1.1 --- a/epoc32/include/convdata.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/convdata.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,22 +1,29 @@
     1.4 -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5 -// All rights reserved.
     1.6 -// This component and the accompanying materials are made available
     1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 -// which accompanies this distribution, and is available
     1.9 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.10 -//
    1.11 -// Initial Contributors:
    1.12 -// Nokia Corporation - initial contribution.
    1.13 -//
    1.14 -// Contributors:
    1.15 -//
    1.16 -// Description:
    1.17 -//
    1.18 +/*
    1.19 +* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
    1.20 +* All rights reserved.
    1.21 +* This component and the accompanying materials are made available
    1.22 +* under the terms of "Eclipse Public License v1.0"
    1.23 +* which accompanies this distribution, and is available
    1.24 +* at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.25 +*
    1.26 +* Initial Contributors:
    1.27 +* Nokia Corporation - initial contribution.
    1.28 +*
    1.29 +* Contributors:
    1.30 +*
    1.31 +* Description: 
    1.32 +*
    1.33 +*/
    1.34 +
    1.35  
    1.36  #if !defined(__CONVDATA_H__)
    1.37  #define __CONVDATA_H__
    1.38  
    1.39  /**
    1.40 +This structure doesn't intend to be used by external developers.
    1.41 +For plugin creators, all they need is to include this header file in order to compile. All the plugin data are generated from provided perl scripts. 
    1.42 + 
    1.43 +Any use of this structure externally are not proved to be compatible in future. 
    1.44  @internalComponent
    1.45  */
    1.46  struct SCnvConversionData
    1.47 @@ -51,7 +58,10 @@
    1.48  				EOffset,
    1.49  				EIndexedTable16,
    1.50  				EKeyedTable1616,
    1.51 -				EKeyedTable16OfIndexedTables16
    1.52 +				EKeyedTable16OfIndexedTables16,
    1.53 +				EIndexedTable32,
    1.54 +				EKeyedTable3232,
    1.55 +				EKeyedTable32OfIndexedTables32
    1.56  				};
    1.57  			union UData
    1.58  				{
    1.59 @@ -84,10 +94,42 @@
    1.60  					TInt iNumberOfKeyedEntries;
    1.61  					const SKeyedEntry* iKeyedEntryArray;
    1.62  					};
    1.63 +				struct SIndexedTable32
    1.64 +					{
    1.65 +					struct SEntry
    1.66 +						{
    1.67 +						TUint32 iOutputCharacterCode;
    1.68 +						};
    1.69 +					const SEntry* iEntryArray;
    1.70 +					};
    1.71 +				struct SKeyedTable3232
    1.72 +					{
    1.73 +					struct SEntry
    1.74 +						{
    1.75 +						TUint32 iKey;
    1.76 +						TUint32 iOutputCharacterCode;
    1.77 +						};
    1.78 +					TInt iNumberOfEntries;
    1.79 +					const SEntry* iEntryArray;
    1.80 +					};
    1.81 +				struct SKeyedTable32OfIndexedTables32
    1.82 +					{
    1.83 +					struct SKeyedEntry
    1.84 +						{
    1.85 +						TUint32 iFirstInputCharacterCodeInIndexedTable;
    1.86 +						TUint32 iLastInputCharacterCodeInIndexedTable;
    1.87 +						const TUint32* iIndexedEntryArray;
    1.88 +						};
    1.89 +					TInt iNumberOfKeyedEntries;
    1.90 +					const SKeyedEntry* iKeyedEntryArray;
    1.91 +					};
    1.92  				TInt iOffset;
    1.93  				SIndexedTable16 iIndexedTable16;
    1.94  				SKeyedTable1616 iKeyedTable1616;
    1.95  				SKeyedTable16OfIndexedTables16 iKeyedTable16OfIndexedTables16;
    1.96 +				SIndexedTable32 iIndexedTable32;
    1.97 +				SKeyedTable3232 iKeyedTable3232;
    1.98 +				SKeyedTable32OfIndexedTables32 iKeyedTable32OfIndexedTables32;
    1.99  				};
   1.100  			TUint iFirstInputCharacterCodeInRange;
   1.101  			TUint iLastInputCharacterCodeInRange;
   1.102 @@ -132,5 +174,22 @@
   1.103  #define UData_SKeyedTable16OfIndexedTables16(a)	\
   1.104  	static_cast<TUint>ARRAY_LENGTH(a), \
   1.105  	reinterpret_cast<TUint>(const_cast<SCnvConversionData::SOneDirectionData::SRange::UData::SKeyedTable16OfIndexedTables16::SKeyedEntry *>(a)) 
   1.106 +/**
   1.107 +@internalComponent
   1.108 +*/
   1.109 +#define UData_SIndexedTable32(a) \
   1.110 +	reinterpret_cast<TUint>(const_cast<SCnvConversionData::SOneDirectionData::SRange::UData::SIndexedTable32::SEntry*>(a)) 
   1.111 +/**
   1.112 +@internalComponent
   1.113 +*/
   1.114 +#define UData_SKeyedTable3232(a) \
   1.115 +	static_cast<TUint>ARRAY_LENGTH(a), \
   1.116 +	reinterpret_cast<TUint>(const_cast<SCnvConversionData::SOneDirectionData::SRange::UData::SKeyedTable3232::SEntry*>(a))
   1.117 +/**
   1.118 +@internalComponent
   1.119 +*/
   1.120 +#define UData_SKeyedTable32OfIndexedTables32(a)	\
   1.121 +	static_cast<TUint>ARRAY_LENGTH(a), \
   1.122 +	reinterpret_cast<TUint>(const_cast<SCnvConversionData::SOneDirectionData::SRange::UData::SKeyedTable32OfIndexedTables32::SKeyedEntry *>(a)) 
   1.123 +#endif
   1.124  
   1.125 -#endif