Fix zhs/zht table swap

simplified is the first set, not the second
Closes #4254
This commit is contained in:
Kurt 2024-04-26 01:27:53 -05:00
parent 9788f007a3
commit 4e56a2b756

View File

@ -69,22 +69,22 @@ internal static void RemapChineseGlyphsBin2String(Span<char> input)
private const ushort Start = 0xE800;
// S/M
private const ushort StartTraditional = 0xE800;
private const ushort EndTraditional = 0xEB0E; // 0xE800-0xEB0E
private const ushort StartSimplified = 0xEB0F;
private const ushort EndSimplified = 0xEE1D; // 0xEB0F-0xEE1D
private const ushort StartSimplified = 0xE800;
private const ushort EndSimplified = 0xEB0E; // 0xE800-0xEB0E
private const ushort StartTraditional = 0xEB0F;
private const ushort EndTraditional = 0xEE1D; // 0xEB0F-0xEE1D
// US/UM: A few more characters at the end.
private const ushort StartTraditionalUSUM = 0xEE1E;
private const ushort EndTraditionalUSUM = 0xEE21; // 0xEE1E-0xEE21
private const ushort StartSimplifiedUSUM = 0xEE22;
private const ushort EndSimplifiedUSUM = 0xEE26; // 0xEE22-0xEE26
private const ushort StartSimplifiedUSUM = 0xEE1E;
private const ushort EndSimplifiedUSUM = 0xEE21; // 0xEE1E-0xEE21
private const ushort StartTraditionalUSUM = 0xEE22;
private const ushort EndTraditionalUSUM = 0xEE26; // 0xEE22-0xEE26
private const int TraditionalCount = EndTraditional - StartTraditional + 1;
private const int SimplifiedCount = EndSimplified - StartSimplified + 1;
private const int TraditionalCountUSUM = EndTraditionalUSUM - StartTraditionalUSUM + 1;
private const int TraditionalCount = EndTraditional - StartTraditional + 1;
private const int SimplifiedCountUSUM = EndSimplifiedUSUM - StartSimplifiedUSUM + 1;
private const int TraditionalCountUSUM = EndTraditionalUSUM - StartTraditionalUSUM + 1;
private const ushort End = EndSimplifiedUSUM;
private const ushort End = EndTraditionalUSUM;
private static ReadOnlySpan<char> Table =>
[
@ -189,9 +189,9 @@ internal static void RemapChineseGlyphsBin2String(Span<char> input)
'砰', '奥', '壘', '磊', '砰', '丑', '奧', // EE20-EE26
];
private static ReadOnlySpan<char> Traditional => Table[..TraditionalCount];
private static ReadOnlySpan<char> Simplified => Table.Slice(TraditionalCount, SimplifiedCount);
private static ReadOnlySpan<char> TraditionalUSUM => Table.Slice(TraditionalCount + SimplifiedCount, TraditionalCountUSUM);
private static ReadOnlySpan<char> SimplifiedUSUM => Table.Slice(TraditionalCount + SimplifiedCount + TraditionalCountUSUM, SimplifiedCountUSUM);
private static ReadOnlySpan<char> Simplified => Table[..SimplifiedCount];
private static ReadOnlySpan<char> Traditional => Table.Slice(SimplifiedCount, TraditionalCount);
private static ReadOnlySpan<char> SimplifiedUSUM => Table.Slice(SimplifiedCount + TraditionalCount, SimplifiedCountUSUM);
private static ReadOnlySpan<char> TraditionalUSUM => Table.Slice(SimplifiedCount + TraditionalCount + SimplifiedCountUSUM, TraditionalCountUSUM);
#endregion
}