Merge branch 'harfbuzz-ng-external'

Conflicts:
	configure.in
	docs/tmpl/text-attributes.sgml
	modules/arabic/arabic-ot.c
	modules/indic/indic-ot.c
	pango/opentype/Makefile.am
	pango/opentype/hb-blob.c
	pango/opentype/hb-buffer-private.h
	pango/opentype/hb-common.h
	pango/opentype/hb-ot-layout-gsubgpos-private.hh
	pango/opentype/hb-private.h
	pango/pango-ot-info.c

diff --cc build/win32/vs10/pangoft2.vcxproj.filtersin
index 444ae58,0000000..bd1b8d6
mode 100644,000000..100644
--- 1/build/win32/vs10/pangoft2.vcxproj.filtersin
--- /dev/null
+++ b/build/win32/vs10/pangoft2.vcxproj.filtersin
@@@ -1,41 -1,0 +1,40 @@@
- #include "opentype/libharfbuzz.vs10.sourcefiles.filters"
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup>
 +    <Filter Include="Header Files">
 +      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
 +      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
 +    </Filter>
 +    <Filter Include="Resource Files">
 +      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
 +      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
 +    </Filter>
 +    <Filter Include="Source Files">
 +      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
 +      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
 +    </Filter>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ResourceCompile Include="..\..\..\pango\pangoft2.rc"><Filter>Resource Files</Filter></ResourceCompile>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClCompile Include="..\..\..\modules\arabic\arabic-fc.c"><Filter>Source Files</Filter></ClCompile>
 +    <ClCompile Include="..\..\..\modules\arabic\arabic-ot.c"><Filter>Source Files</Filter></ClCompile>
 +    <ClCompile Include="..\..\..\modules\basic\basic-fc.c"><Filter>Source Files</Filter></ClCompile>
 +    <ClCompile Include="..\..\..\modules\hangul\hangul-fc.c"><Filter>Source Files</Filter></ClCompile>
 +    <ClCompile Include="..\..\..\modules\hebrew\hebrew-fc.c"><Filter>Source Files</Filter></ClCompile>
 +    <ClCompile Include="..\..\..\modules\hebrew\hebrew-shaper.c"><Filter>Source Files</Filter></ClCompile>
 +    <ClCompile Include="..\..\..\modules\indic\indic-fc.c"><Filter>Source Files</Filter></ClCompile>
 +    <ClCompile Include="..\..\..\modules\indic\indic-ot-class-tables.c"><Filter>Source Files</Filter></ClCompile>
 +    <ClCompile Include="..\..\..\modules\indic\indic-ot.c"><Filter>Source Files</Filter></ClCompile>
 +    <ClCompile Include="..\..\..\modules\indic\mprefixups.c"><Filter>Source Files</Filter></ClCompile>
 +    <ClCompile Include="..\..\..\modules\khmer\khmer-fc.c"><Filter>Source Files</Filter></ClCompile>
 +    <ClCompile Include="..\..\..\modules\syriac\syriac-fc.c"><Filter>Source Files</Filter></ClCompile>
 +    <ClCompile Include="..\..\..\modules\syriac\syriac-ot.c"><Filter>Source Files</Filter></ClCompile>
 +    <ClCompile Include="..\..\..\modules\thai\thai-charprop.c"><Filter>Source Files</Filter></ClCompile>
 +    <ClCompile Include="..\..\..\modules\thai\thai-fc.c"><Filter>Source Files</Filter></ClCompile>
 +    <ClCompile Include="..\..\..\modules\thai\thai-shaper.c"><Filter>Source Files</Filter></ClCompile>
 +    <ClCompile Include="..\..\..\modules\tibetan\tibetan-fc.c"><Filter>Source Files</Filter></ClCompile>
 +#include "libpangoft2.vs10.sourcefiles.filters"
 +  </ItemGroup>
 +</Project>

