ICU-5309 Add test case for ZWJ use in Devanagari.

X-SVN-Rev: 20986
This commit is contained in:
Eric Mader 2007-01-26 18:26:00 +00:00
parent 1eb0713f37
commit acc3a3e636
4 changed files with 212 additions and 106 deletions

View File

@ -1,21 +1,19 @@
Microsoft Visual Studio Solution File, Format Version 8.00
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gendata", "gendata.vcproj", "{DA322426-C37C-4909-A99D-16B05E7FA498}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Release = Release
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{DA322426-C37C-4909-A99D-16B05E7FA498}.Debug.ActiveCfg = Debug|Win32
{DA322426-C37C-4909-A99D-16B05E7FA498}.Debug.Build.0 = Debug|Win32
{DA322426-C37C-4909-A99D-16B05E7FA498}.Release.ActiveCfg = Release|Win32
{DA322426-C37C-4909-A99D-16B05E7FA498}.Release.Build.0 = Release|Win32
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DA322426-C37C-4909-A99D-16B05E7FA498}.Debug|Win32.ActiveCfg = Debug|Win32
{DA322426-C37C-4909-A99D-16B05E7FA498}.Debug|Win32.Build.0 = Debug|Win32
{DA322426-C37C-4909-A99D-16B05E7FA498}.Release|Win32.ActiveCfg = Release|Win32
{DA322426-C37C-4909-A99D-16B05E7FA498}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View File

@ -1,135 +1,196 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Version="8.00"
Name="gendata"
SccProjectName=""
SccLocalPath="">
ProjectGUID="{DA322426-C37C-4909-A99D-16B05E7FA498}"
>
<Platforms>
<Platform
Name="Win32"/>
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Debug/gendata.tlb"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\include\layout;..\..\..\include;..\..\common;..\..\layout;..\..\tools\toolutil"
PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,LE_USE_CMEMORY"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE"
BasicRuntimeChecks="3"
RuntimeLibrary="5"
TreatWChar_tAsBuiltInType="TRUE"
UsePrecompiledHeader="2"
RuntimeLibrary="1"
TreatWChar_tAsBuiltInType="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Debug/gendata.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
SuppressStartupBanner="true"
DebugInformationFormat="4"
CompileAs="0"/>
CompileAs="0"
/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="..\..\..\lib\iculed.lib ..\..\..\lib\icuucd.lib ..\..\..\lib\icutud.lib odbc32.lib odbccp32.lib"
OutputFile=".\Debug/gendata.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug/gendata.pdb"
SubSystem="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Debug/gendata.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"/>
Culture="1033"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"/>
Name="VCLinkerTool"
AdditionalDependencies="..\..\..\lib\iculed.lib ..\..\..\lib\icuucd.lib ..\..\..\lib\icutud.lib odbc32.lib odbccp32.lib"
OutputFile=".\Debug/gendata.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/gendata.pdb"
SubSystem="1"
/>
<Tool
Name="VCWebDeploymentTool"/>
Name="VCALinkTool"
/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
Name="VCManifestTool"
/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Release/gendata.tlb"
/>
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\include\layout;..\..\..\include;..\..\common;..\..\layout;..\..\tools\toolutil"
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,LE_USE_CMEMORY"
StringPooling="TRUE"
RuntimeLibrary="4"
EnableFunctionLevelLinking="TRUE"
TreatWChar_tAsBuiltInType="TRUE"
UsePrecompiledHeader="2"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
TreatWChar_tAsBuiltInType="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Release/gendata.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
SuppressStartupBanner="true"
CompileAs="0"
/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="..\..\..\lib\icule.lib ..\..\..\lib\icuuc.lib ..\..\..\lib\icutu.lib odbc32.lib odbccp32.lib"
OutputFile=".\Release/gendata.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\Release/gendata.pdb"
SubSystem="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Release/gendata.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"/>
Culture="1033"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"/>
Name="VCLinkerTool"
AdditionalDependencies="..\..\..\lib\icule.lib ..\..\..\lib\icuuc.lib ..\..\..\lib\icutu.lib odbc32.lib odbccp32.lib"
OutputFile=".\Release/gendata.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\Release/gendata.pdb"
SubSystem="1"
/>
<Tool
Name="VCWebDeploymentTool"/>
Name="VCALinkTool"
/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
Name="VCManifestTool"
/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
@ -137,54 +198,70 @@
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
RelativePath=".\cmaps.cpp">
RelativePath=".\cmaps.cpp"
>
</File>
<File
RelativePath=".\FontTableCache.cpp">
RelativePath=".\FontTableCache.cpp"
>
</File>
<File
RelativePath=".\gendata.cpp">
RelativePath=".\gendata.cpp"
>
</File>
<File
RelativePath=".\letsutil.cpp">
RelativePath=".\letsutil.cpp"
>
</File>
<File
RelativePath=".\PortableFontInstance.cpp">
RelativePath=".\PortableFontInstance.cpp"
>
</File>
<File
RelativePath=".\SimpleFontInstance.cpp">
RelativePath=".\SimpleFontInstance.cpp"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl">
Filter="h;hpp;hxx;hm;inl"
>
<File
RelativePath=".\cmaps.h">
RelativePath=".\cmaps.h"
>
</File>
<File
RelativePath=".\FontTableCache.h">
RelativePath=".\FontTableCache.h"
>
</File>
<File
RelativePath=".\letest.h">
RelativePath=".\letest.h"
>
</File>
<File
RelativePath=".\letsutil.h">
RelativePath=".\letsutil.h"
>
</File>
<File
RelativePath=".\PortableFontInstance.h">
RelativePath=".\PortableFontInstance.h"
>
</File>
<File
RelativePath=".\sfnt.h">
RelativePath=".\sfnt.h"
>
</File>
<File
RelativePath=".\SimpleFontInstance.h">
RelativePath=".\SimpleFontInstance.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
>
</Filter>
</Files>
<Globals>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 1999-2006 International Business Machines
Copyright (c) 1999-2007 International Business Machines
Corporation and others. All rights reserved.
-->
@ -74,4 +74,9 @@
<test-font name="TestFont1.otf"/>
<test-text>शङ़ु</test-text>
</test-case>
<test-case id="Deva ZWJ" script="deva">
<test-font name="raghu.ttf"/>
<test-text>क्ष र्क क्‍ष र्‍क</test-text>
</test-case>
</layout-tests>

