Binary file aknlayoutcompiler/binary/AknLayoutCompiler.exe has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/cdl/MasterLayoutPack.cdl	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,17 @@
+// MasterLayoutPack.cdl - Acts as a layout index for a whole layout DLL.
+
+Name: MasterLayoutPack
+Version: 1.0
+UID: 0x101feb1b
+
+%% C++
+
+#include <aknlayoutdef.h>
+#include <akndef.hrh>
+
+%% API
+
+TCdlArray<SCdlSize> sizes;
+TCdlArray<TAknLayoutId> variants;
+TCdlArray<TAknUiZoom> zooms;
+TCdlArray<TCdlArray<TCdlRef>*> contents;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/group/AknLayoutCompiler.mmp	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,106 @@
+/*
+* Copyright (c) 2002-2008 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+#include <platform_paths.hrh>
+
+TARGET      AknLayoutCompiler.exe
+TARGETTYPE  EXE
+
+SYSTEMINCLUDE     .
+SYSTEMINCLUDE     ../inc
+SYSTEMINCLUDE   ../../inc
+SYSTEMINCLUDE   ../../inc/arabica
+
+MW_LAYER_SYSTEMINCLUDE
+
+// These options enable exception handling and set the warning level to 3 for command
+// line builds. STL code generates too many warnings at level 4, but is clean at
+// level 3. Also require RTTI.
+option MSVC /GX /W3 /GR
+
+SOURCEPATH      ../src
+
+source          CppWriter.cpp
+source          Extract.cpp
+source          HtmlParse.cpp
+source          Layout.cpp
+source          AknLayoutCompiler.cpp
+source          LayoutCompilerErr.cpp
+source          LayoutParse.cpp
+source          LayoutWriter.cpp
+source          WriterBase.cpp
+source          Lay2Cdl.cpp
+source          Cdl2Lag.cpp
+source          LayCdl2Inst.cpp
+source          LayCdlCheck.cpp
+source          LayoutPack.cpp
+source          LayCdl2InstO.cpp
+source          MakeLayConvTest.cpp
+source          LayScale.cpp
+source          AdaptationLayerTemplate.cpp
+source          Lay2LayPerf.cpp
+source          LayPerfWriter.cpp
+source			coreparser.cpp
+source			formulaparser.cpp
+source			formulatree.cpp
+
+#ifdef RD_XML_PARSER_TOOLCHAIN
+source          SaxErrorHandler.cpp
+source          MLCompData.cpp
+source          MLCompDataParse.cpp
+source          MLCompData2Cdl.cpp
+source          MLCompCdl2InstO.cpp
+source          MLAttributes.cpp
+source          MLAttributesParse.cpp
+source          MLCompData2LayPerf.cpp
+source          MLCompDataLayPerfWriter.cpp
+source          MLEqCompData.cpp
+source          MLEqCompDataParse.cpp
+source          MLEqCompData2DHuiML.cpp
+#endif
+
+source          ZoomLevelNames.cpp
+source          MasterLayoutPack.cpp
+
+#ifndef SBSV2
+  start CW32
+    win32_library /epoc32/release/cwtools/rel/CdlCompilerToolkit.lib
+  end
+
+  start VC32
+    win32_library /epoc32/release/tools/rel/CdlCompilerToolkit.lib
+  end
+#else 
+  START TOOLS
+    #if defined(CW32) 
+      win32_library /epoc32/release/cwtools/rel/CdlCompilerToolkit.lib
+    #elif defined(VC32)
+      win32_library /epoc32/release/tools/rel/CdlCompilerToolkit.lib
+    #endif
+  END
+#endif
+
+start TOOLS
+#ifdef RD_XML_PARSER_TOOLCHAIN
+win32_library /epoc32/release/tools/rel/Arabica.lib
+win32_library /epoc32/release/tools/rel/xerces-c_2.lib
+#endif
+win32_library Advapi32.lib 
+end
+
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/group/bld.inf	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,44 @@
+/*
+* Copyright (c) 2002-2008 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Build information file for project AknLayoutCompiler
+*
+*/
+
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+TOOLS CWTOOLS
+
+PRJ_EXPORTS
+
+../binary/AknLayoutCompiler.exe /epoc32/tools/AknLayoutCompiler.exe
+
+PRJ_MMPFILES
+
+#if	defined(TOOLS) || defined(CWTOOLS)
+
+/*
+ * NOTICE! AknLayoutCompiler is not compiled any more during usual build.
+ * It is just exported from ../binary directory.
+ * If you really want compile AknLayoutCompiler from sources you need to 
+ * uncomment below line, build this project and copy 
+ * /epoc32/tools/AknLayoutCompiler.exe to ../binary directory and 
+ * put the binary to version control.
+ */
+// AknLayoutCompiler.mmp
+
+#endif
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/AdaptationLayerTemplate.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,64 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef ADAPTATIONLAYERTEMPLATE_H
+#define ADAPTATIONLAYERTEMPLATE_H
+
+#include <string>
+#include <vector>
+#include <iosfwd>
+#include "Layout.h"
+using namespace std;
+
+#include <cdlcompilertoolkit/cdltkinterface.h>
+#include <cdlcompilertoolkit/cdltkinstance.h>
+#include <cdlcompilertoolkit/cdltkprocess.h>
+using namespace CdlCompilerToolkit;
+
+
+class AdaptationLayerTemplate : public CCdlTkSourceFileWriter
+	{
+public:
+	static int Process(const vector<string>& args);
+	static void ShowHelp(ostream& stream);
+	~AdaptationLayerTemplate();
+
+private:
+	AdaptationLayerTemplate(TLayout& aLayout, CCdlTkInterface& aLayIface, CCdlTkInterface& aScaleIface, CCdlTkInstance& aInstance, string& aExisting);
+
+	CCdlTkInstance& Instance();
+	string FwdDeclName();
+	void Process();
+
+private:
+	void AddTableToInstance(TLayoutTable& aTable);
+	void AddLineToInstance(TLayoutLine& aLine);
+	bool HasApi(const string& aName);
+	CCdlTkImplementation& FindImp(const string& aName);
+	void SetFuncLine(CCdlTkImplementation& aImp, TLayoutLine& aLine);
+	pair<string,int> GetApiMatch(const string& aName);
+
+private:
+	CCdlTkInterface& iLayIface;
+	CCdlTkInterface& iScaleIface;
+	TLayout& iLayout;
+	CCdlTkInstance& iInstance;
+	string& iExisting;
+	};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/Cdl2Lag.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,57 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef CDL2LAG_H
+#define CDL2LAG_H
+
+#include <string>
+#include <vector>
+#include <iosfwd>
+#include <cdlcompilertoolkit/cdltkprocess.h>
+using namespace CdlCompilerToolkit;
+using namespace std;
+
+/**
+*  CdlToLag
+*  Generates a LAG file macro API to access a CDL API
+*/
+class CdlToLag
+	{
+public:
+	static int Process(const vector<string>& args);
+	static void ShowHelp(ostream& stream);
+
+private:
+	CdlToLag(ofstream& aLag, const string& aLagName);
+
+	void Start();
+	void AddInterface(CCdlTkInterface& aInterface);
+	void Finish();
+
+	void WriteHeader();
+	void WriteMacro(CCdlTkApi& aApi);
+	void WriteFooter();
+	void WriteInclude();
+
+private:
+	ofstream& iLag;
+	string iLagName;
+	CCdlTkInterface* iInterface;
+	};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/CodeGenConsts.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,89 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef CODEGENCONSTS_H
+#define CODEGENCONSTS_H
+
+#include <string>
+using namespace std;
+
+// includes
+const string KIncludeLayoutInstanceHeaderScalableDef("#include <aknlayout2scalabledef.h>");
+// directories
+const string KDirEpocSysHeader("\\epoc32\\include\\");
+const string KDirDomainSysHeader("\\epoc32\\include\\platform\\mw\\");
+
+// parameter namesy
+const string KParamNameBase("aIndex_");
+const string KParamNameB(KParamNameBase + "B");
+const string KParamNameL(KParamNameBase + "l");
+const string KParamNameR(KParamNameBase + "r");
+const string KParamNameNumberOfLinesShown("aNumberOfLinesShown");
+const string KParamParentRect("aParentRect");
+const string KParamLineIndex("aLineIndex");
+const string KParamComponentId("aComponentId");
+const string KParamOptionIndex("aVariety");
+const string KParamRowIndex("aRow");
+const string KParamColIndex("aCol");
+
+// types
+const string KTypeTextLineLayout("TAknTextLineLayout");
+const string KTypeWindowLineLayout("TAknWindowLineLayout");
+const string KTypeLayoutTableLimits("TAknLayoutTableLimits");
+const string KTypeMultiLineTextLayout("TAknMultiLineTextLayout");
+const string KTypeRect("const TRect&");
+const string KTypeInt("TInt");
+
+const string KTypeScreenComponentLayout("TAknScreenComponentLayout");
+const string KTypeContainerComponentLayout("TAknContainerComponentLayout");
+const string KTypePaneComponentLayout("TAknPaneComponentLayout");
+const string KTypeGraphicComponentLayout("TAknGraphicComponentLayout");
+
+const string KTypeWindowComponentLayout("TAknWindowComponentLayout");
+const string KTypeTextComponentLayout("TAknTextComponentLayout");
+const string KTypeComponentTableLimits("TAknComponentTableLimits");
+
+const string KTypeLayoutScalableTableLimits("TAknLayoutScalableTableLimits");
+const string KTypeLayoutScalableParameterLimits("TAknLayoutScalableParameterLimits");
+
+const string KTypeLayoutScalableComponentType("TAknLayoutScalableComponentType");
+
+// function names
+const string KFuncMultiline("Multiline_");
+const string KFuncLimitsSuffix("_Limits");
+const string KFuncParamLimitsSuffix("_ParamLimits");
+
+const string KFuncWindowLine("WindowLine");
+const string KFuncTextLine("TextLine");
+const string KFuncWindowTable("WindowTable");
+const string KFuncTextTable("TextTable");
+const string KFuncTableLimits("TableLimits");
+const string KFuncParamLimits("ParameterLimits");
+const string KFuncParamLimitsTable("ParameterLimitsTable");
+
+const string KFuncGetComponentTypeById("GetComponentTypeById");
+const string KFuncGetParamLimitsById("GetParamLimitsById");
+const string KFuncGetWindowComponentById("GetWindowComponentById");
+const string KFuncGetTextComponentById("GetTextComponentById");
+
+
+// zoom
+const string KDefaultZoomInstanceName("Normal");
+
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/CoreParser.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,125 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#ifndef COREPARSER_H
+#define COREPARSER_H
+
+#include <string>
+#include <vector>
+#include <deque>
+
+class Parser;
+
+class ParseResult
+	{
+public:
+	ParseResult();
+	static ParseResult Fail();
+
+	bool Matched() const;
+
+public:
+	int iRuleId;
+	int iStart;
+	int iEnd;
+	std::deque<ParseResult> iChildren;
+	};
+
+
+class Parser
+	{
+public:
+	Parser(const char* aMatch);
+	static Parser EOS();
+	static Parser Int();
+	static Parser Real();
+	static const Parser& Nul();
+
+	ParseResult Parse(const std::string& aString) const;
+
+	int Id() const;
+	void SetId(int aId);
+
+	Parser();
+	Parser(const Parser& aOther);
+	~Parser();
+	const Parser& operator=(const Parser& aOther);
+
+private:
+	friend Parser operator|(const Parser& aFirst, const Parser& aRest);
+	friend Parser operator>>(const Parser& aFirst, const Parser& aRest);
+	friend Parser operator*(const Parser& aSub);
+
+	enum T0Op
+		{
+		EExact,
+		EEos,
+		EInt,
+		EReal,
+		ENul,
+		ELast0
+		};
+	enum T1Op
+		{
+		EMult = ELast0,
+		ELast1
+		};
+	enum T2Op
+		{
+		ESeq = ELast1,
+		EAlt
+		};
+
+	Parser(T0Op aOp);
+	Parser(T1Op aOp, const Parser& aSub);
+	Parser(T2Op aOp, const Parser& aFirst, const Parser& aRest);
+
+	struct Step
+		{
+		Step(const Parser* aRule, int aPos, int aParent)
+			: iRule(aRule), iStep(0), iPos(aPos), iParent(aParent)
+			{
+			iResult.iStart = aPos;
+			}
+		const Parser* iRule;
+		int iStep;
+		ParseResult iResult;
+		int iPos;
+		int iParent;
+		};
+
+	enum TMatchRes
+		{
+		EFail,
+		EPass,
+		EContinue
+		};
+
+	TMatchRes ParseStep(int aStep, const std::string& aString, int aPos, std::vector<Step>& aStack) const;
+
+private:
+	int iOp;
+	const char* iMatch;
+	const Parser* iSub1;
+	const Parser* iSub2;
+	int iId;
+	};
+
+Parser operator|(const Parser& aFirst, const Parser& aRest);
+Parser operator>>(const Parser& aFirst, const Parser& aRest);
+//Parser operator*(const Parser& aSub);
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/CppWriter.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,192 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef CPPWRITER_H
+#define CPPWRITER_H
+
+// disable "identifier was truncated to '255' characters in the browser information" warning
+#pragma warning (disable:4786)
+#include <vector>
+#include <string>
+#include <iosfwd>
+#include "WriterBase.h"
+using namespace std;
+
+
+
+
+/**
+*  TValuesCppWriter
+*  Write out layout cell values for AknLayout.dll
+*/
+class TValuesCppWriter
+	{
+public:
+	TValuesCppWriter(TValues& aValues) : iValues(aValues) {}
+	void WriteCpp(ostream& aCpp);
+
+private:
+	TValues& iValues;
+	};
+
+
+/**
+*  TLayoutLineCppWriter
+*  Base class for writing out a layout line for AknLayout.dll
+*/
+class TLayoutLineCppWriter
+	{
+public:
+	TLayoutLineCppWriter(TLayoutLine& aLine) : iLine(aLine) {}
+	void WriteCpp(ostream& aCpp); 
+	virtual string Name()=0;
+	virtual void WriteMacro(ostream& aLag) = 0;
+	virtual void FillParamLists(vector<string>& aDef, vector<string>& aCtor) = 0;
+
+	void WriteCppData(ostream& aCpp);
+	int WriteParamList(ostream& aLag, const vector<string>& aParams);
+
+protected:
+	virtual void WriteLineClassName(ostream& aCpp) = 0;
+	virtual void WriteVarCppData(ostream& aCpp) = 0;
+	virtual void WriteFixedCppData(ostream& aCpp) = 0;
+
+	int ValCount();
+
+protected:
+	TLayoutLine& iLine;
+	};
+
+/**
+*  TWindowLineCppWriter 
+*  Write out a window line for AknLayout.dll
+*/
+class TWindowLineCppWriter : public TLayoutLineCppWriter
+	{
+public:
+	TWindowLineCppWriter(TLayoutLine& aLine) : TLayoutLineCppWriter(aLine) {}
+	void WriteMacro(ostream& aLag);
+	string Name();
+	void FillParamLists(vector<string>& aDef, vector<string>& aCtor);
+
+private:
+	void WriteVarCppData(ostream& aCpp);
+	void WriteFixedCppData(ostream& aCpp);
+	void WriteLineClassName(ostream& aCpp);
+	};
+
+/**
+*  TTextLineCppWriter 
+*  Write out a text line for AknLayout.dll
+*/
+class TTextLineCppWriter : public TLayoutLineCppWriter
+	{
+public:
+	TTextLineCppWriter(TLayoutLine& aLine) : TLayoutLineCppWriter(aLine) {}
+	void WriteMacro(ostream& aLag);
+	string Name();
+	void FillParamLists(vector<string>& aDef, vector<string>& aCtor);
+
+private:
+	void WriteVarCppData(ostream& aCpp);
+	void WriteFixedCppData(ostream& aCpp);
+	void WriteLineClassName(ostream& aCpp);
+
+	// Specific to text
+	void WriteMultiLineTextParamList(ostream& aLag, const vector<string>& aParams);
+
+private:
+	bool iBaseLineVariation;
+	};
+
+
+/**
+*  TLayoutTableCppWriter
+*  Write out a layout table for AknLayout.dll
+*/
+class TLayoutTableCppWriter
+	{
+public:
+	TLayoutTableCppWriter(TLayoutTable& aTable) : iTable(aTable) {}
+	void WriteCppLineData(ostream& aCpp);
+	void WriteCppTableData(ostream& aCpp);
+	void WriteLag(ostream& aLag);
+	void WriteLagSubTable(const TLayoutTable::TLayoutSubTable& aSubTable, int aCount, ostream& aLag);
+	static TLayoutLineCppWriter* CreateLayoutLineCppWriter(TLayoutLine& aData, TLayoutTable& iTable);
+
+private:
+	TLayoutTable& iTable;
+	};
+
+
+/**
+*  TLayoutCppWriter
+*  Write out a layout for AknLayout.dll
+*/
+class TLayoutCppWriter
+	{
+public:
+	TLayoutCppWriter(TLayout& aLayout) : iLayout(aLayout) {}
+	void WriteCppLineData(ostream& aCpp);
+	void WriteCppTableData(ostream& aCpp);
+	void WriteLag(ostream& aLag);
+
+private:
+	TLayout& iLayout;
+	};
+
+
+/**
+*  TLayoutLineTable 
+*  Represents and writes a table of layout lines for AknLayout.dll
+*/
+class TLayoutLineTable : public vector<TLayoutLine*>
+	{
+public:
+	void WriteCpp(ostream& aCpp);
+	void WriteLag(ostream& aLag);
+	};
+
+
+/**
+*  TCppWriter 
+*  Write the source code for AknLayout.dll
+*/
+class TCppWriter : public TLayWriterBase
+	{
+public:
+	TCppWriter(TLayout& aLayout, const std::string& aName);
+	void Write(const std::string& aLayName);
+
+private:
+	void Output(const string& aCpp, const string& aLag, const string& aLayName);
+
+	void WriteCppHeader(ostream& aCpp);
+	void WriteCppFooter(ostream& aCpp, const string& aLayName);
+	void WriteLagHeader(ostream& aLag);
+
+	void BuildLayoutLineTable();
+
+private:
+	TLayoutLineTable iLineTable;
+	string iShortName;
+	};
+
+#endif
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/Extract.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,48 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef EXTRACT_H
+#define EXTRACT_H
+
+#include <string>
+#include <vector>
+#include <iosfwd>
+using namespace std;
+
+/**
+*  LayoutExtract
+*  Layout compiler process for extracting a layout from an HTML file
+*/
+class LayoutExtract
+	{
+public:
+	int Extract(const vector<string>& args);
+	static void ShowHelp(ostream& stream);
+
+private:
+	void ParseArgs(const vector<string>& args);
+
+private:
+	string iDocName;
+	string iLayoutName;
+	string iMergeName;
+	};
+
+#endif
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/FormulaParser.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,49 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef FORMULA_PARSER_H
+#define FORMULA_PARSER_H
+
+#include <string>
+#include <vector>
+#include "coreParser.h"
+using namespace std;
+
+enum TFormulaParserIds
+	{
+	cell_name_ParserId=1,
+	parent_ParserId,
+	parent_cell_ParserId,
+	table_cell_ParserId,
+	comp_cell_ParserId,
+	abs_cell_ParserId,
+	units_ParserId,
+	constant_ParserId,
+	attribute_ParserId,
+	mystery_ParserId,
+	func_ParserId,
+	group_ParserId,
+	term_ParserId,
+	expression_ParserId,
+	comp_group_ParserId,
+	comp_ParserId,
+	conditional_ParserId,
+	};
+
+ParseResult ParseFormula(const string& aFormula);
+
+#endif
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/FormulaTree.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,83 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#ifndef FORMULATREE_H
+#define FORMULATREE_H
+
+#include <string>
+#include <vector>
+using namespace std;
+
+class ParseResult;
+
+class FormulaTreeNode
+	{
+public:
+	enum TNodeType
+		{
+		EReal=1,		// Real() = the number
+		EInt,			// Int() = the number
+		ECell,			// Char() = cell name
+		EParent,		// nothing special
+		EParentCell,	// Char() = parent cell name
+		ETableCell,		// Real() = target table
+		EComponent,		// Real() = component id, [0] = cell name
+		EAbsolute,		// Text() = whole thing, [0], [1] = real components, [2] = cell name
+		EUnits,			// Real() = units
+		EConstant,		// Real() = constant
+		EAttribute,		// Int() = attribute
+		EMystery,		// Text() = whole thing, [0], [1] = int components
+		EFunction,		// Text() = function name, [0] = parameter
+		EArithmetic,	// Char() = arithmetic operator, [0], [1] = sub expressions
+		ECondition,		// Text() = comparison operator, [0], [1] = sub expressions
+		EConditional	// no content, [0] = condition, [1] = then expression, [2] = else expression
+		};
+
+public:
+	static FormulaTreeNode* Parse(const string& aFormula);
+	virtual ~FormulaTreeNode();
+
+	int Size() const;
+	FormulaTreeNode& operator[](int aIndex);
+	const FormulaTreeNode& operator[](int aIndex) const;
+	
+	TNodeType Type() const;
+
+	string Text() const;
+	char Char() const;
+	int Int() const;
+	double Real() const;
+
+	FormulaTreeNode(const FormulaTreeNode& aOther);
+	static void Print(const FormulaTreeNode& aNode);
+
+private:
+	FormulaTreeNode(TNodeType aType, const string& aSource, int aStart, int aLen);
+	static FormulaTreeNode* NewTree(const ParseResult& aParse, const string& aFormula);
+	const FormulaTreeNode& operator=(const FormulaTreeNode& aOther);
+
+public:
+	vector<FormulaTreeNode*> iSubNodes;
+
+private:
+	const string& iSource;
+	int iStart;
+	int iLen;
+	TNodeType iType;
+	};
+
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/HtmlParse.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,95 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef HTMLPARSE_H
+#define HTMLPARSE_H
+
+// disable "identifier was truncated to '255' characters in the browser information" warning
+#pragma warning (disable:4786)
+#include <iosfwd>
+#include <vector>
+#include <string>
+#include "layout.h"
+using namespace std;
+
+/**
+*  THtmlParseLayoutTable 
+*  Parse a layout table from an HTML version of a LAF spec
+*/
+class THtmlParseLayoutTable : public TLayoutTable
+	{
+private:
+	typedef vector<string> Row;
+
+public:
+	THtmlParseLayoutTable(TLayout* aTables);
+	~THtmlParseLayoutTable();
+
+	bool Read(istream& in);
+
+private:
+	bool SearchForTableStart();
+	void ExtractTitle(const string& aText);
+	void ExtractTable();
+
+	string Next();
+	bool IsToken(const string& aText);
+	void PutBack(const string& aText);
+	char Get();
+	void PutBack(char aChar);
+	bool Eof();
+	
+	int GetVal(const string& aText, const string& aField);
+
+	bool IsWindowTable();
+	bool IsTextTable();
+
+	string StripTo(const string& aText, const string& aValid);
+	string UnHtml(const string& aText);
+	char HtmlChar(const string& aText);
+	string CleanMultiCell(const string& aText);
+	Row MakeParamTable(const Row& row, int start, int num);
+	string ConvertToAknName(const string& aText);
+	string SplitMultiCell(const string& aCell, const string& aValid);
+	string CleanCell(const string& cell, const Row& row);
+
+	void AddRow(Row& row);
+	void AddColumnNameRow(Row& row);
+	void AddLineRow(const Row& row);
+	void AddTitleRow(const Row& row);
+
+private:
+	istream* iIn;
+	string iPutBack;
+	};
+
+
+/**
+*  THtmlParseLayout 
+*  Parse the entire layout from an HTML version of a LAF spec
+*/
+class THtmlParseLayout : public TLayout
+	{
+public:
+	void Parse(istream &aIn);
+	};
+
+
+#endif
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/Lay2Cdl.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,56 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef LAY2CDL_H
+#define LAY2CDL_H
+
+#include <string>
+#include <vector>
+#include <iosfwd>
+#include "Layout.h"
+using namespace std;
+
+#include <cdlcompilertoolkit/cdltkinterface.h>
+using namespace CdlCompilerToolkit;
+
+
+/**
+*  LayoutToCdl
+*  Generate a CDL interface for a layout
+*/
+class LayoutToCdl
+	{
+public:
+	static int Process(const vector<string>& args);
+	static void ShowHelp(ostream& stream);
+	static auto_ptr<CCdlTkInterface> LayoutToInterface(const TLayout& aLayout);
+	static void AddTableToInterface(CCdlTkInterface& aInterface, TLayoutTable& aTable);
+	static void AddWindowLineToInterface(CCdlTkInterface& aInterface, TLayoutLine& aLine);
+	static void AddTextLineToInterface(CCdlTkInterface& aInterface, TLayoutLine& aLine);
+	static string TableApiName(TLayoutTable& aTable, TLayoutTable::TLayoutSubTable& aSubTable, int aSubTableNum);
+	static string LineApiName(TLayoutLine& aLine);
+	static void AddTableLimitsToInterface(CCdlTkInterface& aInterface, TLayoutTable& aTable, TLayoutTable::TLayoutSubTable& aSubTable, int aSubTableNum);
+	static void AddSubTableToInterface(const string& aType, CCdlTkInterface& aInterface, TLayoutTable& aTable, TLayoutTable::TLayoutSubTable& aSubTable, int aSubTableNum);
+	static void AddParamsToFunc(TLayoutLine& aLine, CCdlTkFunctionApi& aFunc);
+	static string InterfaceName(const string& aFileName);
+	static void SetHeaders(CCdlTkInterface& aInterface, const string& aCdlName, int aUid);
+private:
+	static CCdlTkApi* CreateGenericApi(CCdlTkInterface& aInterface, TLayoutLine& aLine);
+	};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/Lay2LayPerf.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,54 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef LAY2LAYPERF_H
+#define LAY2LAYPERF_H
+
+#include <string>
+#include <vector>
+#include <iosfwd>
+#include "Layout.h"
+using namespace std;
+
+#include <cdlcompilertoolkit/cdltkinterface.h>
+using namespace CdlCompilerToolkit;
+
+
+/**
+*  LayoutToLayPerf
+*  Compiler mode for rescaling a layout
+*/
+class LayoutToLayPerf
+	{
+public:
+	static int Process(const vector<string>& args);
+	static void ShowHelp(ostream& stream);
+	static string InterfaceName(const string& aFileName);
+
+private:
+	LayoutToLayPerf(const string& aCdlName, TLayout& aSourceLayout, const string& aDestLayoutName);
+	void WriteLayout();
+
+private:
+	TLayout& iLayout;
+	string iDestLayoutName;
+	string iCdlName;
+	};
+
+
+#endif // LAY2LAYPERF_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/Lay2MLInst.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,42 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef LAY2MLINST_H
+#define LAY2MLINST_H
+
+#include <string>
+#include <vector>
+#include <iosfwd>
+#include "Layout.h"
+#include "MLInst.h"
+
+using namespace std;
+
+class LayoutToMLInst
+	{
+public:
+	static int Process(const vector<string>& args);
+	static void ShowHelp(ostream& stream);
+	static string InterfaceName(const string& aFileName);
+	static auto_ptr<TMLInst> LayoutToInst(const TLayout& aLayout);
+	static void AddTableToInst(TMLInst& aInst, TLayoutTable& aTable);
+	static void AddWindowLineToInstTable(TMLInstTable& aInstTable, TLayoutLine& aLine);
+	static void AddTextLineToInstTable(TMLInstTable& aInstTable, TLayoutLine& aLine);
+	static void AddParamToLine(TMLInstLine& aInstLine, TValues& aValue);
+	};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/LayCdl2Inst.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,90 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef LAYCDL2INST_H
+#define LAYCDL2INST_H
+
+#include <string>
+#include <vector>
+#include <iosfwd>
+#include "Layout.h"
+using namespace std;
+
+#include <cdlcompilertoolkit/cdltkinterface.h>
+#include <cdlcompilertoolkit/cdltkinstance.h>
+#include <cdlcompilertoolkit/cdltkprocess.h>
+using namespace CdlCompilerToolkit;
+
+
+/**
+*  CLayoutToInst 
+*  Generate customisation instance for a set of layouts which use a particular CDL
+*  interface (unoptimised)
+*/
+class CLayoutToInst : public CCdlTkSourceFileWriter
+	{
+public:
+	CLayoutToInst(CLayoutToInst* aBase, CCdlTkInterface& aInterface, auto_ptr<TLayout>& aLayout, const string& aInstName);
+	~CLayoutToInst();
+
+	CCdlTkInstance& Instance();
+	string FwdDeclName();
+	void Process();
+
+private:
+	void AddTableToInstance(TLayoutTable& aTable);
+	void AddWindowLineToInstance(TLayoutLine& aLine);
+	void AddTextLineToInstance(TLayoutLine& aLine);
+	void AddTableLimitsToInstance(TLayoutTable& aTable, TLayoutTable::TLayoutSubTable& aSubTable, int aTableNum);
+	void AddSubTableToInstance(const string& aType, TLayoutTable& aTable, TLayoutTable::TLayoutSubTable& aSubTable, int aTableNum);
+	bool HasApi(const string& aName);
+	CCdlTkImplementation& FindImp(const string& aName);
+	void SetDataLine(CCdlTkImplementation& aImp, TLayoutLine& aLine, const string& aType, const string aOutputOrder[], int aOutputOrderSize);
+	void SetFuncLine(CCdlTkImplementation& aImp, TLayoutLine& aLine, const string& aType, const string aOutputOrder[], int aOutputOrderSize, const string& aPreExtra, const string& aPostExtra);
+	void MirrorParamNames(std::string& aNames);
+	void AddFwdRefToInstance(const string& aName, bool aCast);
+
+private:
+	CLayoutToInst* iBase;
+	CCdlTkInterface& iInterface;
+	TLayout* iLayoutPtr;
+	TLayout& iLayout;
+	CCdlTkInstance* iInstance;
+	std::string iInstName;
+	};
+
+class LayoutAndCdlToCdlInstance
+	{
+public:
+	static int Process(const vector<string>& args);
+	static void ShowHelp(ostream& stream);
+	static void CheckLayoutAgainstInterface(const TLayout& aLayout, const CCdlTkInterface& aIface);
+
+	LayoutAndCdlToCdlInstance(CCdlTkInterface& aInterface);
+	~LayoutAndCdlToCdlInstance();
+
+	void AddLayout(auto_ptr<TLayout>& aLayout, const string& aInstName);
+	void WriteInstances();
+
+private:
+	typedef vector<CLayoutToInst*> CLayouts;
+	CLayouts iLayouts;
+	CCdlTkInterface& iInterface;
+	};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/LayCdl2InstO.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,129 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef LAYCDL2INSTO_H
+#define LAYCDL2INSTO_H
+
+#include <string>
+#include <vector>
+#include <iosfwd>
+#include "Layout.h"
+using namespace std;
+
+#include <cdlcompilertoolkit/cdltkinterface.h>
+#include <cdlcompilertoolkit/cdltkinstance.h>
+#include <cdlcompilertoolkit/cdltkprocess.h>
+using namespace CdlCompilerToolkit;
+
+class CLayoutInstOpt;
+class CLayoutInstOptImpl;
+typedef vector<CLayoutInstOptImpl*> CLayoutInstOptImpls;
+
+/**
+*  SImplFunc
+*  This class represents a layout data decompression function local to a layout instance.
+*  These functions will call the corresponding DLL wide function for decompression.
+*/
+struct SImplFunc
+	{
+	enum TFuncType
+		{ 
+		EWindowLine, 
+		ETextLine,
+		EMultilineTextLine,
+		ETableLimits,
+		EWindowTable, 
+		ETextTable
+		};
+	TFuncType iType;
+	int iParams;
+	bool iParent;
+	string iDefn;
+	string iPtrRef;
+
+	SImplFunc(TFuncType aType, int aParams, bool aParent, string aDefn, string aPtrRef)
+	: iType(aType), iParams(aParams), iParent(aParent), iDefn(aDefn), iPtrRef(aPtrRef)
+		{}
+	};
+
+
+/**
+*  CAllFuncs
+*  This represents a collection of all the SImplFunc objects that a layout instance may need
+*/
+class CAllFuncs : public vector<SImplFunc>
+	{
+public:
+	CAllFuncs(int aMaxParams);
+
+private:
+	void AddLineFunc(SImplFunc::TFuncType aType, int aParams, bool aParent, const string& aReturn, const string& aFuncName);
+	void AddTableFunc(SImplFunc::TFuncType aType, int aParams, bool aParent, const string& aReturn, const string& aFuncName);
+	};
+
+
+class CInstanceList
+	{
+public:
+	// ProcessOptions will remove "-i<instanceListFile>" from aArgs, if it appears at position [2].
+	void ProcessOptions(vector<string>& aArgs);
+	bool IsInstanceOk(const string& aInstance) const;
+private:
+	set<string> iInstances;
+	bool iLoaded;
+	};
+
+/**
+*  LayoutCdlInstanceOpt
+*  Generate a set of optimised layout instances for a number of layouts with a common
+*  CDL interface
+*/
+class LayoutCdlInstanceOpt
+	{
+private:
+	typedef vector<CLayoutInstOpt*> CLayouts;
+
+public:
+	static int Process(vector<string>& args);
+	static void ShowHelp(ostream& stream);
+
+	CCdlTkInterface& Interface();
+	CLayouts& Layouts();
+	CLayoutInstOptImpl* FindSimilarImpl(TLayoutLine& aLine);
+	int FindSimilarBytes(CLayoutInstOptImpl* aImpl);
+	void AddImpl(CLayoutInstOptImpl* aImpl);
+
+private:
+	LayoutCdlInstanceOpt(CCdlTkInterface& aIface);
+	~LayoutCdlInstanceOpt();
+
+	void AddLayout(auto_ptr<TLayout>& aLayout, const string& aInstName);
+	void Process();
+	void WriteInstances();
+	void ProcessCommonImpl();
+	bool LinesAreEqual(TLayoutLine& aLine1, TLayoutLine& aLine2);
+
+private:
+	CLayouts iLayouts;
+	CCdlTkInterface& iInterface;
+	CLayoutInstOptImpls iImpls;
+	int iByteCodeIndex;
+	vector<char> iBytesAggregated;
+	};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/LayCdlCheck.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,59 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef LAYCDLCHECK_H
+#define LAYCDLCHECK_H
+
+#include <string>
+#include <vector>
+#include <iosfwd>
+#include "Layout.h"
+using namespace std;
+
+#include <cdlcompilertoolkit/cdltkinterface.h>
+#include <cdlcompilertoolkit/cdltkinstance.h>
+#include <cdlcompilertoolkit/cdltkprocess.h>
+using namespace CdlCompilerToolkit;
+
+/**
+*  LayCdlCheck
+*  Check the interface which could be use with a layout against one specified in a CDL file
+*/
+class LayCdlCheck
+	{
+public:
+	static int Process(const vector<string>& args);
+	static void ShowHelp(ostream& stream);
+
+	LayCdlCheck(TLayout& aLayout, CCdlTkInterface& aInterface, CCdlTkInterface& aExcluded, const string& aOpt);
+	~LayCdlCheck();
+	void Process();
+
+	void Compare(vector<string>& aGood, vector<string>& aOnlyLay, vector<string>& aOnlyCdl, vector<string>& aParamMismatch);
+	void Report(const string& aTitle, vector<string>& aApi);
+	bool HasOpt(char c);
+
+private:
+	TLayout& iLayout;
+	CCdlTkInterface& iInterface;
+	CCdlTkInterface& iExcluded;
+	CCdlTkInterface* iLayoutInterface;	// owned
+	string iOpt;
+	};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/LayPerfWriter.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,65 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef LAYPERFWRITER_H
+#define LAYPERFWRITER_H
+
+#include "WriterBase.h"
+
+/**
+*  TLayPerfTableWriter
+*  Writes a layout table in .lay format
+*/
+class TLayPerfTableWriter
+	{
+public:
+	TLayPerfTableWriter(TLayoutTable& aTable, string& aInterfaceName, int aTableId);
+	~TLayPerfTableWriter();
+
+	void Write(ostream& out);
+	static void WriteCell(ostream& out, TValues& values);
+
+private:
+	bool IsWindowTable();
+	void WriteWindowTable(ostream& out);
+	void WriteWindowLine(ostream& out, TLayoutLine& line);
+	void BuildGenericLine(TLayoutLine& aLine, const string* aKParams, int aCount, string& aParams, string& aLimits);
+	bool IsTextTable();
+	void WriteTextTable(ostream& out);
+	void WriteTextLine(ostream& out, TLayoutLine& line);
+
+private:
+	TLayoutTable& iTable;
+	string iInterfaceName;
+	int iTableId;
+	};
+
+/**
+*  TLayPerfWriter 
+*  Writes a layout in .lay format
+*/
+class TLayPerfWriter : public TLayWriterBase
+	{
+public:
+	TLayPerfWriter(TLayout& aLayout, const std::string& aName);
+	void Write(const std::string& aLayName);
+	};
+
+#endif // LAYPERFWRITER_H
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/LayScale.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,65 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef LAYSCALE_H
+#define LAYSCALE_H
+
+#include <string>
+#include <vector>
+#include <iosfwd>
+#include "Layout.h"
+using namespace std;
+
+#include <cdlcompilertoolkit/cdltkinterface.h>
+using namespace CdlCompilerToolkit;
+
+
+/**
+*  LayoutScale
+*  Compiler mode for rescaling a layout
+*/
+class LayoutScale
+	{
+public:
+	static int Process(const vector<string>& args);
+	static void ShowHelp(ostream& stream);
+
+private:
+	LayoutScale(TLayout& aSourceLayout, int aSourceWidth, int aSourceHeight, const string& aDestLayoutName, int aDestWidth, int aDestHeight);
+	void Run();
+	void RescaleLayout();
+	void WriteLayout();
+
+private:
+	enum TScale {EHoriz, EVert};
+	void RescaleValue(string& aVal, TScale aDir);
+	string RescaleNum(string& aNum, TScale aDir);
+    void TagScaledToken(string& aToken);
+	int Scale(int aNumber, int aNumerator, int aDenominator);
+
+private:
+	TLayout& iLayout;
+	int iSourceWidth;
+	int iSourceHeight;
+	const string& iDestLayoutName;
+	int iDestWidth;
+	int iDestHeight;
+	};
+
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/Layout.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,181 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+
+#ifndef LAYOUT_H
+#define LAYOUT_H
+
+// disable "identifier was truncated to '255' characters in the browser information" warning
+#pragma warning (disable:4786)
+#include <vector>
+#include <string>
+#include <iosfwd>
+#include <map>
+
+using namespace std;
+
+class TLayoutLine;
+class TLayoutTable;
+class TLayout;
+
+extern const string KWindowOutputOrder[];
+extern const string KTextOutputOrder[];
+extern const string KWindowOutputOrderMirrored[];
+extern const string KTextOutputOrderMirrored[];
+extern const int KWindowOutputOrderSize;
+extern const int KTextOutputOrderSize;
+
+
+/**
+*  TLayout 
+*  The core layout class - this represents a complete layout, 
+*  typically loaded from a .lay file
+*/
+class TLayout : public vector<TLayoutTable*>
+	{
+public:
+	enum TMergeMode	{ KMergeModeMerge, KMergeModeVariant, KMergeModeUnion };
+
+public:
+	TLayout();
+	TLayout(const TLayout& aOther);
+	TLayout& operator=(const TLayout& aOther);
+
+	virtual ~TLayout();
+	void Merge(TLayout::TMergeMode aMergeMode, TLayout& aLayout);
+	TLayoutLine* FindLine(const string& aName);
+	void Compile();
+
+public:
+	string iName;
+	bool iCanBeMirror;
+	};
+
+
+/**
+*  TValues 
+*  The values stored in a cell in a layout line
+*/
+class TValues : public vector<string>
+	{
+// This class is generic with respect to the type of line it is used by
+public:
+	TValues();
+	TValues(TLayoutLine* aLine, string aName);
+
+	bool operator==(const TValues& aOther) const;
+
+	void Merge(TValues& aValues);
+	void Compile();
+	string ParamName() const;
+	static string CppValue(const string& aValue);
+
+public:
+	TLayoutLine* iLine;
+	string iName;
+	string iParam;
+	bool iNeedsP;
+	bool iNeedsIndex;
+	};
+
+
+/**
+*  TLayoutLine 
+*  A layout line
+*/
+class TLayoutLine : public map<string, TValues>
+	{
+public:
+	TLayoutLine(TLayoutTable* aTable, int aId);
+	TLayoutLine(TLayoutTable* aTable, const TLayoutLine& aOther);
+
+	bool operator==(const TLayoutLine& aOther) const;
+	bool ValuesEqual(const TLayoutLine& aOther) const;
+
+	void Merge(TLayout::TMergeMode aMergeMode, TLayoutLine& aLine);
+	void Compile();
+	string Name() const;					
+	string TableName() const;
+	bool MatchParams(const TLayoutLine& aLine) const;
+	bool NeedsParams() const { return iNeedsP || iNeedsIndex; }
+
+	void WarnMergeMismatch(TLayoutLine& aLine);
+
+public:
+	int iId;
+	TLayoutTable* iTable;
+	bool iNeedsP;
+	bool iNeedsIndex;
+	bool iIsUnique;
+	int iGlobalIndex;
+	bool iIsMirroredHorizontally; // i.e. l and r are swapped
+	bool iIsMergedIdentical;
+	};
+
+
+/**
+*  TLayoutTable 
+*  A layout table
+*/
+class TLayoutTable : public vector<TLayoutLine*>
+	{
+public:
+	enum TTableType { EUnknownTable, EWindowTable, ETextTable };
+	class TLayoutSubTable : public vector<int>
+		{
+	public:
+		TLayoutSubTable();
+		bool iIsMergedIdentical;
+		};
+	typedef vector<TLayoutSubTable*> TLayoutSubTables;
+
+public:
+	TLayoutTable(TLayout* aTables);
+	TLayoutTable(TLayout* aTables, const TLayoutTable& aOther);
+	virtual ~TLayoutTable();
+
+	void Merge(TLayout::TMergeMode aMergeMode, TLayoutTable& aTable);
+	TLayoutLine* FindLine(const string& aName);
+	void Compile();
+	void BuildSubTables();
+	void DestroySubTables();
+	string Name();
+	static bool IsValueColumn(string aName);
+	static bool IsNumericColumn(string aName);
+	void SetDefaultColumnNames();
+	bool IsWorthATableIndex();
+
+public:
+	TLayoutSubTables iSubTables;
+	vector<string> iColumnNames;
+	TTableType iType;
+	TLayout* iTables;
+	string iName;
+	TLayoutLine* iParent;
+	string iParentName;
+	bool iNeedsP;
+	bool iNeedsIndex;
+	int iFirstLineGlobalIndex;
+	bool iAppend;
+	bool iNoSubTables;
+	};
+
+
+#endif
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/LayoutCompilerErr.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,80 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+
+#ifndef LAYOUTCOMPILERERR_H
+#define LAYOUTCOMPILERERR_H
+
+#include <iosfwd>
+#include <string>
+#include <cdlcompilertoolkit/cdltkutil.h>
+using namespace CdlCompilerToolkit;
+using namespace std;
+
+/**
+*  LayoutCompilerErr 
+*  Base class for exceptions in the layout compiler
+*/
+class LayoutCompilerErr : public CdlCompilerToolkitErr
+	{};
+
+/**
+*  NotFoundErr 
+*  A "not found" exception, which takes a string to explain what was not found
+*/
+class NotFoundErr : public LayoutCompilerErr
+	{
+public:
+	NotFoundErr(const string& aName) : iName(aName) {}
+	void Show(ostream& stream) const;
+private:
+	string iName;
+	};
+
+/**
+*  GeneralErr 
+*  A general compiler error, which takes a string to explain what the error was
+*/
+class GeneralErr : public LayoutCompilerErr
+	{
+public:
+	GeneralErr(const string& aMessage) : iMessage(aMessage) {}
+	void Show(ostream& stream) const;
+private:
+	string iMessage;
+	};
+
+string StreamLoc(const istream& stream, const string& msg, int before, int after);
+
+
+/**
+*  LayoutProcessArgsErr
+*  A templated exception class that indicated an exception in the command line parameter
+*  processing in the class in which it is instantiated on.
+*/
+template<class T>
+class LayoutProcessArgsErr : public LayoutCompilerErr
+	{
+	void Show(ostream& aStream) const { T::ShowHelp(aStream); }
+	};
+
+
+
+#endif
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/LayoutConfig.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,91 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#ifndef LAYOUTCONFIG_H
+#define LAYOUTCONFIG_H
+
+#include <set>
+#include <string>
+#include <iosfwd>
+#include <vector>
+
+class LayoutConfig
+	{
+public:
+	class Size
+		{
+	public:
+		enum TOrientation { EPortrait, ELandscape, ESquare };
+	public:
+		Size();
+		TOrientation Orientation() const;
+		bool operator>(const Size& aRhs) const;
+	public:
+		int iWidth;
+		int iHeight;
+		};
+	typedef std::set<Size, std::greater<Size> > Sizes;
+
+	enum TTarget { EPlatform, EProduct };
+	enum TLegacyMode { ENoLegacyMode, ELegacyMode };
+
+public:
+	static int Process(const std::vector<std::string>& args);
+	static void ShowHelp(std::ostream& stream);
+
+	~LayoutConfig();
+
+protected:
+	LayoutConfig();
+
+	void ParseArgs(const std::vector<std::string>& args);
+	void ParseOpt(const std::string& opt);
+
+	void SetFlags(TTarget aTarget, TLegacyMode aLegacyMode);
+
+	const Sizes& AllSizes() const;
+	const Sizes& ConfiguredSizes() const;
+	const Sizes& SizesForTarget() const;
+
+//	static int TestLayoutConfig();
+
+private: // to be overridden
+	virtual int Process() = 0;
+
+private:
+	void LoadAllSizes();
+	void LoadConfiguredSizes();
+	void OpenBldCfg(std::ifstream& aBldCfg);
+	bool ParseSize(const std::string& aLine, Size& aSize) const;
+
+private:
+	Sizes iAll;
+	Sizes iConf;
+	TTarget iTarget;
+	TLegacyMode iLegacyMode;
+	std::string iTargetFileName;
+	std::string iBaseFileName;
+	};
+
+
+class WsiniConfig : public LayoutConfig
+	{
+private: // from LayoutConfig
+	virtual int Process();
+	};
+
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/LayoutPack.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,66 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef LAYOUTPACK_H
+#define LAYOUTPACK_H
+
+#include <string>
+#include <vector>
+#include <iosfwd>
+using namespace std;
+
+#include <cdlcompilertoolkit/cdltkinterface.h>
+#include <cdlcompilertoolkit/cdltkinstance.h>
+#include <cdlcompilertoolkit/cdltkprocess.h>
+using namespace CdlCompilerToolkit;
+
+/**
+*  LayoutPackage
+*  Write a layout package according to the LayoutPack.cdl interface
+*/
+class LayoutPackage
+	{
+public:
+	static int Process(vector<string>& args);
+	static void ShowHelp(ostream& stream);
+
+private:
+	static void Process(
+		const string& aName, 
+		const string& aWidth, 
+		const string& aHeight, 
+		const string& aId, 
+		const string& aStyleName,
+		const string& aDeliveryTypeName,
+        const string& aPriority,
+        const string& aAppUid,
+		vector<string>::const_iterator aBegin, 
+		vector<string>::const_iterator aEnd, 
+		const string& aZoomName);
+	static void Implement(
+		CCdlTkPackage& aPkg, 
+		const string& aApi, 
+		const string& aTarget, 
+		const string& aReplace,
+		const string& aComment = "");
+	static void ProcessOptionalStringArg(vector<string>& args, const string& aOption, string& aArg);
+	static string Hash(const string& aString);
+	};
+
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/LayoutParse.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,99 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef LAYOUTPARSE_H
+#define LAYOUTPARSE_H
+
+// disable "identifier was truncated to '255' characters in the browser information" warning
+#pragma warning (disable:4786)
+#include <vector>
+#include <string>
+#include <iosfwd>
+#include "LayoutCompilerErr.h"
+#include "Layout.h"
+using namespace std;
+
+
+/**
+*  LayParseErr 
+*  An exception class for .lay file parsing errors
+*/
+class LayParseErr : public LayoutCompilerErr
+	{
+public:
+	LayParseErr(istream& aIn, const string& aTok, const string& aMsg);
+	void Show(ostream& aOut) const;
+private:
+	string iLoc;
+	string iTok;
+	string iMsg;
+	};
+
+
+/**
+*  TLayParseValues 
+*  Parse the values in a layout cell from .lay format
+*/
+class TLayParseValues : public TValues
+	{
+// This class is generic with respect to the type of line it is used by
+public:
+	TLayParseValues(TLayoutLine* aLine, string aName);
+	void Parse(istream& aIn);
+	};
+
+
+/**
+*  TLayParseLayoutLine
+*  Abstract class for common line parsing functionality
+*/
+class TLayParseLayoutLine : public TLayoutLine
+	{
+public:
+	TLayParseLayoutLine(TLayoutTable* aTable, int aId);
+	void Parse(istream& aIn);
+	};
+
+
+/**
+*  TLayParseLayoutTable 
+*  Parse a layout table in .lay format
+*/
+class TLayParseLayoutTable : public TLayoutTable
+	{
+public:
+	TLayParseLayoutTable(TLayout* aTables);
+	virtual void Parse(istream& aIn);
+	};
+
+
+/**
+*  TLayParseLayout 
+*  Parse a layout file in .lay format
+*/
+class TLayParseLayout : public TLayout
+	{
+public:
+	static auto_ptr<TLayParseLayout> Parse(const string& aLayName);
+	void Parse(istream& aIn);
+	};
+
+
+#endif
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/LayoutWriter.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,62 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef LAYOUTWRITER_H
+#define LAYOUTWRITER_H
+
+#include "WriterBase.h"
+
+/**
+*  TLayoutTableWriter
+*  Writes a layout table in .lay format
+*/
+class TLayoutTableWriter
+	{
+public:
+	TLayoutTableWriter(TLayoutTable& aTable);
+	~TLayoutTableWriter();
+
+	void Write(ostream& out);
+	static void WriteCell(ostream& out, TValues& values);
+
+private:
+	bool IsWindowTable();
+	void WriteWindowTable(ostream& out);
+	void WriteWindowLine(ostream& out, TLayoutLine& line);
+	bool IsTextTable();
+	void WriteTextTable(ostream& out);
+	void WriteTextLine(ostream& out, TLayoutLine& line);
+
+private:
+	TLayoutTable& iTable;
+	};
+
+/**
+*  TLayoutWriter 
+*  Writes a layout in .lay format
+*/
+class TLayoutWriter : public TLayWriterBase
+	{
+public:
+	TLayoutWriter(TLayout& aLayout, const std::string& aName);
+	void Write(const std::string& aLayName);
+	};
+
+#endif
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/MLAttributes.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,78 @@
+/*
+* Copyright (c) 2005 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef MLATTRIBUTES_H
+#define MLATTRIBUTES_H
+
+// disable "identifier was truncated to '255' characters in the browser information" warning
+#pragma warning (disable:4786)
+
+// disable "decorated name length exceeded, name was truncated"
+#pragma warning (disable:4503)
+
+
+#include <string>
+#include <iosfwd>
+#include <map>
+
+using namespace std;
+
+class TMLAttributes;
+
+/**
+*  TMLAttributeSet
+*  The attributes stored in an attribute set
+*/
+typedef map<int, string> TMLAttributeZoomLevels;
+class TMLAttributeSet : public map<int, TMLAttributeZoomLevels>
+	{
+public: // constructors, operators, etc
+	TMLAttributeSet();
+	TMLAttributeSet(TMLAttributes* aAttributes);
+	virtual ~TMLAttributeSet();
+public: // new methods
+	void Merge(TMLAttributeSet& aOther);
+	void Compile();
+public: // member data, not owned
+	TMLAttributes* iAttributes;
+	};
+
+/**
+*  TMLAttributes
+*  The attribute values stored in a layout component
+*/
+typedef map<string, TMLAttributeSet*> TMLAttributeSetComponent;
+class TMLAttributes: public map<int, TMLAttributeSetComponent>
+	{
+public:
+	typedef map<string, int> TMLAttributeNames;
+public: // constructors, operators, etc
+	TMLAttributes();
+	virtual ~TMLAttributes();
+public: // new methods
+	void Merge(TMLAttributes& aOther);
+	void Compile();
+public: // member data, owned
+	string iName;
+	string iTimestamp;
+	bool iCanBeMirror;
+	TMLAttributeNames iNames;
+	};
+
+#endif // MLATTRIBUTES_H
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/MLAttributesParse.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,123 @@
+/*
+* Copyright (c) 2005 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*    
+*
+*/
+
+
+#ifndef MLATTRIBUTESPARSE_H
+#define MLATTRIBUTESPARSE_H
+
+// disable "identifier was truncated to '255' characters in the browser information" warning
+#pragma warning (disable:4786)
+
+#include "LayoutCompilerErr.h"
+#include "MLAttributes.h"
+
+#include <avkon.hrh> // for logical font ids
+
+#include "SaxErrorHandler.h"
+
+#include <vector>
+#include <string>
+#include <iosfwd>
+#include <stack>
+
+using namespace std;
+
+
+//
+// defines
+//
+
+/**
+ * this is the interface to the SAX handler
+ */
+class MSaxLayoutAttributesHandler
+	{
+public:
+	typedef SAX::basic_Attributes<std::string> TAttribs; // this is XML Attribs, not to be confused with layout attibutes!
+	virtual MSaxLayoutAttributesHandler* HandleSax(const std::string& aElement, const TAttribs& aAttribs) { return this; };
+	virtual void HandleSaxEnd(const std::string& aElement) { };
+	};
+
+
+/**
+ * this corresponds to an attribute set in the xml
+ */
+class TMLAttributeSetParse : public TMLAttributeSet, public MSaxLayoutAttributesHandler
+	{
+public:
+	TMLAttributeSetParse(TMLAttributes* aAttributes);
+public: // from MSaxLayoutHandler
+	MSaxLayoutAttributesHandler* HandleSax(const std::string& aElement, const TAttribs& aAttribs);
+	void HandleSaxEnd(const std::string& aElement);
+public: // new methods
+	int CompId() const;
+	string Name() const;
+private:
+	void HandleSaxAttribute(const TAttribs& aAttribs);
+	void HandleSaxCalc(const TAttribs& aAttribs);
+private:
+	int iId;
+	int iCompId;
+	string iName;
+	TMLAttributeZoomLevels* iSaxZoomLevels;
+	};
+
+/**
+ *  this corresponds to attributes in the xml
+ */
+class TMLAttributesParse : public TMLAttributes, public MSaxLayoutAttributesHandler
+	{
+public:
+	static auto_ptr<TMLAttributesParse> Parse(const string& aLayName);
+	TMLAttributesParse();
+public: // from MSaxLayoutHandler
+	MSaxLayoutAttributesHandler* HandleSax(const std::string& aElement, const TAttribs& aAttribs);
+	void HandleSaxEnd(const std::string& aElement);
+private: // owned
+	TMLAttributeSetParse* iSaxAttributeSet;
+	};
+
+/**
+ * this is the main SAX parser implementation
+ */
+class TLayoutAttributesSaxParser : private SAX::basic_DefaultHandler<std::string>
+	{
+private:
+	typedef stack<MSaxLayoutAttributesHandler*> TSaxAttributesHandlerStack;
+	typedef SAX::basic_ErrorHandler<std::string>::SAXParseExceptionT TException;
+
+public:
+	TLayoutAttributesSaxParser(MSaxLayoutAttributesHandler* aHandler);
+	void Parse(const std::string& aFileName);
+
+private: // from basic_DefaultHandler
+	void startElement(const std::string& namespaceURI, const std::string& localName, const std::string& qName, const SAX::basic_Attributes<std::string>& atts);
+	void endElement(const std::string& namespaceURI, const std::string& localName, const std::string& qName);
+
+	void warning(const TException& aException);
+	void error(const TException& aException);
+	void fatalError(const TException& aException);
+
+private:
+	TSaxAttributesHandlerStack iStack;	// stack content not owned
+	};
+
+
+#endif // MLATTRIBUTESPARSE_H
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/MLCompCdl2InstO.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,101 @@
+/*
+* Copyright (c) 2002-2008 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef MLCOMPCDL2INSTO_H
+#define MLCOMPCDL2INSTO_H
+
+#include <string>
+#include <vector>
+#include <iosfwd>
+#include "MLCompData.h"
+#include "MLAttributes.h"
+using namespace std;
+
+#include <cdlcompilertoolkit/cdltkinterface.h>
+#include <cdlcompilertoolkit/cdltkinstance.h>
+#include <cdlcompilertoolkit/cdltkprocess.h>
+using namespace CdlCompilerToolkit;
+
+// forward declares and typedefs
+class CInstanceList;
+class CMLCompDataInstOpt;
+class CMLCompDataInstOptImpl;
+typedef vector<CMLCompDataInstOptImpl*> CMLCompDataInstOptImpls;
+class CZoomLevelNames;
+
+/**
+*  MLCompDataCdlInstanceOpt
+*  Generate a set of optimised layout instances for a number of layouts with a common
+*  CDL interface
+*/
+class MLCompDataCdlInstanceOpt
+	{
+private:
+	struct InstStruct
+		{
+		InstStruct(string aInstName, TMLCompData* aInst, TMLAttributes* aAttribs);
+		string iInstName;
+		TMLCompData* iInst;
+		TMLAttributes* iAttribs;
+		};
+
+	class InstList : public vector<InstStruct>
+		{
+	public:
+		~InstList();
+		};
+
+	typedef vector<TMLCompData*> CCompDataLayouts;
+	typedef vector<CMLCompDataInstOpt*> CCompDatas;
+	typedef map<int, CCompDatas> CCompDataZoomLevelDatas;
+public:
+	static int Process(vector<string>& args);
+	static void ShowHelp(ostream& stream);
+
+public:
+	CCdlTkInterface& Interface();
+	int FindSimilarBytes(CMLCompDataInstOptImpl* aImpl, int aBaseOffset);
+	void AddImpl(CMLCompDataInstOptImpl* aImpl);
+	void ResizeByteStream(int aSize);
+	int ByteStreamSize() const;
+
+
+private:
+	static void ProcessSeparators(vector<string>& args, vector<int>& aSeparators);
+	static bool CheckForUsedInstances(const CInstanceList& aUsedList, const CZoomLevelNames& aZoomLevelNames, const vector<string>& aArgs, const vector<int>& aSeparators, int aSepIndex);
+	static void ParseInstances(const vector<string>& aArgs, const vector<int>& aSeparators, int aSepIndex, InstList& aInstList);
+	static void MergeLayouts(CInstanceList& aInstUsedList, CZoomLevelNames& aZoomLevelNames, const InstList& aInstances, InstList& aMergedLayouts);
+
+private:
+	MLCompDataCdlInstanceOpt(CCdlTkInterface& aIface);
+	~MLCompDataCdlInstanceOpt();
+
+	void AddInst(const InstStruct& aInstStruct, CZoomLevelNames& aZoomLevelNames, bool aAllParams, bool aNonRomDelivery);
+	void Process();
+	void WriteInstances();
+	void ProcessCommonImpl();
+
+private:
+	CCompDataLayouts iLayouts; // the comp datas are owned
+	CCompDataZoomLevelDatas iZoomLevelDatas; // the comp data inst opts are owned
+	CCdlTkInterface& iInterface; // not owned
+	CMLCompDataInstOptImpls iImpls; // not owned
+	vector<char> iBytesAggregated;
+	};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/MLCompData.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,367 @@
+/*
+* Copyright (c) 2002-2008 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef MLCOMPDATA_H
+#define MLCOMPDATA_H
+
+// disable "identifier was truncated to '255' characters in the browser information" warning
+#pragma warning (disable:4786)
+
+// disable "decorated name length exceeded, name was truncated"
+#pragma warning (disable:4503)
+
+#include "MLAttributes.h"
+
+#include <vector>
+#include <string>
+#include <iosfwd>
+#include <map>
+
+using namespace std;
+
+class TMLCompDataLine;
+class TMLCompDataTable;
+class TMLCompData;
+class TMLAttributes;
+
+extern const string KCompDataPaneOutputOrder[];
+extern const string KCompDataPaneOutputOrderMirrored[];
+extern const string KCompDataGraphicOutputOrder[];
+extern const string KCompDataGraphicOutputOrderMirrored[];
+extern const string KCompDataTextOutputOrder[];
+extern const string KCompDataTextOutputOrderMirrored[];
+extern const int KCompDataPaneOutputOrderSize;
+extern const int KCompDataGraphicOutputOrderSize;
+extern const int KCompDataTextOutputOrderSize;
+/**
+*  TMLCompDataCalcs
+*  The calcs stored in a value
+*/
+typedef map<int, string> TMLCompDataCalcs;
+typedef map<int, TMLCompDataCalcs> TMLCompDataZoomLevels;
+typedef map<int, TMLCompDataZoomLevels> TMLCompDataVarieties;
+
+/**
+*  TMLCompDataValues 
+*  The values stored in a cell in a layout line
+*/
+class TMLCompDataValues : public TMLCompDataVarieties
+	{
+public:
+	enum TCompDataCellType
+		{
+		ECellTypeDefault,
+		ECellTypeParamLimit,
+		ECellTypeCol,
+		ECellTypeRow
+		};
+
+public: // constructors, operators, etc
+	TMLCompDataValues();
+	TMLCompDataValues(TMLCompDataLine* aLine);
+	virtual ~TMLCompDataValues();
+	bool operator==(const TMLCompDataValues& aOther) const;
+
+public: // new methods
+    bool Merge(TMLCompDataLine* aLine, string aName, TMLCompDataValues& aOtherValues, bool aMirrorMerge);
+	void Compile(const string& aCellName);
+	static string CppValue(const string& aValue);
+	static string MirrorJustificationValue(const string& aValue);
+	static TCompDataCellType Type(string aName); 
+
+public: // member data
+	TMLCompDataLine* iLine; // not owned
+	string iName;
+	};
+
+
+//
+// Parent Info
+//
+
+/**
+*  TMLCompDataParentInfoSelector
+*
+*  The parent id and parent variety index for each variety index
+*/
+struct TMLCompDataParentInfoSelector
+	{
+public:
+	TMLCompDataParentInfoSelector();
+	TMLCompDataParentInfoSelector(int aParentId, int aParentVariety);
+public:
+	int iParentId;
+	int iParentVariety;
+	};
+
+typedef map<int, TMLCompDataParentInfoSelector> TMLCompDataParentInfoVarieties;
+
+/**
+*  TMLCompDataParentInfo
+*
+*  Contains the parent info selector for each variety index
+*/
+class TMLCompDataParentInfo : public TMLCompDataParentInfoVarieties
+	{
+public: // constructors etc
+	TMLCompDataParentInfo();
+	TMLCompDataParentInfo(TMLCompDataLine* aLine);
+	virtual ~TMLCompDataParentInfo();
+public: // new methods
+	void Merge(const TMLCompDataParentInfo& aOther);
+public: // member data
+	TMLCompDataLine* iLine; // not owned
+	};
+
+class TMLCompDataAttributeInfo;
+
+/**
+*  TMLCompDataLine 
+*  A layout line
+*/
+class TMLCompDataLine : public map<string, TMLCompDataValues>
+	{
+public:
+	enum TComponentType 
+		{ 
+		EUnknownComponent, 
+		EScreenComponent, 
+		EContainerComponent, 
+		EPaneComponent, 
+		EGraphicComponent, 
+		ETextComponent 
+		};
+
+public: // constructors etc
+	TMLCompDataLine();
+	TMLCompDataLine(const TMLCompDataLine& aOther);
+	virtual ~TMLCompDataLine();
+
+	bool operator==(const TMLCompDataLine& aOther) const;
+	static bool lessthan(TMLCompDataLine* aLeft, TMLCompDataLine* aRight);
+	bool ValuesEqual(const TMLCompDataLine& aOther) const;
+
+public: // new methods
+	bool Merge(TMLCompDataLine& aOther);
+	void Compile();
+	TMLAttributeZoomLevels* GetAttributeZoomLevels(string aAttribName, int aVariety);
+
+public: // get and set methods
+	string Name() const;					
+	bool NeedsParams() const;
+	bool NeedsOptions() const;
+	bool NeedsCols() const;
+	bool NeedsRows() const;
+	int MaxVariety() const;
+	int NumCols() const;
+	int NumRows() const;
+	void SetMaxVariety(int aMaxVariety);
+	void SetNumCols(int aNumCols);
+	void SetNumRows(int aNumRows);
+	void SetNeedsCols(bool aNeeds);
+	void SetNeedsRows(bool aNeeds);
+
+public: // helpers
+	int EncodeFontId(int aHeight, int aOutline, int aPosture, int aWeight, int aCategory) const;
+	bool MatchParams(const TMLCompDataLine& aLine) const;
+	bool MatchNameDiscountingSuffix(const TMLCompDataLine& aLine) const;
+	bool MatchType(const TMLCompDataLine& aLine) const;
+	string NameDiscountingSuffix() const;
+	string NameSuffix() const;
+
+private: // helpers
+	TMLAttributeZoomLevels* GetParentAttributeZoomLevels(string aAttribSetName, int aAttribId, int aVariety);
+	TMLAttributeZoomLevels* FindAttributeZoomLevels(string aAttribSetName, int aAttribId);
+	void CompileParamLimits(TMLCompDataValues::TCompDataCellType aParamLimitType, const string& aParamLimitCellName);
+	void CompileFontHeights();
+
+
+public: // member data
+	int iId;
+	string iName;
+	TComponentType iType;
+	int iDrawingOrder;
+	int iMaxVariety;
+	TMLCompDataTable* iParentTable;
+	TMLCompDataParentInfo* iParentInfo;// owned
+	TMLCompDataAttributeInfo* iAttributeInfo;// owned
+	bool iIsUnique;
+	int iGlobalIndex;
+	bool iIsMirroredHorizontally; // i.e. l and r are swapped
+	bool iNeedsOptions; // note that can need options although numOptions is only 1, as may be needed for subtable
+	bool iNeedsCols;
+	bool iNeedsRows;
+
+private:
+	int iNumCols; // there is always at least one column
+	int iNumRows; // there is always at least one row
+	};
+
+
+//
+// Attribute Info
+//
+
+/**
+*  TMLCompDataAttributeInfoSelector
+*
+*  Contains the attribute set name, which is used to 
+*  disambiguate the attribute data for a given component
+*/
+struct TMLCompDataAttributeInfoSelector
+	{
+public:
+	TMLCompDataAttributeInfoSelector();
+	TMLCompDataAttributeInfoSelector(string aAttributeSetName);
+public:
+	string iAttributeSetName;
+	};
+
+typedef map<int, TMLCompDataAttributeInfoSelector> TMLCompDataAttributeInfoVarieties;
+
+/**
+*  TMLCompDataAttributeInfo
+*
+*  Contains the attribute info selector for each variety
+*/
+class TMLCompDataAttributeInfo : public TMLCompDataAttributeInfoVarieties
+	{
+public: // constructors etc
+	TMLCompDataAttributeInfo();
+	TMLCompDataAttributeInfo(TMLCompDataLine* aLine);
+	virtual ~TMLCompDataAttributeInfo();
+public: // new methods
+	void Merge(const TMLCompDataAttributeInfo& aOther);
+public: // member data
+	TMLCompDataLine* iLine; // not owned
+	};
+
+
+
+/**
+*  TMLCompDataTable 
+*  A layout table
+*/
+class TMLCompDataTable : public vector<TMLCompDataLine*>
+	{
+public:
+	/*
+	 * Subtables are automatically generated for contiguous collections 
+	 * of components whose names are the same, ending in _g or _t 
+	 * followed by a number. These components represent numbered
+	 * rendered objects in the specification, and often need to be 
+	 * indexed by clients of the scalable layout API.
+	 * 
+	 */
+	class TMLCompDataSubTable : public vector<int>
+		{
+	public:
+		TMLCompDataSubTable();
+		bool NeedsParams() const;
+	public:
+		bool iNeedsOption;
+		bool iNeedsCol;
+		bool iNeedsRow;
+		string iName;
+		};
+	typedef vector<TMLCompDataSubTable*> TMLCompDataSubTables;
+
+public: // constructors etc
+	TMLCompDataTable(TMLCompData* aTables);
+	TMLCompDataTable(TMLCompData* aTables, const TMLCompDataTable& aOther);
+	virtual ~TMLCompDataTable();
+	static bool lessthan(TMLCompDataTable* aLeft, TMLCompDataTable* aRight);
+
+public: // new methods
+	TMLCompDataSubTable* FindSubTable(const string& aName);
+	TMLCompDataLine* FindLine(const string& aName);
+    void Merge(TMLCompDataTable& aOther);
+	void Compile();
+	void BuildSubTables();
+	void NormalizeSubTables();
+	void DestroySubTables();
+	void SetDefaultColumnNames();
+
+public: // accessors
+	string Name();
+	static bool IsValueColumn(string aName);
+	static bool IsNumericColumn(string aName);
+	static bool IsHorizontalColumn(string aName);
+	static bool IsVerticalColumn(string aName);
+
+public: // member data
+	int iId;
+	string iName;
+	TMLCompData* iTables;
+	TMLCompDataSubTables iSubTables;
+	vector<string> iColumnNames;
+	TMLCompDataLine* iParentLine; // not owned
+	string iParentName;
+	bool iNeedsP;
+	bool iNeedsIndex;
+	bool iAppend;
+	int iFirstLineGlobalIndex;
+	};
+
+/**
+*  TMLCompData 
+*  The core layout class - this represents a complete layout, 
+*  typically loaded from a .xml file that has been exported from the 
+* layout creation tool
+*/
+class TMLCompData : public vector<TMLCompDataTable*>
+	{
+public:
+	typedef map<int, TMLCompDataLine*> TMLComponents;
+
+public: // constructors
+	TMLCompData();
+	TMLCompData(const TMLCompData& aOther);
+	TMLCompData& operator=(const TMLCompData& aOther);
+
+public: // new methods
+	virtual ~TMLCompData();
+	TMLCompDataLine* FindComponent(const string& aName) const;
+	TMLCompDataLine* FindLine(const string& aName) const;
+	TMLCompDataTable* FindTable(int aId) const;
+	TMLCompDataTable* FindTable(const string& aName) const;
+	TMLCompDataTable::TMLCompDataSubTable* FindSubTable(const string& aName) const;
+	void Merge(TMLCompData& aOther);
+	void MergeComponents(TMLCompData& aOther);
+	void Compile();
+	void CreateTables();
+	void DeleteComponents();
+
+public: // member data
+	string iName;
+	bool iCanBeMirror;
+	string iMasterName;
+	string iLayoutName;
+	string iVariantName;
+	string iResolutionHeight;
+	string iResolutionWidth;
+	string iTimestamp;
+	TMLComponents iComponents; // this is used to accumulate the lines, which are then compiled into tables
+	bool iIsBaseInstance;
+	TMLAttributes* iAttributes; // owned
+	};
+
+
+#endif
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aknlayoutcompiler/inc/MLCompData2Cdl.h	Thu Dec 17 09:14:18 2009 +0200
@@ -0,0 +1,74 @@
+/*
+* 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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+#ifndef MLCOMPDATA2CDL_H
+#define MLCOMPDATA2CDL_H
+
+#include <string>
+#include <vector>
+#include <iosfwd>
+#include "MLCompData.h"
+using namespace std;
+
+#include <cdlcompilertoolkit/cdltkinterface.h>
+using namespace CdlCompilerToolkit;
+
+
+/**
+*  MLCompDataToCdl
+*  Generate a CDL interface for a layout
+*/
+class MLCompDataToCdl
+	{
+public:
+	static int Process(const vector<string>& args);
+	static void ShowHelp(ostream& stream);
+	static void LayoutToInterface(CCdlTkInterface& aInterface, const TMLCompData& aLayout, bool aDeletesAllowed, bool aAllParams);
+	static void AddGenericApiToInterface(CCdlTkInterface& aInterface, const string& aReturnType, const string& aName, bool aNeedsOptions, bool aNeedsColsRows);
+	static void AddTableToInterface(CCdlTkInterface& aInterface, TMLCompDataTable& aTable, bool aAllParams);
+	static void AddTableCommentToApi(TMLCompDataTable& aTable, CCdlTkApi& aApi);
+	static void AddTableCommentToApi(TMLCompDataLine& aLine, CCdlTkApi& aApi);
+	static void AddLineToInterface(CCdlTkInterface& aInterface, TMLCompDataLine& aLine, bool aAllParams);
+	static void AddParamLimitsToInterface(CCdlTkInterface& aInterface, TMLCompDataLine& aLine, bool aAllParams);
+	static void AddSubTableToInterface(CCdlTkInterface& aInterface, TMLCompDataTable& aTable, TMLCompDataTable::TMLCompDataSubTable& aSubTable, bool aAllParams);
+	static void AddSubTableLimitsToInterface(CCdlTkInterface& aInterface, TMLCompDataTable& aTable, TMLCompDataTable::TMLCompDataSubTable& aSubTable);
+	static void AddSubTableParamLimitsToInterface(CCdlTkInterface& aInterface, TMLCompDataTable& aTable, TMLCompDataTable::TMLCompDataSubTable& aSubTable, bool aAllParams);
+	static void AddParamsToFunc(TMLCompDataLine& aLine, CCdlTkFunctionApi& aFunc, bool aAllParams, bool aIsNew, bool aRowsCols);
+	static void AddParamsToFunc(TMLCompDataTable& aTable, TMLCompDataTable::TMLCompDataSubTable& aSubTable, CCdlTkFunctionApi& aFunc, bool aAllParams, bool aIsNew, bool aRowsCols);
+	static void AddParamToParams(CCdlTkApiParams& aOldParams, CCdlTkApiParams& aParams, string aType, bool aAllParams, bool aIsNewLine, bool aNeedsParam);
+	static void SetHeaders(CCdlTkInterface& aInterface, const string& aCdlName, const string& aComment, int aUid, bool aRomOnly);
+	static string InterfaceName(const string& aFileName);
+	static string SubTableApiName(TMLCompDataTable::TMLCompDataSubTable& aSubTable);
+	static string SubTableLimitsApiName(TMLCompDataTable::TMLCompDataSubTable& aSubTable);
+	static string SubTableParamLimtsApiName(TMLCompDataTable::TMLCompDataSubTable& aSubTable);
+	static string LineApiName(TMLCompDataLine& aLine);
+	static string LineParamLimitsApiName(TMLCompDataLine& aLine);
+private:
+	static string MLCompDataToCdl::ReturnType(TMLCompDataLine& aLine);
+	static void ReplaceRemovedAPIs(CCdlTkInterface& aInterface, const TMLCompData& aLayout, bool aDeletesAllowed);
+	static void CleanUpAPIComments(CCdlTkInterface& aInterface);
+	static CCdlTkFunctionApi* ProcessFunctionApi(CCdlTkInterface& aInterface, string aReturnType, string aName, bool& aIsNew);
+	static CCdlTkFunctionApi* CreateFunctionApi(CCdlTkInterface& aInterface, string aReturnType, string aName);
+	static void UpdateFunctionApi(CCdlTkFunctionApi& aApi, CCdlTkInterface& aInterface, string aReturnType, string aName);
+	static void UpdateParams(CCdlTkApiParams& aOldParams, CCdlTkApiParams& aParams, string aApiName, bool aAllParamsRequested, bool aColsRowsRequired, bool aIsNew, bool aNeedsComponentId, bool aNeedsOptions, bool aNeedsCols, bool aNeedsRows);
+private:
+	typedef set<string> CApiNamesUsed;
+	static CApiNamesUsed iInterfaceNamesUsed;
+	};
+
+#endif