diff --cc build/win32/vs10/pangoft2.vcxprojin
index 3d7c73c,0000000..320c9bb
mode 100644,000000..100644
--- 1/build/win32/vs10/pangoft2.vcxprojin
--- /dev/null
+++ b/build/win32/vs10/pangoft2.vcxprojin
@@@ -1,238 -1,0 +1,237 @@@
- #include "opentype/libharfbuzz.vs10.sourcefiles"
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug_FC|Win32">
 +      <Configuration>Debug_FC</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug_FC|x64">
 +      <Configuration>Debug_FC</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release_FC|Win32">
 +      <Configuration>Release_FC</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release_FC|x64">
 +      <Configuration>Release_FC</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}</ProjectGuid>
 +    <RootNamespace>pangoft2</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="pango.props" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="pango.props" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="pango.props" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="pango.props" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">true</LinkIncremental>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">true</LinkIncremental>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">true</LinkIncremental>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">true</LinkIncremental>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_DEBUG;$(PangoDefines);HAVE_GLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <AdditionalDependencies>fontconfig.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile>
 +      <ModuleDefinitionFile>..\..\..\pango\pangoft2.def</ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">
 +    <ClCompile>
 +      <AdditionalIncludeDirectories>..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>$(PangoDefines);HAVE_GLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <AdditionalDependencies>fontconfig.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile>
 +      <ModuleDefinitionFile>..\..\..\pango\pangoft2.def</ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_DEBUG;$(PangoDefines);HAVE_GLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <AdditionalDependencies>fontconfig.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile>
 +      <ModuleDefinitionFile>..\..\..\pango\pangoft2.def</ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">
 +    <ClCompile>
 +      <AdditionalIncludeDirectories>..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>$(PangoDefines);HAVE_GLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <AdditionalDependencies>fontconfig.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile>
 +      <ModuleDefinitionFile>..\..\..\pango\pangoft2.def</ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ResourceCompile Include="..\..\..\pango\pangoft2.rc" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClCompile Include="..\..\..\modules\arabic\arabic-fc.c">
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">PANGO_MODULE_PREFIX=_pango_arabic_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">PANGO_MODULE_PREFIX=_pango_arabic_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">PANGO_MODULE_PREFIX=_pango_arabic_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">PANGO_MODULE_PREFIX=_pango_arabic_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\modules\arabic\arabic-ot.c" />
 +    <ClCompile Include="..\..\..\modules\basic\basic-fc.c">
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">PANGO_MODULE_PREFIX=_pango_basic_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">PANGO_MODULE_PREFIX=_pango_basic_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">PANGO_MODULE_PREFIX=_pango_basic_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">PANGO_MODULE_PREFIX=_pango_basic_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\modules\hangul\hangul-fc.c">
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">PANGO_MODULE_PREFIX=_pango_hangul_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">PANGO_MODULE_PREFIX=_pango_hangul_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">PANGO_MODULE_PREFIX=_pango_hangul_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">PANGO_MODULE_PREFIX=_pango_hangul_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\modules\hebrew\hebrew-fc.c">
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">PANGO_MODULE_PREFIX=_pango_hebrew_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">PANGO_MODULE_PREFIX=_pango_hebrew_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">PANGO_MODULE_PREFIX=_pango_hebrew_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">PANGO_MODULE_PREFIX=_pango_hebrew_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\modules\hebrew\hebrew-shaper.c" />
 +    <ClCompile Include="..\..\..\modules\indic\indic-fc.c">
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">PANGO_MODULE_PREFIX=_pango_indic_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">PANGO_MODULE_PREFIX=_pango_indic_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">PANGO_MODULE_PREFIX=_pango_indic_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">PANGO_MODULE_PREFIX=_pango_indic_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\modules\indic\indic-ot-class-tables.c" />
 +    <ClCompile Include="..\..\..\modules\indic\indic-ot.c" />
 +    <ClCompile Include="..\..\..\modules\indic\mprefixups.c" />
 +    <ClCompile Include="..\..\..\modules\khmer\khmer-fc.c">
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">PANGO_MODULE_PREFIX=_pango_khmer_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">PANGO_MODULE_PREFIX=_pango_khmer_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">PANGO_MODULE_PREFIX=_pango_khmer_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">PANGO_MODULE_PREFIX=_pango_khmer_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\modules\syriac\syriac-fc.c">
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">PANGO_MODULE_PREFIX=_pango_syriac_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">PANGO_MODULE_PREFIX=_pango_syriac_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">PANGO_MODULE_PREFIX=_pango_syriac_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">PANGO_MODULE_PREFIX=_pango_syriac_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\modules\syriac\syriac-ot.c" />
 +    <ClCompile Include="..\..\..\modules\thai\thai-charprop.c" />
 +    <ClCompile Include="..\..\..\modules\thai\thai-fc.c">
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">PANGO_MODULE_PREFIX=_pango_thai_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">PANGO_MODULE_PREFIX=_pango_thai_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">PANGO_MODULE_PREFIX=_pango_thai_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">PANGO_MODULE_PREFIX=_pango_thai_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\modules\thai\thai-shaper.c" />
 +    <ClCompile Include="..\..\..\modules\tibetan\tibetan-fc.c">
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">PANGO_MODULE_PREFIX=_pango_tibetan_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">PANGO_MODULE_PREFIX=_pango_tibetan_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">PANGO_MODULE_PREFIX=_pango_tibetan_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">PANGO_MODULE_PREFIX=_pango_tibetan_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +    </ClCompile>
 +#include "libpangoft2.vs10.sourcefiles"
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="pango.vcxproj">
 +      <Project>{68cc80b9-7225-4fb5-b9ab-9c1df50b6c72}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>

