swcs/NetUnicodeInfo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented character decomposition mapping propertu parsing.

Browse Source
This commit is contained in:
GoldenCrystal
2014-11-07 01:05:40 +01:00
parent 3fe63595e7
commit 6af111f799
12 changed files with 191 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UnicodeCharacterInspector/CharacterInfoViewModel.cs
+12
View File
@@ -55,6 +55,8 @@ namespace UnicodeCharacterInspector
NotifyPropertyChanged("Category");
NotifyPropertyChanged("CanonicalCombiningClass");
NotifyPropertyChanged("BidirectionalClass");
NotifyPropertyChanged("DecompositionType");
NotifyPropertyChanged("DecompositionMapping");
NotifyPropertyChanged("NumericType");
NotifyPropertyChanged("NumericValue");
NotifyPropertyChanged("ContributoryProperties");
@@ -92,6 +94,16 @@ namespace UnicodeCharacterInspector
get { return character != null && characterData != null ? characterData.BidirectionalClass : null as BidirectionalClass?; }
}
public CompatibilityFormattingTag? DecompositionType
{
get { return character != null && characterData != null && characterData.DecompositionMapping != null ? characterData.DecompositionType : null as CompatibilityFormattingTag?; }
}
public string DecompositionMapping
{
get { return character != null && characterData != null ? characterData.DecompositionMapping : null; }
}
public UnicodeNumericType? NumericType
{
get { return character != null ? characterData != null ? characterData.NumericType : UnicodeNumericType.None : null as UnicodeNumericType?; }
UnicodeCharacterInspector/MainWindow.xaml
+12 -6
View File
@@ -67,6 +67,8 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Visibility="{Binding SelectedCharacterInfo.CodePoint, Converter={StaticResource NullToVisibilityConverter}}" Content="Code Point" />
@@ -81,12 +83,16 @@
<TextBlock Grid.Row="4" Grid.Column="1" Visibility="{Binding SelectedCharacterInfo.CanonicalCombiningClass, Converter={StaticResource NullToVisibilityConverter}}" Text="{Binding SelectedCharacterInfo.CanonicalCombiningClass}" />
<Label Grid.Row="5" Grid.Column="0" Visibility="{Binding SelectedCharacterInfo.BidirectionalClass, Converter={StaticResource NullToVisibilityConverter}}" Content="Bidirectional Class" />
<TextBlock Grid.Row="5" Grid.Column="1" Visibility="{Binding SelectedCharacterInfo.BidirectionalClass, Converter={StaticResource NullToVisibilityConverter}}" Text="{Binding SelectedCharacterInfo.BidirectionalClass}" />
<Label Grid.Row="6" Grid.Column="0" Visibility="{Binding SelectedCharacterInfo.NumericType, Converter={StaticResource NullToVisibilityConverter}}" Content="Numeric Type" />
<TextBlock Grid.Row="6" Grid.Column="1" Visibility="{Binding SelectedCharacterInfo.NumericType, Converter={StaticResource NullToVisibilityConverter}}" Text="{Binding SelectedCharacterInfo.NumericType}" />
<Label Grid.Row="7" Grid.Column="0" Visibility="{Binding SelectedCharacterInfo.NumericValue, Converter={StaticResource NullToVisibilityConverter}}" Content="Numeric Value" />
<TextBlock Grid.Row="7" Grid.Column="1" Visibility="{Binding SelectedCharacterInfo.NumericValue, Converter={StaticResource NullToVisibilityConverter}}" Text="{Binding SelectedCharacterInfo.NumericValue}" />
<Label Grid.Row="8" Grid.Column="0" Visibility="{Binding SelectedCharacterInfo.ContributoryProperties, Converter={StaticResource NullToVisibilityConverter}}" Content="Contributory Properties" />
<TextBlock Grid.Row="8" Grid.Column="1" Visibility="{Binding SelectedCharacterInfo.ContributoryProperties, Converter={StaticResource NullToVisibilityConverter}}" Text="{Binding SelectedCharacterInfo.ContributoryProperties}" />
<Label Grid.Row="6" Grid.Column="0" Visibility="{Binding SelectedCharacterInfo.DecompositionType, Converter={StaticResource NullToVisibilityConverter}}" Content="Decomposition Type" />
<TextBlock Grid.Row="6" Grid.Column="1" Visibility="{Binding SelectedCharacterInfo.DecompositionType, Converter={StaticResource NullToVisibilityConverter}}" Text="{Binding SelectedCharacterInfo.DecompositionType}" />
<Label Grid.Row="7" Grid.Column="0" Visibility="{Binding SelectedCharacterInfo.DecompositionMapping, Converter={StaticResource NullToVisibilityConverter}}" Content="Decomposition Mapping" />
<TextBlock Grid.Row="7" Grid.Column="1" Visibility="{Binding SelectedCharacterInfo.DecompositionMapping, Converter={StaticResource NullToVisibilityConverter}}" Text="{Binding SelectedCharacterInfo.DecompositionMapping}" />
<Label Grid.Row="8" Grid.Column="0" Visibility="{Binding SelectedCharacterInfo.NumericType, Converter={StaticResource NullToVisibilityConverter}}" Content="Numeric Type" />
<TextBlock Grid.Row="8" Grid.Column="1" Visibility="{Binding SelectedCharacterInfo.NumericType, Converter={StaticResource NullToVisibilityConverter}}" Text="{Binding SelectedCharacterInfo.NumericType}" />
<Label Grid.Row="9" Grid.Column="0" Visibility="{Binding SelectedCharacterInfo.NumericValue, Converter={StaticResource NullToVisibilityConverter}}" Content="Numeric Value" />
<TextBlock Grid.Row="9" Grid.Column="1" Visibility="{Binding SelectedCharacterInfo.NumericValue, Converter={StaticResource NullToVisibilityConverter}}" Text="{Binding SelectedCharacterInfo.NumericValue}" />
<Label Grid.Row="10" Grid.Column="0" Visibility="{Binding SelectedCharacterInfo.ContributoryProperties, Converter={StaticResource NullToVisibilityConverter}}" Content="Contributory Properties" />
<TextBlock Grid.Row="10" Grid.Column="1" Visibility="{Binding SelectedCharacterInfo.ContributoryProperties, Converter={StaticResource NullToVisibilityConverter}}" Text="{Binding SelectedCharacterInfo.ContributoryProperties}" />
</Grid>
</ScrollViewer>
</Grid>
UnicodeInformation.Builder/CharacterDecompositionMapping.cs
+94
View File
@@ -0,0 +1,94 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace System.Unicode.Builder
{
public struct CharacterDecompositionMapping
{
public readonly CompatibilityFormattingTag DecompositionType;
public readonly string DecompositionMapping;
public CharacterDecompositionMapping(CompatibilityFormattingTag decompositionType, string decompositionMapping)
{
this.DecompositionType = decompositionType;
this.DecompositionMapping = decompositionMapping;
}
public unsafe static CharacterDecompositionMapping Parse(string s)
{
if (string.IsNullOrEmpty(s)) return default(CharacterDecompositionMapping);
CompatibilityFormattingTag tag = CompatibilityFormattingTag.Canonical;
int index;
if (s[0] == '<')
{
if (!EnumHelper<CompatibilityFormattingTag>.TryGetNamedValue(s.Substring(1, (index = s.IndexOf('>')) - 1), out tag))
throw new FormatException();
++index;
}
else
{
index = 0;
}
var buffer = stackalloc char[36]; // From the Unicode docs, a decomposition cannot have more than 18 code points.
int charIndex = 0;
while (index < s.Length && charIndex < 35)
{
char c = s[index];
if (c == ' ') ++index;
else
{
int codePoint = ParseCodePoint(s, ref index);
if (codePoint < 0x10000)
buffer[charIndex++] = (char)codePoint;
else if (codePoint < 0x10FFFF)
{
codePoint -= 0x10000;
buffer[charIndex++] = (char)((codePoint >> 10) + 0xD800);
buffer[charIndex++] = (char)((codePoint & 0x3FF) + 0xDC00);
}
else
{
throw new FormatException("The code point was outside of the allowed range.");
}
}
}
return new CharacterDecompositionMapping(tag, new string(buffer, 0, charIndex));
}
private static int ParseCodePoint(string s, ref int index)
{
int i = index;
int accum = 0;
while (i < s.Length)
{
char c = s[i];
if (c == ' ') break;
accum <<= 4;
if (c >= '0' && c <= '9') accum |= c - '0';
else if (c >= 'A' && c <= 'F') accum |= c - 'A' + 0xA;
else if (c >= 'a' && c <= 'f') accum |= c - 'a' + 0xA;
else throw new FormatException();
++i;
}
index = i;
return accum;
}
}
}
UnicodeInformation.Builder/UnicodeCharacterDataBuilder.cs
+12 -7
View File
@@ -15,7 +15,7 @@ namespace System.Unicode.Builder
private UnicodeCategory category = UnicodeCategory.OtherNotAssigned;
private CanonicalCombiningClass canonicalCombiningClass;
private BidirectionalClass bidirectionalClass;
private string decompositionType;
private CharacterDecompositionMapping characterDecompositionMapping;
private UnicodeNumericType numericType;
private UnicodeRationalNumber numericValue;
private bool bidirectionalMirrored;
@@ -60,10 +60,10 @@ namespace System.Unicode.Builder
set { bidirectionalClass = value; }
}
public string DecompositionType
public CharacterDecompositionMapping CharacterDecompositionMapping
{
get { return decompositionType; }
set { decompositionType = value; }
get { return characterDecompositionMapping; }
set { characterDecompositionMapping = value; }
}
public UnicodeNumericType NumericType
@@ -136,7 +136,8 @@ namespace System.Unicode.Builder
category,
canonicalCombiningClass,
bidirectionalClass,
decompositionType,
characterDecompositionMapping.DecompositionType,
characterDecompositionMapping.DecompositionMapping,
numericType,
numericValue,
bidirectionalMirrored,
@@ -159,7 +160,7 @@ namespace System.Unicode.Builder
if (category != UnicodeCategory.OtherNotAssigned) fields |= UcdFields.Category;
if (canonicalCombiningClass != CanonicalCombiningClass.NotReordered) fields |= UcdFields.CanonicalCombiningClass;
/*if (bidirectionalClass != 0)*/fields |= UcdFields.BidirectionalClass;
if (decompositionType != null) fields |= UcdFields.DecompositionType;
if (characterDecompositionMapping.DecompositionMapping != null) fields |= UcdFields.DecompositionMapping;
fields |= (UcdFields)((int)numericType << 6);
if (bidirectionalMirrored) fields |= UcdFields.BidirectionalMirrored;
if (oldName != null) fields |= UcdFields.OldName;
@@ -177,7 +178,11 @@ namespace System.Unicode.Builder
if ((fields & UcdFields.Category) != 0) writer.Write((byte)category);
if ((fields & UcdFields.CanonicalCombiningClass) != 0) writer.Write((byte)canonicalCombiningClass);
if ((fields & UcdFields.BidirectionalClass) != 0) writer.Write((byte)bidirectionalClass);
if ((fields & UcdFields.DecompositionType) != 0) writer.Write(decompositionType);
if ((fields & UcdFields.DecompositionMapping) != 0)
{
writer.Write((byte)characterDecompositionMapping.DecompositionType);
writer.Write(characterDecompositionMapping.DecompositionMapping);
}
if ((fields & UcdFields.NumericNumeric) != 0)
{
writer.Write(numericValue.Numerator);
UnicodeInformation.Builder/UnicodeDataManager.cs
+1 -1
View File
@@ -89,7 +89,7 @@ namespace System.Unicode.Builder
throw new InvalidDataException(string.Format("Missing Bidi_Class property for code point(s) {0}.", codePoint));
}
characterData.DecompositionType = NullIfEmpty(reader.ReadField());
characterData.CharacterDecompositionMapping = CharacterDecompositionMapping.Parse(NullIfEmpty(reader.ReadField()));
string numericDecimalField = NullIfEmpty(reader.ReadField());
string numericDigitField = NullIfEmpty(reader.ReadField());
UnicodeInformation.Builder/UnicodeInformation.Builder.csproj
+3
View File
@@ -21,6 +21,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -30,6 +31,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
@@ -51,6 +53,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="BinaryWriterExtensions.cs" />
<Compile Include="CharacterDecompositionMapping.cs" />
<Compile Include="FileUcdSource.cs" />
<Compile Include="HttpUcdSource.cs" />
<Compile Include="IUcdSource.cs" />
UnicodeInformation/CompatibilityFormattingTag.cs
+46
View File
@@ -0,0 +1,46 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace System.Unicode
{
public enum CompatibilityFormattingTag : byte
{
Canonical = 0,
[ValueName("font"), Display(Name = "font", Description = "Font variant (for example, a blackletter form)")]
Font,
[ValueName("noBreak"), Display(Name = "noBreak", Description = "No-break version of a space or hyphen")]
NoBreak,
[ValueName("initial"), Display(Name = "initial", Description = "Initial presentation form (Arabic)")]
Initial,
[ValueName("medial"), Display(Name = "medial", Description = "Medial presentation form (Arabic)")]
Medial,
[ValueName("final"), Display(Name = "final", Description = "Final presentation form (Arabic)")]
Final,
[ValueName("isolated"), Display(Name = "isolated", Description = "Isolated presentation form (Arabic)")]
Isolated,
[ValueName("circle"), Display(Name = "circle", Description = "Encircled form")]
Circle,
[ValueName("super"), Display(Name = "super", Description = "Superscript form")]
Super,
[ValueName("sub"), Display(Name = "sub", Description = "Subscript form")]
Sub,
[ValueName("vertical"), Display(Name = "vertical", Description = "Vertical layout presentation form")]
Vertical,
[ValueName("wide"), Display(Name = "wide", Description = "Wide (or zenkaku) compatibility character")]
Wide,
[ValueName("narrow"), Display(Name = "narrow", Description = "Narrow (or hankaku) compatibility character")]
Narrow,
[ValueName("small"), Display(Name = "small", Description = "Small variant form (CNS compatibility)")]
Small,
[ValueName("square"), Display(Name = "square", Description = "CJK squared font variant")]
Square,
[ValueName("fraction"), Display(Name = "fraction", Description = "Vulgar fraction form")]
Fraction,
[ValueName("compat"), Display(Name = "compat", Description = "Otherwise unspecified compatibility character")]
Compat,
}
}
UnicodeInformation/UcdFields.cs
+1 -1
View File
@@ -18,7 +18,7 @@ namespace System.Unicode
Category = 4,
CanonicalCombiningClass = 8,
BidirectionalClass = 16,
DecompositionType = 32,
DecompositionMapping = 32,
// NumericType / NumericValue : Not exactly a bit mask here… More like [0…3] << 6
NumericDecimal = 64,
UnicodeInformation/UnicodeCharacterData.cs
+5 -2
View File
@@ -14,7 +14,8 @@ namespace System.Unicode
public readonly UnicodeCategory Category;
public readonly CanonicalCombiningClass CanonicalCombiningClass;
public readonly BidirectionalClass BidirectionalClass;
public readonly string DecompositionType;
public readonly CompatibilityFormattingTag DecompositionType;
public readonly string DecompositionMapping;
public readonly UnicodeNumericType NumericType;
private readonly UnicodeRationalNumber numericValue;
public readonly bool BidirectionalMirrored;
@@ -33,7 +34,8 @@ namespace System.Unicode
UnicodeCategory category,
CanonicalCombiningClass canonicalCombiningClass,
BidirectionalClass bidirectionalClass,
string decompositionType,
CompatibilityFormattingTag decompositionType,
string decompositionMapping,
UnicodeNumericType numericType,
UnicodeRationalNumber numericValue,
bool bidirectionalMirrored,
@@ -51,6 +53,7 @@ namespace System.Unicode
this.CanonicalCombiningClass = canonicalCombiningClass;
this.BidirectionalClass = bidirectionalClass;
this.DecompositionType = decompositionType;
this.DecompositionMapping = decompositionMapping;
this.NumericType = numericType;
this.numericValue = numericValue;
this.BidirectionalMirrored = bidirectionalMirrored;
UnicodeInformation/UnicodeData.cs
+3 -1
View File
@@ -64,7 +64,8 @@ namespace System.Unicode
var category = (fields & UcdFields.Category) != 0 ? (UnicodeCategory)reader.ReadByte() : UnicodeCategory.OtherNotAssigned;
var canonicalCombiningClass = (fields & UcdFields.CanonicalCombiningClass) != 0 ? (CanonicalCombiningClass)reader.ReadByte() : CanonicalCombiningClass.NotReordered;
var bidirectionalClass = (fields & UcdFields.BidirectionalClass) != 0 ? (BidirectionalClass)reader.ReadByte() : 0;
string decompositionType = (fields & UcdFields.DecompositionType) != 0 ? reader.ReadString() : null;
CompatibilityFormattingTag decompositionType = (fields & UcdFields.DecompositionMapping) != 0 ? (CompatibilityFormattingTag)reader.ReadByte() : CompatibilityFormattingTag.Canonical;
string decompositionMapping = (fields & UcdFields.DecompositionMapping) != 0 ? reader.ReadString() : null;
var numericType = (UnicodeNumericType)((int)(fields & UcdFields.NumericNumeric) >> 6);
UnicodeRationalNumber numericValue = numericType != UnicodeNumericType.None ?
new UnicodeRationalNumber(reader.ReadInt64(), reader.ReadByte()) :
@@ -83,6 +84,7 @@ namespace System.Unicode
canonicalCombiningClass,
bidirectionalClass,
decompositionType,
decompositionMapping,
numericType,
numericValue,
(fields & UcdFields.BidirectionalMirrored) != 0,
UnicodeInformation/UnicodeInformation.csproj
+2
View File
@@ -31,6 +31,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -56,6 +57,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="BidirectionalClass.cs" />
<Compile Include="CompatibilityFormattingTag.cs" />
<Compile Include="ContributoryProperties.cs" />
<Compile Include="CanonicalCombiningClass.cs" />
<Compile Include="CodePointEnumerable.cs" />
UnicodeInformation/ucd.dat
BIN
View File
Binary file not shown.