View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 1999-2006 International Business Machines
Copyright (c) 1999-2007 International Business Machines
Corporation and others. All rights reserved.
WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT
UNLESS YOU REALLY KNOW WHAT YOU'RE DOING.
file name: letest.xml
generated on: 07/27/2006 04:42:26 PM Hawaiian Standard Time
generated on: 01/26/2007 08:20:06 AM Hawaiian Standard Time
generated by: gendata.cpp
-->
@ -1045,4 +1045,30 @@
</result-positions>
</test-case>
<test-case id="Deva ZWJ" script="deva">
<test-font name="raghu.ttf" version="Version 0.99" checksum="0x541C94C7"/>
<test-text>क्ष र्क क्‍ष र्‍क</test-text>
<result-glyphs>
0x000000A2, 0x0000FFFF, 0x0000FFFF, 0x00000003, 0x00000080, 0x0000005B, 0x0000FFFF, 0x00000003,
0x000000C8, 0x0000FFFF, 0x00000001, 0x0000009F, 0x00000003, 0x000000E2, 0x0000FFFF, 0x00000001,
0x00000080
</result-glyphs>
<result-indices>
0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000006, 0x00000004, 0x00000005, 0x00000007,
0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E, 0x0000000F,
0x00000010
</result-indices>
<result-positions>
0.000000, 0.000000, 10.875000, 0.000000, 10.875000, 0.000000, 10.875000, 0.000000,
16.875000, 0.000000, 24.779297, 0.263672, 27.750000, 0.000000, 27.750000, 0.000000,
33.750000, 0.000000, 42.468750, 0.000000, 42.468750, 0.000000, 42.468750, 0.000000,
50.437500, 0.000000, 56.437500, 0.000000, 60.187500, 0.000000, 60.187500, 0.000000,
60.187500, 0.000000, 71.062500, 0.000000
</result-positions>
</test-case>
</layout-tests>