diff --cc build/win32/vs9/pangoft2.vcprojin
index 151c203,12beb15..9bfa2c2
--- 1/build/win32/vs9/pangoft2.vcprojin
--- 2/build/win32/vs9/pangoft2.vcprojin
+++ b/build/win32/vs9/pangoft2.vcprojin
@@@ -230,7 -230,7 +230,6 @@@
                                <FileConfiguration Name="Debug_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc" /></FileConfiguration>
                                <FileConfiguration Name="Release_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc" /></FileConfiguration>
                        </File>
--#include "opentype/libharfbuzz.sourcefiles"
  #include "libpangoft2.sourcefiles"
                </Filter>
        </Files>

diff --cc configure.in
Simple merge

diff --cc docs/tmpl/atsui-fonts.sgml
index c8b6aa0,7f3c9dd..f19081b
--- 1/docs/tmpl/atsui-fonts.sgml
--- 2/docs/tmpl/atsui-fonts.sgml
+++ b/docs/tmpl/atsui-fonts.sgml
@@@ -21,29 -21,3 +21,28 @@@ MacOS systems using the ATSUI text rend
  <!-- ##### SECTION Image ##### -->
  
  
- A string constant identifying the ATSUI renderer. The associated quark (see
- g_quark_from_string()) is used to identify the renderer in pango_find_map().
 +<!-- ##### MACRO PANGO_RENDER_TYPE_ATSUI ##### -->
 +<para>
++
 +</para>
 +
 +
 +
 +<!-- ##### FUNCTION pango_atsui_font_get_cgfont ##### -->
 +<para>
 +
 +</para>
 +
 +@font: 
 +@Returns: 
 +
 +
 +<!-- ##### FUNCTION pango_atsui_font_get_atsfont ##### -->
 +<para>
 +
 +</para>
 +
 +@font: 
 +@Returns: 
 +
 +

diff --cc docs/tmpl/fonts.sgml
index 7b55dea,16ca84f..d4ce316
--- 1/docs/tmpl/fonts.sgml
--- 2/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@@ -442,24 -442,6 +442,15 @@@ the documentation of the corresponding 
  of their meaning.
  </para>
  
- @ref_count: reference count.  Used internally.  See pango_font_metrics_ref()
-             and pango_font_metrics_unref().
- @ascent: the distance from the baseline to the highest point of the glyphs of
-        the font. This is positive in practically all fonts.
- @descent: the distance from the baseline to the lowest point of the glyphs of
-        the font. This is positive in practically all fonts.
- @approximate_char_width: approximate average width of the regular glyphs of
-          the font.  Note that for this calculation, East Asian characters
-        (those passing g_unichar_iswide()) are counted as double-width.
-        This produces a more uniform value for this measure across languages
-        and results in more uniform and more expected UI sizes.
- @approximate_digit_width: approximate average width of the glyphs for digits
-          of the font.
- @underline_position: position of the underline. This is normally negative.
- @underline_thickness: thickness of the underline.
- @strikethrough_position: position of the strikethrough line. This is
-        normally positive.
- @strikethrough_thickness: thickness of the strikethrough line.
++@ref_count: 
++@ascent: 
++@descent: 
++@approximate_char_width: 
++@approximate_digit_width: 
++@underline_position: 
++@underline_thickness: 
++@strikethrough_position: 
++@strikethrough_thickness: 
  
  <!-- ##### MACRO PANGO_TYPE_FONT_METRICS ##### -->
  <para>
@@@ -984,7 -966,7 +975,7 @@@ a particular #PangoFontset implementati
  
  @fontset: 
  @font: 
--@data: 
++@user_data: 
  @Returns: 
  
  

diff --cc docs/tmpl/glyphs.sgml
index 399319e,926bf53..5d4be35
--- 1/docs/tmpl/glyphs.sgml
--- 2/docs/tmpl/glyphs.sgml
+++ b/docs/tmpl/glyphs.sgml
@@@ -395,11 -389,6 +395,9 @@@ The storage for the glyph information i
  by the structure which simplifies memory management.
  </para>
  
- @num_glyphs: the number of glyphs in the string.
- @glyphs: an array of #PangoGlyphInfo structures of length <structfield>num_glyphs</structfield>.
- @log_clusters: for each glyph, byte index of the starting character for the
- cluster. The indices are relative to the start of the text
- corresponding to the PangoGlyphString.
++@num_glyphs: 
++@glyphs: 
++@log_clusters: 
  
  <!-- ##### STRUCT PangoGlyphItem ##### -->
  <para>
@@@ -410,10 -399,6 +408,8 @@@ of shaping text with #PangoLayout is a 
  each of which contains a list of #PangoGlyphItem.
  </para>
  
- @item: a #PangoItem structure that provides information
-        about a segment of text.
- @glyphs: the glyphs obtained by shaping the text
-          corresponding to @item.
++@item: 
++@glyphs: 
  
  <!-- ##### STRUCT PangoGlyphItemIter ##### -->
  <para>
@@@ -457,14 -442,6 +453,14 @@@ None of the members of a #PangoGlyphIte
  
  </para>
  
- @glyph_item: the #PangoGlyphItem this iterator iterates over
- @text: the UTF-8 text that @glyph_item refers to
- @start_glyph: starting glyph of the cluster
- @start_index: starting text index of the cluster
- @start_char: starting number of characters of the cluster
- @end_glyph: ending glyph of the cluster
- @end_index: ending text index of the cluster
- @end_char: ending number of characters of the cluster
++@glyph_item: 
++@text: 
++@start_glyph: 
++@start_index: 
++@start_char: 
++@end_glyph: 
++@end_index: 
++@end_char: 
  @Since: 1.22
  
  <!-- ##### MACRO PANGO_TYPE_GLYPH_STRING ##### -->

diff --cc docs/tmpl/layout.sgml
index 4be6a59,997507d..a3f22a0
--- 1/docs/tmpl/layout.sgml
--- 2/docs/tmpl/layout.sgml
+++ b/docs/tmpl/layout.sgml
@@@ -845,12 -845,6 +845,12 @@@ Routines for rendering PangoLayout obje
  code specific to each rendering system.
  </para>
  
- @layout: the parent layout for this line
- @start_index: the start of the line as byte index into @layout->text
- @length: the length of the line in bytes
- @runs: a list containing the runs of the line in visual order
- @is_paragraph_start: %TRUE if this is the first line of the paragraph
- @resolved_dir: the resolved #PangoDirection of the line
++@layout: 
++@start_index: 
++@length: 
++@runs: 
++@is_paragraph_start: 
++@resolved_dir: 
  
  <!-- ##### TYPEDEF PangoLayoutRun ##### -->
  <para>

diff --cc docs/tmpl/main.sgml
index 8373b12,112baaa..f3759ce
--- 1/docs/tmpl/main.sgml
--- 2/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@@ -36,11 -36,6 +36,10 @@@ The #PangoItem structure stores informa
  a segment of text. It contains the following fields:
  </para>
  
- @offset: the offset of the segment from the beginning of the
-          string in bytes.
- @length: the length of the segment in bytes.
- @num_chars: the length of the segment in characters.
- @analysis: the properties of the segment.
++@offset: 
++@length: 
++@num_chars: 
++@analysis: 
  
  <!-- ##### STRUCT PangoAnalysis ##### -->
  <para>

diff --cc docs/tmpl/text-attributes.sgml
index d12c041,d7b5cb5..edcd3ec
--- 1/docs/tmpl/text-attributes.sgml
--- 2/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@@ -465,8 -465,8 +465,10 @@@ A copy function passed to attribute ne
  user data.
  </para>
  
--@data: the user data
++@user_data: 
  @Returns: a new copy of @data.
++<!-- # Unused Parameters # -->
++@data: the user data
  
  
  <!-- ##### FUNCTION pango_attr_scale_new ##### -->
@@@ -578,10 -578,6 +580,9 @@@ The #PangoColor structure is used t
  represent a color in an uncalibrated RGB color-space.
  </para>
  
- @red: the red component of the color. This is a value between 0 and
-     65535, with 65535 indicating full intensity
- @green: the green component of the color
- @blue: the blue component of the color
++@red: 
++@green: 
++@blue: 
  
  <!-- ##### MACRO PANGO_TYPE_COLOR ##### -->
  <para>
@@@ -740,8 -736,8 +741,10 @@@ to filter out a subset of attributes fo
  </para>
  
  @attribute: a #PangoAttribute
--@data: callback data passed to pango_attr_list_filter()
++@user_data: 
  @Returns: %TRUE if the attribute should be filtered out
++<!-- # Unused Parameters # -->
++@data: callback data passed to pango_attr_list_filter()
  
  
  <!-- ##### FUNCTION pango_attr_list_get_iterator ##### -->

diff --cc pango/Makefile.am
index d653781,9883534..c08b5cc
--- 1/pango/Makefile.am
--- 2/pango/Makefile.am
+++ b/pango/Makefile.am
@@@ -143,7 -135,7 +136,7 @@@ s-enum-types-h: $(pango_headers) Makefi
                        --ftail "G_END_DECLS\n\n#endif /* __PANGO_ENUM_TYPES_H__ */" \
                $(pango_headers) ) > tmp-pango-enum-types.h \
        && (cmp -s tmp-pango-enum-types.h pango-enum-types.h || cp tmp-pango-enum-types.h pango-enum-types.h ) \
--      && rm -f tmp-pango-enum-types.h \
++      && $(RM) tmp-pango-enum-types.h \
        && echo timestamp > $(@F)
  
  pango-enum-types.c: s-enum-types-c
@@@ -156,7 -148,7 +149,7 @@@ s-enum-types-c: $(pango_headers) Makefi
                        --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n  }\n  return etype;\n}\n" \
                $(pango_headers) ) > tmp-pango-enum-types.c \
        && (cmp -s tmp-pango-enum-types.c pango-enum-types.c || cp tmp-pango-enum-types.c pango-enum-types.c ) \
--      && rm -f tmp-pango-enum-types.c \
++      && $(RM) tmp-pango-enum-types.c \
        && echo timestamp > $(@F)
  
  pango-features.h:
@@@ -496,15 -482,15 +488,15 @@@ if HAVE_
        $(INSTALL) $(srcdir)/pangoxft.def $(DESTDIR)$(libdir)/pangoxft-$(PANGO_API_VERSION).def
  endif
  uninstall-def-files:
--      -rm $(DESTDIR)$(libdir)/pango$(PANGO_API_VERSION).def
++      -$(RM) $(DESTDIR)$(libdir)/pango$(PANGO_API_VERSION).def
  if HAVE_FREETYPE
--      -rm $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).def
++      -$(RM) $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).def
  endif
--      -rm $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).def
--      -rm $(DESTDIR)$(libdir)/pangocairo-$(PANGO_API_VERSION).def
++      -$(RM) $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).def
++      -$(RM) $(DESTDIR)$(libdir)/pangocairo-$(PANGO_API_VERSION).def
  if HAVE_X
--      -rm $(DESTDIR)$(libdir)/pangox-$(PANGO_API_VERSION).def
--      -rm $(DESTDIR)$(libdir)/pangoxft-$(PANGO_API_VERSION).def
++      -$(RM) $(DESTDIR)$(libdir)/pangox-$(PANGO_API_VERSION).def
++      -$(RM) $(DESTDIR)$(libdir)/pangoxft-$(PANGO_API_VERSION).def
  endif
  else
  install-def-files:
@@@ -530,10 -516,10 +522,10 @@@ endi
        $(INSTALL) pangocairo-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir)
  
  uninstall-ms-lib:
--      -rm $(DESTDIR)$(libdir)/pango-$(PANGO_API_VERSION).lib
--      -rm $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).lib
--      -rm $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).lib
--      -rm $(DESTDIR)$(libdir)/pangocairo-$(PANGO_API_VERSION).lib
++      -$(RM) $(DESTDIR)$(libdir)/pango-$(PANGO_API_VERSION).lib
++      -$(RM) $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).lib
++      -$(RM) $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).lib
++      -$(RM) $(DESTDIR)$(libdir)/pangocairo-$(PANGO_API_VERSION).lib
  else
  install-ms-lib:
  uninstall-ms-lib:
@@@ -671,20 -657,12 +663,20 @@@ TESTS = check.def
  dist-hook: \
        ../build/win32/vs9/pango.vcproj \
        ../build/win32/vs9/pangoft2.vcproj \
 -      ../build/win32/vs9/pangocairo.vcproj
 -
 -# pangowin32.vcproj is not automatically built, it is not being changed
 +      ../build/win32/vs9/pangocairo.vcproj \
 +      ../build/win32/vs10/pango.vcxproj \
 +      ../build/win32/vs10/pango.vcxproj.filters \
 +      ../build/win32/vs10/pangocairo.vcxproj \
 +      ../build/win32/vs10/pangocairo.vcxproj.filters \
 +      ../build/win32/vs10/pangocairo_fc.vcxproj \
 +      ../build/win32/vs10/pangocairo_fc.vcxproj.filters \
 +      ../build/win32/vs10/pangoft2.vcxproj \
 +      ../build/win32/vs10/pangoft2.vcxproj.filters
 +
 +# pangowin32.vcproj, pangowin32.vcxproj and pangowin32.vcxproj.filters are not automatically built, it is not being changed
  
  ../build/win32/vs9/pango.vcproj: $(top_srcdir)/build/win32/vs9/pango.vcprojin mini-fribidi/libmini-fribidi.sourcefiles
--      -rm $@
++      -$(RM) $@
        for F in $(libpango_1_0_la_SOURCES); do \
                case $$F in \
                *.c) echo '   <File RelativePath="..\..\..\pango\'$$F'" />' \
@@@ -693,28 -671,8 +685,28 @@@
        done >libpango.sourcefiles
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/pango.vcprojin >$@
  
 -../build/win32/vs9/pangoft2.vcproj: $(top_srcdir)/build/win32/vs9/pangoft2.vcprojin opentype/libharfbuzz.sourcefiles
 -      -rm $@
 +../build/win32/vs10/pango.vcxproj: $(top_srcdir)/build/win32/vs10/pango.vcxprojin mini-fribidi/libmini-fribidi.vs10.sourcefiles
-       -rm $@
++      -$(RM) $@
 +      for F in $(libpango_1_0_la_SOURCES); do \
 +              case $$F in \
 +              *.c) echo '   <ClCompile Include="..\..\..\pango\'$$F'" />' \
 +                   ;; \
 +              esac; \
 +      done >libpango.vs10.sourcefiles
 +      $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pango.vcxprojin >$@
 +
 +../build/win32/vs10/pango.vcxproj.filters: $(top_srcdir)/build/win32/vs10/pango.vcxproj.filtersin mini-fribidi/libmini-fribidi.vs10.sourcefiles.filters
-       -rm $@
++      -$(RM) $@
 +      for F in $(libpango_1_0_la_SOURCES); do \
 +              case $$F in \
 +              *.c) echo '   <ClCompile Include="..\..\..\pango\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
 +                   ;; \
 +              esac; \
 +      done >libpango.vs10.sourcefiles.filters
 +      $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pango.vcxproj.filtersin >$@
 +
- ../build/win32/vs9/pangoft2.vcproj: $(top_srcdir)/build/win32/vs9/pangoft2.vcprojin opentype/libharfbuzz.sourcefiles
-       -rm $@
++../build/win32/vs9/pangoft2.vcproj: $(top_srcdir)/build/win32/vs9/pangoft2.vcprojin
++      -$(RM) $@
        for F in $(libpangoft2_1_0_la_SOURCES); do \
                case $$F in \
                *.c) echo '   <File RelativePath="..\..\..\pango\'$$F'" />' \
@@@ -723,30 -681,10 +715,30 @@@
        done >libpangoft2.sourcefiles
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/pangoft2.vcprojin >$@
  
- ../build/win32/vs10/pangoft2.vcxproj: $(top_srcdir)/build/win32/vs10/pangoft2.vcxprojin opentype/libharfbuzz.vs10.sourcefiles
-       -rm $@
++../build/win32/vs10/pangoft2.vcxproj: $(top_srcdir)/build/win32/vs10/pangoft2.vcxprojin
++      -$(RM) $@
 +      for F in $(libpangoft2_1_0_la_SOURCES); do \
 +              case $$F in \
 +              *.c) echo '   <ClCompile Include="..\..\..\pango\'$$F'" />' \
 +                   ;; \
 +              esac; \
 +      done >libpangoft2.vs10.sourcefiles
 +      $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pangoft2.vcxprojin >$@
 +
- ../build/win32/vs10/pangoft2.vcxproj.filters: $(top_srcdir)/build/win32/vs10/pangoft2.vcxproj.filtersin opentype/libharfbuzz.vs10.sourcefiles.filters
-       -rm $@
++../build/win32/vs10/pangoft2.vcxproj.filters: $(top_srcdir)/build/win32/vs10/pangoft2.vcxproj.filtersin
++      -$(RM) $@
 +      for F in $(libpangoft2_1_0_la_SOURCES); do \
 +              case $$F in \
 +              *.c) echo '   <ClCompile Include="..\..\..\pango\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
 +                   ;; \
 +              esac; \
 +      done >libpangoft2.vs10.sourcefiles.filters
 +      $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pangoft2.vcxproj.filtersin >$@
 +
  ../build/win32/vs9/pangocairo.vcproj: $(top_srcdir)/build/win32/vs9/pangocairo.vcprojin
  # Backend-specific sources for the libpangocairo DLL are explicitly
  # listed in the vcprojin file
--      -rm $@
++      -$(RM) $@
        for F in $(pangocairo_core_sources); do \
                case $$F in \
                *.c) echo '   <File RelativePath="..\..\..\pango\'$$F'" />' \
@@@ -755,73 -693,4 +747,73 @@@
        done >libpangocairo.sourcefiles
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/pangocairo.vcprojin >$@
  
-       -rm $@
 +../build/win32/vs10/pangocairo.vcxproj: $(top_srcdir)/build/win32/vs10/pangocairo.vcxprojin
 +# Backend-specific sources for the libpangocairo DLL are explicitly
 +# listed in the vcxprojin file
 +# I know it does not sound nice to have 2 pangocairo projects/filters sets due to FontConfig usage (or not), but VS2010 forces me to do that...
-       -rm $@
++      -$(RM) $@
 +      for F in $(pangocairo_core_sources); do \
 +              case $$F in \
 +              *.c) echo '   <ClCompile Include="..\..\..\pango\'$$F'" />' \
 +                   ;; \
 +              esac; \
 +      done >libpangocairo.vs10.sourcefiles
 +      $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pangocairo.vcxprojin >$@
 +
 +../build/win32/vs10/pangocairo.vcxproj.filters: $(top_srcdir)/build/win32/vs10/pangocairo.vcxproj.filtersin
 +# Backend-specific sources for the libpangocairo DLL are explicitly
 +# listed in the vcxproj.filtersin file
-       -rm $@
++      -$(RM) $@
 +      for F in $(pangocairo_core_sources); do \
 +              case $$F in \
 +              *.c) echo '   <ClCompile Include="..\..\..\pango\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
 +                   ;; \
 +              esac; \
 +      done >libpangocairo.vs10.sourcefiles.filters
 +      $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pangocairo.vcxproj.filtersin >$@
 +
 +../build/win32/vs10/pangocairo_fc.vcxproj: $(top_srcdir)/build/win32/vs10/pangocairo_fc.vcxprojin
 +# Backend-specific sources for the libpangocairo DLL are explicitly
 +# listed in the vcxprojin file
-       -rm $@
++      -$(RM) $@
 +      for F in $(pangocairo_core_sources); do \
 +              case $$F in \
 +              *.c) echo '   <ClCompile Include="..\..\..\pango\'$$F'" />' \
 +                   ;; \
 +              esac; \
 +      done >libpangocairo.vs10.sourcefiles
 +      $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pangocairo_fc.vcxprojin >$@
 +
 +../build/win32/vs10/pangocairo_fc.vcxproj.filters: $(top_srcdir)/build/win32/vs10/pangocairo_fc.vcxproj.filtersin
 +# Backend-specific sources for the libpangocairo DLL are explicitly
 +# listed in the vcxproj.filtersin file
++      -$(RM) $@
 +      for F in $(pangocairo_core_sources); do \
 +              case $$F in \
 +              *.c) echo '   <ClCompile Include="..\..\..\pango\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
 +                   ;; \
 +              esac; \
 +      done >libpangocairo.vs10.sourcefiles.filters
 +      $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pangocairo_fc.vcxproj.filtersin >$@
 +
 +DISTCLEANFILES += \
 +      ../build/win32/vs9/pango.vcproj \
 +      ../build/win32/vs9/pangoft2.vcproj \
 +      ../build/win32/vs9/pangocairo.vcproj \
 +      ../build/win32/vs10/pango.vcxproj \
 +      ../build/win32/vs10/pango.vcxproj.filters \
 +      ../build/win32/vs10/pangocairo.vcxproj \
 +      ../build/win32/vs10/pangocairo.vcxproj.filters \
 +      ../build/win32/vs10/pangocairo_fc.vcxproj \
 +      ../build/win32/vs10/pangocairo_fc.vcxproj.filters \
 +      ../build/win32/vs10/pangoft2.vcxproj \
 +      ../build/win32/vs10/pangoft2.vcxproj.filters \
 +      libpangocairo.vs10.sourcefiles.filters \
 +      libpangocairo.vs10.sourcefiles \
 +      libpangoft2.vs10.sourcefiles.filters \
 +      libpangoft2.vs10.sourcefiles \
 +      libpango.vs10.sourcefiles \
 +      libpango.vs10.sourcefiles
 +      
 +
  -include $(top_srcdir)/git.mk

diff --cc pango/pango-ot-info.c
index e5d9c64,129431e..1f552c3
--- 1/pango/pango-ot-info.c
--- 2/pango/pango-ot-info.c
+++ b/pango/pango-ot-info.c
@@@ -25,14 -25,8 +25,12 @@@
  #include "pango-impl-utils.h"
  #include FT_TRUETYPE_TABLES_H
  
 +#if (!GLIB_CHECK_VERSION(2,29,15))
 +#define G_UNICODE_SPACING_MARK G_UNICODE_COMBINING_MARK
 +#endif
 +
  static void pango_ot_info_finalize   (GObject *object);
  
- static void synthesize_class_def (PangoOTInfo *info);
- 
  G_DEFINE_TYPE (PangoOTInfo, pango_ot_info, G_TYPE_OBJECT);
  
  static void