refactor: Update Unity to 2022.3.62

.editorconfig

@@ -1,6 +1,9 @@
 # Remove the line below if you want to inherit .editorconfig settings from higher directories
 root = true
 
+[*]
+charset = utf-8
+
 # C# files
 [*.cs]
 

.gitignore

@@ -68,3 +68,4 @@ crashlytics-build.properties
 /UserSettings
 /*.zip
 *.lnk
+/HybridCLRData

Assets/Animations.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: ff84d017aa87efe40a398305f6c66f4d
-folderAsset: yes
-timeCreated: 1611481582
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/Canvas.controller.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c96c5f91fd684d14d9d4c09a5f34ee5d
-timeCreated: 1637144068
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/IMain.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2162866fb7549724a85cb3c854a136ad
-timeCreated: 1637144548
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/IQuit.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6e50faab4238b5548bb05a7d421f5405
-timeCreated: 1637145598
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/ISettings.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8b9f1682ee8026b468ad15885e1ff6a5
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/IStartup.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9d0c0a0c88a0e7a43b77b0065bb64721
-timeCreated: 1637144134
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/TQuit_.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0cc97e0bf50ad9c4e834c28e6eddf416
-timeCreated: 1637145877
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/TSettings_Main.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9f6fb5723dba03d42b9e8a3c3e9091a5
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/TStartup_Main.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 63a0e2075f5ba8d489d8cd318c14720b
-timeCreated: 1637144068
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/T_Quit.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cc249d3462d795b46aff263bc04baee2
-timeCreated: 1637144561
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Console.unity.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8a36c371ab6077d43ac28fe09b0fe675
-timeCreated: 1620725915
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/AsyncDelivery.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common {
 	/// <summary>
@@ -20,13 +20,13 @@ namespace Cryville.Common {
 		/// <param name="succeeded">Whether the task has succeeded.</param>
 		/// <param name="result">The result.</param>
 		public void Deliver(bool succeeded, T result) {
-			if (Destination != null) Destination(succeeded, result);
+			Destination?.Invoke(succeeded, result);
 		}
 		/// <summary>
 		/// Cancels the task.
 		/// </summary>
 		public void Cancel() {
-			if (CancelSource != null) CancelSource();
+			CancelSource?.Invoke();
 		}
 	}
 }

Assets/Cryville/Common/BinderAttribute.cs

@@ -13,7 +13,7 @@ namespace Cryville.Common {
 		public static Binder CreateBinderOfType(Type type) {
 			var l = type.GetCustomAttributes(typeof(BinderAttribute), true);
 			if (l.Length > 0) {
-				return (Binder)ReflectionHelper.InvokeEmptyConstructor(
+				return (Binder)Activator.CreateInstance(
 					((BinderAttribute)l[0]).BinderType
 				);
 			}
@@ -35,8 +35,8 @@ namespace Cryville.Common {
 				return null;
 			else if (type.IsAssignableFrom(value.GetType()))
 				return value;
-			else if (type.IsEnum && value is string) {
-				return Enum.Parse(type, (string)value);
+			else if (type.IsEnum && value is string strValue) {
+				return Enum.Parse(type, strValue);
 			}
 			throw new InvalidCastException(string.Format("Cannot cast {0} to {1}", value.GetType(), type));
 		}

Assets/Cryville/Common/Buffers/ArrayPool.cs

@@ -1,65 +0,0 @@
-namespace Cryville.Common.Buffers {
-	/// <summary>
-	/// A resource pool that allows reusing instances of arrays of type <typeparamref name="T" />.
-	/// </summary>
-	/// <typeparam name="T">The item type of the arrays in the pool.</typeparam>
-	public class ArrayPool<T> {
-		private class Bucket : ObjectPool<T[]> {
-			readonly int _size;
-			public Bucket(int size, int capacity) : base(capacity) {
-				_size = size;
-			}
-			protected override T[] Construct() {
-				return new T[_size];
-			}
-		}
-		readonly Bucket[] _buckets;
-		/// <summary>
-		/// Creates an instance of the <see cref="ArrayPool{T}" /> class with the default maximum list size and bucket capacity.
-		/// </summary>
-		public ArrayPool() : this(0x40000000, 256) { }
-		/// <summary>
-		/// Creates an instance of the <see cref="ArrayPool{T}" /> class.
-		/// </summary>
-		/// <param name="maxSize">The maximum size of the arrays in the pool.</param>
-		/// <param name="capacityPerBucket">The capacity of each bucket. The pool groups arrays of similar sizes into buckets for faster access.</param>
-		public ArrayPool(int maxSize, int capacityPerBucket) {
-			if (maxSize < 16) maxSize = 16;
-			int num = GetID(maxSize) + 1;
-			_buckets = new Bucket[num];
-			for (int i = 0; i < num; i++) {
-				_buckets[i] = new Bucket(GetSize(i), capacityPerBucket);
-			}
-		}
-		/// <summary>
-		/// Rents an array that is at least the specified size from the pool.
-		/// </summary>
-		/// <param name="size">The minimum size of the array.</param>
-		/// <returns>An array of type <see cref="T" /> that is at least the specified size.</returns>
-		public T[] Rent(int size) {
-			int len2 = size;
-			if (len2 < 16) len2 = 16;
-			var arr = _buckets[GetID(len2)].Rent();
-			return arr;
-		}
-		/// <summary>
-		/// Returns a rented array to the pool.
-		/// </summary>
-		/// <param name="arr">The array to return.</param>
-		public void Return(T[] arr) {
-			int len2 = arr.Length;
-			if (len2 < 16) len2 = 16;
-			_buckets[GetID(len2)].Return(arr);
-		}
-		static int GetID(int size) {
-			size -= 1;
-			size >>= 4;
-			int num = 0;
-			for (; size != 0; size >>= 1) num++;
-			return num;
-		}
-		static int GetSize(int id) {
-			return 0x10 << id;
-		}
-	}
-}

Assets/Cryville/Common/Buffers/ListPool.cs

@@ -1,71 +0,0 @@
-using System.Collections.Generic;
-
-namespace Cryville.Common.Buffers {
-	/// <summary>
-	/// A resource pool that allows reusing instances of lists of type <typeparamref name="T" />.
-	/// </summary>
-	/// <typeparam name="T">The item type of the lists in the pool.</typeparam>
-	public class ListPool<T> {
-		private class Bucket : ObjectPool<List<T>> {
-			readonly int _size;
-			public Bucket(int size, int capacity) : base(capacity) {
-				_size = size;
-			}
-			protected override List<T> Construct() {
-				return new List<T>(_size);
-			}
-		}
-		readonly Bucket[] _buckets;
-		/// <summary>
-		/// Creates an instance of the <see cref="ListPool{T}" /> class with the default maximum list size and bucket capacity.
-		/// </summary>
-		public ListPool() : this(0x40000000, 256) { }
-		/// <summary>
-		/// Creates an instance of the <see cref="ListPool{T}" /> class.
-		/// </summary>
-		/// <param name="maxSize">The maximum size of the lists in the pool.</param>
-		/// <param name="capacityPerBucket">The capacity of each bucket. The pool groups lists of similar sizes into buckets for faster access.</param>
-		public ListPool(int maxSize, int capacityPerBucket) {
-			if (maxSize < 16) maxSize = 16;
-			int num = GetID(maxSize) + 1;
-			_buckets = new Bucket[num];
-			for (int i = 0; i < num; i++) {
-				_buckets[i] = new Bucket(GetSize(i), capacityPerBucket);
-			}
-		}
-		/// <summary>
-		/// Rents a list of the specified size from the pool. The size of the list must not be changed when it is rented.
-		/// </summary>
-		/// <param name="size">The size of the list.</param>
-		/// <returns>A <see cref="List{T}" /> of the specified size.</returns>
-		public List<T> Rent(int size) {
-			int len2 = size;
-			if (len2 < 16) len2 = 16;
-			var list = _buckets[GetID(len2)].Rent();
-			if (list.Count < size)
-				for (int i = list.Count; i < size; i++) list.Add(default(T));
-			else if (list.Count > size)
-				list.RemoveRange(size, list.Count - size);
-			return list;
-		}
-		/// <summary>
-		/// Returns a rented list to the pool.
-		/// </summary>
-		/// <param name="list">The list to return.</param>
-		public void Return(List<T> list) {
-			int len2 = list.Capacity;
-			if (len2 < 16) len2 = 16;
-			_buckets[GetID(len2)].Return(list);
-		}
-		static int GetID(int size) {
-			size -= 1;
-			size >>= 4;
-			int num = 0;
-			for (; size != 0; size >>= 1) num++;
-			return num;
-		}
-		static int GetSize(int id) {
-			return 0x10 << id;
-		}
-	}
-}

Assets/Cryville/Common/Buffers/ObjectPool.cs

@@ -1,42 +0,0 @@
-namespace Cryville.Common.Buffers {
-	/// <summary>
-	/// A resource pool that allows reusing instances of type <typeparamref name="T" />.
-	/// </summary>
-	/// <typeparam name="T">The type of the objects in the pool.</typeparam>
-	public abstract class ObjectPool<T> where T : class {
-		int _index;
-		readonly T[] _objs;
-		/// <summary>
-		/// Creates an instance of the <see cref="ObjectPool{T}" /> class.
-		/// </summary>
-		/// <param name="capacity">The capacity of the pool.</param>
-		public ObjectPool(int capacity) {
-			_objs = new T[capacity];
-		}
-		/// <summary>
-		/// Rents a object from the pool.
-		/// </summary>
-		/// <returns>The rented object.</returns>
-		public T Rent() {
-			T obj = null;
-			if (_index < _objs.Length) {
-				obj = _objs[_index];
-				_objs[_index++] = null;
-			}
-			if (obj == null) obj = Construct();
-			return obj;
-		}
-		/// <summary>
-		/// Returns a rented object to the pool.
-		/// </summary>
-		/// <param name="obj">The object to return.</param>
-		public void Return(T obj) {
-			if (_index > 0) _objs[--_index] = obj;
-		}
-		/// <summary>
-		/// Constructs a new instance of type <typeparamref name="T" />.
-		/// </summary>
-		/// <returns>The new instance.</returns>
-		protected abstract T Construct();
-	}
-}

Assets/Cryville/Common/Buffers/SimpleObjectPool.cs

@@ -1,16 +0,0 @@
-namespace Cryville.Common.Buffers {
-	/// <summary>
-	/// A resource pool that allows reusing instances of type <typeparamref name="T" />, which has a parameterless constructor.
-	/// </summary>
-	/// <typeparam name="T">The type of the objects in the pool.</typeparam>
-	public class SimpleObjectPool<T> : ObjectPool<T> where T : class, new() {
-		/// <summary>
-		/// Creates an instance of the <see cref="SimpleObjectPool{T}" /> class.
-		/// </summary>
-		/// <param name="capacity">The capacity of the pool.</param>
-		public SimpleObjectPool(int capacity) : base(capacity) { }
-		protected override T Construct() {
-			return new T();
-		}
-	}
-}

Assets/Cryville/Common/Buffers/TargetString.cs

@@ -1,135 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Cryville.Common.Buffers {
-	/// <summary>
-	/// An auto-resized <see cref="char" /> array as a variable-length string used as a target that is modified frequently.
-	/// </summary>
-	public class TargetString : IEnumerable<char> {
-		public event Action OnUpdate;
-		char[] _arr;
-		bool _invalidated;
-		/// <summary>
-		/// Creates an instance of the <see cref="TargetString" /> class with a capacity of 16.
-		/// </summary>
-		public TargetString() : this(16) { }
-		/// <summary>
-		/// Creates an instance of the <see cref="TargetString" /> class.
-		/// </summary>
-		/// <param name="capacity">The initial capacity of the string.</param>
-		/// <exception cref="ArgumentOutOfRangeException"><paramref name="capacity" /> is less than or equal to 0.</exception>
-		public TargetString(int capacity) {
-			if (capacity <= 0) throw new ArgumentOutOfRangeException("capacity");
-			_arr = new char[capacity];
-		}
-		/// <summary>
-		/// Gets or sets one of the characters in the string.
-		/// </summary>
-		/// <param name="index">The zero-based index of the character.</param>
-		/// <returns>The character at the given index.</returns>
-		/// <exception cref="ArgumentOutOfRangeException"><paramref name="index" /> is less than 0 or not less than <see cref="Length" />.</exception>
-		/// <remarks>
-		/// <para>Set <see cref="Length" /> to a desired value before updating the characters.</para>
-		/// <para>Call <see cref=" Validate" /> after all the characters are updated.</para>
-		/// </remarks>
-		public char this[int index] {
-			get {
-				if (index < 0 || index >= m_length)
-					throw new ArgumentOutOfRangeException("index");
-				return _arr[index];
-			}
-			set {
-				if (index < 0 || index >= m_length)
-					throw new ArgumentOutOfRangeException("index");
-				if (_arr[index] == value) return;
-				_arr[index] = value;
-				_invalidated = true;
-			}
-		}
-		int m_length;
-		/// <summary>
-		/// The length of the string.
-		/// </summary>
-		/// <exception cref="ArgumentOutOfRangeException">The value specified for a set operation is less than 0.</exception>
-		public int Length {
-			get {
-				return m_length;
-			}
-			set {
-				if (Length < 0) throw new ArgumentOutOfRangeException("length");
-				if (m_length == value) return;
-				if (_arr.Length < value) {
-					var len = _arr.Length;
-					while (len < value) len *= 2;
-					var arr2 = new char[len];
-					Array.Copy(_arr, arr2, m_length);
-					_arr = arr2;
-				}
-				m_length = value;
-				_invalidated = true;
-			}
-		}
-		/// <summary>
-		/// Validates the string.
-		/// </summary>
-		public void Validate() {
-			if (!_invalidated) return;
-			_invalidated = false;
-			var ev = OnUpdate;
-			if (ev != null) ev.Invoke();
-		}
-		internal char[] TrustedAsArray() { return _arr; }
-
-		/// <summary>
-		/// Returns an enumerator that iterates through the <see cref="TargetString" />.
-		/// </summary>
-		/// <returns>A <see cref="Enumerator" /> for the <see cref="TargetString" />.</returns>
-		public Enumerator GetEnumerator() {
-			return new Enumerator(this);
-		}
-		IEnumerator<char> IEnumerable<char>.GetEnumerator() {
-			return new Enumerator(this);
-		}
-		IEnumerator IEnumerable.GetEnumerator() {
-			return new Enumerator(this);
-		}
-
-		public struct Enumerator : IEnumerator<char> {
-			readonly TargetString _self;
-			int _index;
-			internal Enumerator(TargetString self) {
-				_self = self;
-				_index = -1;
-			}
-
-			public char Current {
-				get {
-					if (_index < 0)
-						throw new InvalidOperationException(_index == -1 ? "Enum not started" : "Enum ended");
-					return _self[_index];
-				}
-			}
-
-			object IEnumerator.Current { get { return Current; } }
-
-			public void Dispose() {
-				_index = -2;
-			}
-
-			public bool MoveNext() {
-				if (_index == -2) return false;
-				_index++;
-				if (_index >= _self.Length) {
-					_index = -2;
-					return false;
-				}
-				return true;
-			}
-
-			public void Reset() {
-				_index = -1;
-			}
-		}
-	}
-}

Assets/Cryville/Common/Buffers/TargetString.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: f0fc34ac257793d4883a9cfcdb6941b9
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/ComponentModel/LogarithmicScaleAttribute.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common.ComponentModel {
 	[AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]

Assets/Cryville/Common/ComponentModel/PrecisionAttribute.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common.ComponentModel {
 	[AttributeUsage(AttributeTargets.Property, Inherited = false)]

Assets/Cryville/Common/ComponentModel/RangeAttribute.cs

@@ -1,14 +1,14 @@
-using System;
+using System;
 
 namespace Cryville.Common.ComponentModel {
 	[AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
 	public class RangeAttribute : Attribute {
-		public RangeAttribute(float min, float max) {
+		public RangeAttribute(double min, double max) {
 			Min = min;
 			Max = max;
 		}
 
-		public float Min { get; set; }
-		public float Max { get; set; }
+		public double Min { get; set; }
+		public double Max { get; set; }
 	}
 }

Assets/Cryville/Common/ComponentModel/StepAttribute.cs

@@ -1,11 +1,11 @@
-using System;
+using System;
 
 namespace Cryville.Common.ComponentModel {
 	[AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
 	public class StepAttribute : Attribute {
-		public StepAttribute(float step) {
+		public StepAttribute(double step) {
 			Step = step;
 		}
-		public float Step { get; set; }
+		public double Step { get; set; }
 	}
 }

Assets/Cryville/Common/Coroutine.cs

@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Cryville.Common {
+	public class Coroutine {
+		readonly IEnumerator<float> _enumerator;
+		readonly Stopwatch _stopwatch = new();
+		public float Progress { get; private set; }
+		public Coroutine(IEnumerator<float> enumerator) {
+			_enumerator = enumerator;
+		}
+		public bool TickOnce() {
+			if (!_enumerator.MoveNext()) return false;
+			Progress = _enumerator.Current;
+			return true;
+		}
+		public bool Tick(double minTime) {
+			_stopwatch.Restart();
+			while (_stopwatch.Elapsed.TotalSeconds < minTime) {
+				if (!_enumerator.MoveNext()) return false;
+				Progress = _enumerator.Current;
+			}
+			return true;
+		}
+	}
+}

Assets/Cryville/Common/Coroutine.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: df66519fa93e1b94ea5bb1702cc91b3f
+guid: 387adc7d494be0147b7cb930bc2e726b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Cryville/Common/Culture/ScriptUtils.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: ae9dab8f520fadc4194032f523ca87c1
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/FileStringAttribute.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common {
 	public class FileStringAttribute : Attribute {

Assets/Cryville/Common/Font/FontFile.cs

@@ -1,9 +1,8 @@
-using Cryville.Common.IO;
+using Cryville.Common.IO;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
 
 namespace Cryville.Common.Font {
 	public abstract class FontFile : IEnumerable<Typeface> {
@@ -17,13 +16,11 @@ namespace Cryville.Common.Font {
 		}
 		public void Close() { Reader.Close(); }
 
-		public static FontFile Create(FileInfo file) {
-			switch (file.Extension) {
-				case ".ttf": case ".otf": return new FontFileTTF(file);
-				case ".ttc": case ".otc": return new FontFileTTC(file);
-				default: return null;
-			}
-		}
+		public static FontFile Create(FileInfo file) => file.Extension switch {
+			".ttf" or ".otf" => new FontFileTTF(file),
+			".ttc" or ".otc" => new FontFileTTC(file),
+			_ => null,
+		};
 
 		public Enumerator GetEnumerator() {
 			return new Enumerator(this);
@@ -43,7 +40,7 @@ namespace Cryville.Common.Font {
 				_index = -1;
 			}
 
-			public Typeface Current {
+			public readonly Typeface Current {
 				get {
 					if (_index < 0)
 						throw new InvalidOperationException(_index == -1 ? "Enum not started" : "Enum ended");
@@ -51,7 +48,7 @@ namespace Cryville.Common.Font {
 				}
 			}
 
-			object IEnumerator.Current { get { return Current; } }
+			readonly object IEnumerator.Current => Current;
 
 			public void Dispose() {
 				_index = -2;

Assets/Cryville/Common/Font/FontManager.cs

@@ -1,27 +1,28 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
 namespace Cryville.Common.Font {
 	public abstract class FontManager {
-		public IReadOnlyDictionary<string, IReadOnlyCollection<Typeface>> MapFullNameToTypeface { get; private set; }
+		public IReadOnlyDictionary<string, Typeface> MapFullNameToTypeface { get; private set; }
 		public IReadOnlyDictionary<string, IReadOnlyCollection<Typeface>> MapNameToTypefaces { get; private set; }
 		public FontManager() {
-			var map1 = new Dictionary<string, List<Typeface>>();
+			var map1 = new Dictionary<string, Typeface>();
 			var map2 = new Dictionary<string, List<Typeface>>();
 			foreach (var f in EnumerateAllTypefaces()) {
-				List<Typeface> set1;
-				if (!map1.TryGetValue(f.FullName, out set1)) {
-					map1.Add(f.FullName, set1 = new List<Typeface>());
+				if (!map1.ContainsKey(f.FullName)) {
+					map1.Add(f.FullName, f);
 				}
-				set1.Add(f);
-				List<Typeface> set2;
-				if (!map2.TryGetValue(f.FamilyName, out set2)) {
+				else {
+					Shared.Logger.Log(3, "UI", "Discarding a font with a duplicate full name {0}", f.FullName);
+					continue;
+				}
+				if (!map2.TryGetValue(f.FamilyName, out List<Typeface> set2)) {
 					map2.Add(f.FamilyName, set2 = new List<Typeface>());
 				}
 				set2.Add(f);
 			}
-			MapFullNameToTypeface = map1.ToDictionary(i => i.Key, i => (IReadOnlyCollection<Typeface>)i.Value);
+			MapFullNameToTypeface = map1;
 			MapNameToTypefaces = map2.ToDictionary(i => i.Key, i => (IReadOnlyCollection<Typeface>)i.Value);
 		}
 		protected abstract IEnumerable<Typeface> EnumerateAllTypefaces();

Assets/Cryville/Common/Font/FontMatcher.cs

@@ -1,4 +1,4 @@
-using Cryville.Common.Culture;
+using Cryville.Culture;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -6,323 +6,339 @@ using System.Linq;
 namespace Cryville.Common.Font {
 	public abstract class FontMatcher {
 		protected FontManager Manager { get; private set; }
-		public FontMatcher(FontManager manafer) { Manager = manafer; }
-		public abstract IEnumerable<Typeface> MatchScript(string script = null, bool distinctFamily = false);
+		public FontMatcher(FontManager manager) { Manager = manager; }
+		public abstract IEnumerable<Typeface> MatchLanguage(LanguageId lang, bool distinctFamily = false);
 	}
 	public class FallbackListFontMatcher : FontMatcher {
-		public Dictionary<string, List<string>> MapScriptToTypefaces = new Dictionary<string, List<string>>();
-		public void LoadDefaultWindowsFallbackList() {
-			if (Environment.OSVersion.Platform != PlatformID.Win32NT) return;
-			MapScriptToTypefaces.Clear();
-			ScriptUtils.FillKeysWithScripts(MapScriptToTypefaces, () => new List<string>());
+		readonly LanguageMatching _matcher;
+		static readonly string UltimateFallbackScript = "zzzz";
+		public Dictionary<string, List<string>> MapScriptToTypefaces = new();
+		public static Dictionary<string, List<string>> GetDefaultWindowsFallbackMap() {
+			var map = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
+			FillKeysWithScripts(map, () => new List<string>());
 			// Reference: https://github.com/chromium/chromium/blob/main/third_party/blink/renderer/platform/fonts/win/font_fallback_win.cc
-			MapScriptToTypefaces["zyyy"].Insert(0, "SimSun"); // Custom
-			MapScriptToTypefaces["zyyy"].Insert(0, "SimHei"); // Custom
-			MapScriptToTypefaces["zyyy"].Insert(0, "Microsoft YaHei"); // Custom
-			MapScriptToTypefaces["zyyy"].Insert(0, "Arial");
-			MapScriptToTypefaces["zyyy"].Insert(0, "Times New Roman");
-			MapScriptToTypefaces["zyyy"].Insert(0, "Segoe UI"); // Custom
-			MapScriptToTypefaces["arab"].Insert(0, "Tahoma");
-			MapScriptToTypefaces["cyrl"].Insert(0, "Times New Roman");
-			MapScriptToTypefaces["grek"].Insert(0, "Times New Roman");
-			MapScriptToTypefaces["hebr"].Insert(0, "David");
-			MapScriptToTypefaces["jpan"].Insert(0, "MS PGothic");
-			MapScriptToTypefaces["latn"].Insert(0, "Times New Roman");
-			MapScriptToTypefaces["hans"].Insert(0, "SimSun");
-			MapScriptToTypefaces["hans"].Insert(0, "SimHei"); // Custom
-			MapScriptToTypefaces["thai"].Insert(0, "Tahoma");
-			MapScriptToTypefaces["hans"].Insert(0, "PMingLiU");
+			map[UltimateFallbackScript].Insert(0, "SimSun"); // Custom
+			map[UltimateFallbackScript].Insert(0, "SimHei"); // Custom
+			map[UltimateFallbackScript].Insert(0, "Microsoft YaHei"); // Custom
+			map[UltimateFallbackScript].Insert(0, "Arial");
+			map[UltimateFallbackScript].Insert(0, "Times New Roman");
+			map[UltimateFallbackScript].Insert(0, "Segoe UI"); // Custom
+			map["arab"].Insert(0, "Tahoma");
+			map["cyrl"].Insert(0, "Times New Roman");
+			map["grek"].Insert(0, "Times New Roman");
+			map["hebr"].Insert(0, "David");
+			map["jpan"].Insert(0, "MS PGothic");
+			map["latn"].Insert(0, "Times New Roman");
+			map["hans"].Insert(0, "SimSun");
+			map["hans"].Insert(0, "SimHei"); // Custom
+			map["thai"].Insert(0, "Tahoma");
+			map["hans"].Insert(0, "PMingLiU");
 			// Reference: https://learn.microsoft.com/en-us/globalization/input/font-support
 			var ver = Environment.OSVersion.Version;
 			if (ver >= new Version(5, 0)) { // Windows 2000
-				MapScriptToTypefaces["armn"].Insert(0, "Sylfaen");
-				MapScriptToTypefaces["deva"].Insert(0, "Mangal");
-				MapScriptToTypefaces["geor"].Insert(0, "Sylfaen");
-				MapScriptToTypefaces["taml"].Insert(0, "Latha");
+				map["armn"].Insert(0, "Sylfaen");
+				map["deva"].Insert(0, "Mangal");
+				map["geor"].Insert(0, "Sylfaen");
+				map["taml"].Insert(0, "Latha");
 			}
 			if (ver >= new Version(5, 1)) { // Windows XP
-				MapScriptToTypefaces["gujr"].Insert(0, "Shruti");
-				MapScriptToTypefaces["guru"].Insert(0, "Raavi");
-				MapScriptToTypefaces["knda"].Insert(0, "Tunga");
-				MapScriptToTypefaces["syrc"].Insert(0, "Estrangelo Edessa");
-				MapScriptToTypefaces["telu"].Insert(0, "Gautami");
-				MapScriptToTypefaces["thaa"].Insert(0, "MV Boli");
+				map["gujr"].Insert(0, "Shruti");
+				map["guru"].Insert(0, "Raavi");
+				map["knda"].Insert(0, "Tunga");
+				map["syrc"].Insert(0, "Estrangelo Edessa");
+				map["telu"].Insert(0, "Gautami");
+				map["thaa"].Insert(0, "MV Boli");
 				// SP2
-				MapScriptToTypefaces["beng"].Insert(0, "Vrinda");
-				MapScriptToTypefaces["mlym"].Insert(0, "Kartika");
+				map["beng"].Insert(0, "Vrinda");
+				map["mlym"].Insert(0, "Kartika");
 			}
 			if (ver >= new Version(6, 0)) { // Windows Vista
-				MapScriptToTypefaces["cans"].Insert(0, "Euphemia");
-				MapScriptToTypefaces["cher"].Insert(0, "Plantagenet");
-				MapScriptToTypefaces["ethi"].Insert(0, "Nyala");
-				MapScriptToTypefaces["khmr"].Insert(0, "DaunPenh MoolBoran");
-				MapScriptToTypefaces["laoo"].Insert(0, "DokChampa");
-				MapScriptToTypefaces["mong"].Insert(0, "Mongolian Baiti");
-				MapScriptToTypefaces["orya"].Insert(0, "Kalinga");
-				MapScriptToTypefaces["sinh"].Insert(0, "Iskoola Pota");
-				MapScriptToTypefaces["tibt"].Insert(0, "Microsoft Himalaya");
-				MapScriptToTypefaces["yiii"].Insert(0, "Microsoft Yi Baiti");
-				MapScriptToTypefaces["arab"].Insert(0, "Segoe UI");
-				MapScriptToTypefaces["cyrl"].Insert(0, "Segoe UI");
-				MapScriptToTypefaces["grek"].Insert(0, "Segoe UI");
-				MapScriptToTypefaces["latn"].Insert(0, "Segoe UI");
-				MapScriptToTypefaces["hans"].Add("SimSun-ExtB");
-				MapScriptToTypefaces["hant"].Add("MingLiU-ExtB");
-				MapScriptToTypefaces["hant"].Add("MingLiU_HKSCS-ExtB");
-				MapScriptToTypefaces["arab"].Add("Microsoft Uighur");
-				MapScriptToTypefaces["zmth"].Insert(0, "Cambria Math");
+				map["cans"].Insert(0, "Euphemia");
+				map["cher"].Insert(0, "Plantagenet");
+				map["ethi"].Insert(0, "Nyala");
+				map["khmr"].Insert(0, "DaunPenh MoolBoran");
+				map["kore"].Insert(0, "Malgun Gothic"); // Reference: https://en.wikipedia.org/wiki/List_of_typefaces_included_with_Microsoft_Windows
+				map["laoo"].Insert(0, "DokChampa");
+				map["mong"].Insert(0, "Mongolian Baiti");
+				map["orya"].Insert(0, "Kalinga");
+				map["sinh"].Insert(0, "Iskoola Pota");
+				map["tibt"].Insert(0, "Microsoft Himalaya");
+				map["yiii"].Insert(0, "Microsoft Yi Baiti");
+				map["arab"].Insert(0, "Segoe UI");
+				map["cyrl"].Insert(0, "Segoe UI");
+				map["grek"].Insert(0, "Segoe UI");
+				map["latn"].Insert(0, "Segoe UI");
+				map["hans"].Add("SimSun-ExtB");
+				map["hant"].Add("MingLiU-ExtB");
+				map["hant"].Add("MingLiU_HKSCS-ExtB");
+				map["arab"].Add("Microsoft Uighur");
+				map["zmth"].Insert(0, "Cambria Math");
 				// Reference: https://en.wikipedia.org/wiki/List_of_CJK_fonts
-				MapScriptToTypefaces["jpan"].Insert(0, "Meiryo");
-				MapScriptToTypefaces["hans"].Insert(0, "Microsoft YaHei");
+				map["jpan"].Insert(0, "Meiryo");
+				map["hans"].Insert(0, "Microsoft YaHei");
 			}
 			if (ver >= new Version(6, 1)) { // Windows 7
-				MapScriptToTypefaces["brai"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["dsrt"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["talu"].Insert(0, "Microsoft New Tai Lue");
-				MapScriptToTypefaces["ogam"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["osma"].Insert(0, "Ebrima");
-				MapScriptToTypefaces["phag"].Insert(0, "Microsoft PhagsPa");
-				MapScriptToTypefaces["runr"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["zsym"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["tale"].Insert(0, "Microsoft Tai Le");
-				MapScriptToTypefaces["tfng"].Insert(0, "Ebrima");
-				MapScriptToTypefaces["vaii"].Insert(0, "Ebrima");
+				map["brai"].Insert(0, "Segoe UI Symbol");
+				map["dsrt"].Insert(0, "Segoe UI Symbol");
+				map["talu"].Insert(0, "Microsoft New Tai Lue");
+				map["ogam"].Insert(0, "Segoe UI Symbol");
+				map["osma"].Insert(0, "Ebrima");
+				map["phag"].Insert(0, "Microsoft PhagsPa");
+				map["runr"].Insert(0, "Segoe UI Symbol");
+				map["zsym"].Insert(0, "Segoe UI Symbol");
+				map["tale"].Insert(0, "Microsoft Tai Le");
+				map["tfng"].Insert(0, "Ebrima");
+				map["vaii"].Insert(0, "Ebrima");
 			}
 			if (ver >= new Version(6, 2)) { // Windows 8
-				MapScriptToTypefaces["glag"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["goth"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["hang"].Add("Malgun Gothic");
-				MapScriptToTypefaces["ital"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["lisu"].Insert(0, "Segoe UI");
-				MapScriptToTypefaces["mymr"].Insert(0, "Myanmar Text");
-				MapScriptToTypefaces["nkoo"].Insert(0, "Ebrima");
-				MapScriptToTypefaces["orkh"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["ethi"].Insert(0, "Ebrima");
-				MapScriptToTypefaces["cans"].Insert(0, "Gadugi");
-				MapScriptToTypefaces["hant"].Insert(0, "Microsoft JhengHei UI");
-				MapScriptToTypefaces["hans"].Insert(0, "Microsoft YaHei UI");
-				MapScriptToTypefaces["beng"].Insert(0, "Nirmala UI");
-				MapScriptToTypefaces["deva"].Insert(0, "Nirmala UI");
-				MapScriptToTypefaces["gujr"].Insert(0, "Nirmala UI");
-				MapScriptToTypefaces["guru"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
-				MapScriptToTypefaces["knda"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
-				MapScriptToTypefaces["mlym"].Insert(0, "Nirmala UI");
-				MapScriptToTypefaces["orya"].Insert(0, "Nirmala UI");
-				MapScriptToTypefaces["sinh"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
-				MapScriptToTypefaces["taml"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
-				MapScriptToTypefaces["telu"].Insert(0, "Nirmala UI");
-				MapScriptToTypefaces["armn"].Insert(0, "Segoe UI");
-				MapScriptToTypefaces["geor"].Insert(0, "Segoe UI");
-				MapScriptToTypefaces["hebr"].Insert(0, "Segoe UI");
+				map["glag"].Insert(0, "Segoe UI Symbol");
+				map["goth"].Insert(0, "Segoe UI Symbol");
+				map["hang"].Add("Malgun Gothic");
+				map["ital"].Insert(0, "Segoe UI Symbol");
+				map["lisu"].Insert(0, "Segoe UI");
+				map["mymr"].Insert(0, "Myanmar Text");
+				map["nkoo"].Insert(0, "Ebrima");
+				map["orkh"].Insert(0, "Segoe UI Symbol");
+				map["ethi"].Insert(0, "Ebrima");
+				map["cans"].Insert(0, "Gadugi");
+				map["hant"].Insert(0, "Microsoft JhengHei UI");
+				map["hans"].Insert(0, "Microsoft YaHei UI");
+				map["beng"].Insert(0, "Nirmala UI");
+				map["deva"].Insert(0, "Nirmala UI");
+				map["gujr"].Insert(0, "Nirmala UI");
+				map["guru"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
+				map["knda"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
+				map["mlym"].Insert(0, "Nirmala UI");
+				map["orya"].Insert(0, "Nirmala UI");
+				map["sinh"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
+				map["taml"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
+				map["telu"].Insert(0, "Nirmala UI");
+				map["armn"].Insert(0, "Segoe UI");
+				map["geor"].Insert(0, "Segoe UI");
+				map["hebr"].Insert(0, "Segoe UI");
 			}
 			if (ver >= new Version(6, 3)) { // Windows 8.1
-				MapScriptToTypefaces["bugi"].Insert(0, "Leelawadee UI");
-				MapScriptToTypefaces["copt"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["java"].Insert(0, "Javanese Text");
-				MapScriptToTypefaces["merc"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["olck"].Insert(0, "Nirmala UI");
-				MapScriptToTypefaces["sora"].Insert(0, "Nirmala UI");
-				MapScriptToTypefaces["khmr"].Insert(0, "Leelawadee UI");
-				MapScriptToTypefaces["laoo"].Insert(0, "Leelawadee UI");
-				MapScriptToTypefaces["thai"].Insert(0, "Leelawadee UI");
-				MapScriptToTypefaces["zsye"].Insert(0, "Segoe UI Emoji");
+				map["bugi"].Insert(0, "Leelawadee UI");
+				map["copt"].Insert(0, "Segoe UI Symbol");
+				map["java"].Insert(0, "Javanese Text");
+				map["merc"].Insert(0, "Segoe UI Symbol");
+				map["olck"].Insert(0, "Nirmala UI");
+				map["sora"].Insert(0, "Nirmala UI");
+				map["khmr"].Insert(0, "Leelawadee UI");
+				map["laoo"].Insert(0, "Leelawadee UI");
+				map["thai"].Insert(0, "Leelawadee UI");
+				map["zsye"].Insert(0, "Segoe UI Emoji");
 			}
 			if (ver >= new Version(10, 0)) { // Windows 10
-				MapScriptToTypefaces["brah"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["cari"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["cprt"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["egyp"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["armi"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["phli"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["prti"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["khar"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["lyci"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["lydi"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["phnx"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["xpeo"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["sarb"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["shaw"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["xsux"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["ugar"].Insert(0, "Segoe UI Historic");
+				map["brah"].Insert(0, "Segoe UI Historic");
+				map["cari"].Insert(0, "Segoe UI Historic");
+				map["cprt"].Insert(0, "Segoe UI Historic");
+				map["egyp"].Insert(0, "Segoe UI Historic");
+				map["armi"].Insert(0, "Segoe UI Historic");
+				map["phli"].Insert(0, "Segoe UI Historic");
+				map["prti"].Insert(0, "Segoe UI Historic");
+				map["khar"].Insert(0, "Segoe UI Historic");
+				map["lyci"].Insert(0, "Segoe UI Historic");
+				map["lydi"].Insert(0, "Segoe UI Historic");
+				map["phnx"].Insert(0, "Segoe UI Historic");
+				map["xpeo"].Insert(0, "Segoe UI Historic");
+				map["sarb"].Insert(0, "Segoe UI Historic");
+				map["shaw"].Insert(0, "Segoe UI Historic");
+				map["xsux"].Insert(0, "Segoe UI Historic");
+				map["ugar"].Insert(0, "Segoe UI Historic");
 				// Segoe UI Symbol -> Segoe UI Historic
-				MapScriptToTypefaces["glag"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["goth"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["merc"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["ogam"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["ital"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["orkh"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["runr"].Insert(0, "Segoe UI Historic");
+				map["glag"].Insert(0, "Segoe UI Historic");
+				map["goth"].Insert(0, "Segoe UI Historic");
+				map["merc"].Insert(0, "Segoe UI Historic");
+				map["ogam"].Insert(0, "Segoe UI Historic");
+				map["ital"].Insert(0, "Segoe UI Historic");
+				map["orkh"].Insert(0, "Segoe UI Historic");
+				map["runr"].Insert(0, "Segoe UI Historic");
 				//
-				MapScriptToTypefaces["jpan"].Insert(0, "Yu Gothic UI");
-				MapScriptToTypefaces["zsym"].Add("Segoe MDL2 Assets");
+				map["jpan"].Insert(0, "Yu Gothic UI");
+				map["zsym"].Add("Segoe MDL2 Assets");
+			}
+			return map;
+		}
+		public static Dictionary<string, List<string>> GetDefaultAndroidFallbackMap() {
+			var map = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
+			FillKeysWithScripts(map, () => new List<string>());
+			map[UltimateFallbackScript].Insert(0, "Noto Sans CJK TC"); // TODO Modify default fallback
+			map[UltimateFallbackScript].Insert(0, "Noto Sans CJK JP");
+			map[UltimateFallbackScript].Insert(0, "Noto Sans CJK SC");
+			map[UltimateFallbackScript].Insert(0, "Roboto");
+			map["zsye"].Insert(0, "Noto Color Emoji");
+			map["zsye"].Add("Noto Color Emoji Flags");
+			map["arab"].Insert(0, "Noto Naskh Arabic");
+			map["adlm"].Insert(0, "Noto Sans Adlam");
+			map["ahom"].Insert(0, "Noto Sans Ahom");
+			map["hluw"].Insert(0, "Noto Sans Anatolian Hieroglyphs");
+			map["armn"].Insert(0, "Noto Sans Armenian");
+			map["avst"].Insert(0, "Noto Sans Avestan");
+			map["bali"].Insert(0, "Noto Sans Balinese");
+			map["bamu"].Insert(0, "Noto Sans Bamum");
+			map["bass"].Insert(0, "Noto Sans Bassa Vah");
+			map["batk"].Insert(0, "Noto Sans Batak");
+			map["beng"].Insert(0, "Noto Sans Bengali");
+			map["bhks"].Insert(0, "Noto Sans Bhaiksuki");
+			map["brah"].Insert(0, "Noto Sans Brahmi");
+			map["bugi"].Insert(0, "Noto Sans Buginese");
+			map["buhd"].Insert(0, "Noto Sans Buhid");
+			map["jpan"].Insert(0, "Noto Sans CJK JP");
+			map["kore"].Insert(0, "Noto Sans CJK KR");
+			map["hans"].Insert(0, "Noto Sans CJK SC");
+			map["hant"].Insert(0, "Noto Sans CJK TC");
+			map["hant"].Add("Noto Sans CJK HK");
+			map["cans"].Insert(0, "Noto Sans Canadian Aboriginal");
+			map["cari"].Insert(0, "Noto Sans Carian");
+			map["cakm"].Insert(0, "Noto Sans Chakma");
+			map["cham"].Insert(0, "Noto Sans Cham");
+			map["cher"].Insert(0, "Noto Sans Cherokee");
+			map["copt"].Insert(0, "Noto Sans Coptic");
+			map["xsux"].Insert(0, "Noto Sans Cuneiform");
+			map["cprt"].Insert(0, "Noto Sans Cypriot");
+			map["dsrt"].Insert(0, "Noto Sans Deseret");
+			map["deva"].Insert(0, "Noto Sans Devanagari");
+			map["egyp"].Insert(0, "Noto Sans Egyptian Hieroglyphs");
+			map["elba"].Insert(0, "Noto Sans Elbasan");
+			map["ethi"].Insert(0, "Noto Sans Ethiopic");
+			map["geor"].Insert(0, "Noto Sans Georgian");
+			map["glag"].Insert(0, "Noto Sans Glagolitic");
+			map["goth"].Insert(0, "Noto Sans Gothic");
+			map["gran"].Insert(0, "Noto Sans Grantha");
+			map["gujr"].Insert(0, "Noto Sans Gujarati");
+			map["gong"].Insert(0, "Noto Sans Gunjala Gondi");
+			map["guru"].Insert(0, "Noto Sans Gurmukhi");
+			map["rohg"].Insert(0, "Noto Sans Hanifi Rohingya");
+			map["hano"].Insert(0, "Noto Sans Hanunoo");
+			map["hatr"].Insert(0, "Noto Sans Hatran");
+			map["hebr"].Insert(0, "Noto Sans Hebrew");
+			map["armi"].Insert(0, "Noto Sans Imperial Aramaic");
+			map["phli"].Insert(0, "Noto Sans Inscriptional Pahlavi");
+			map["prti"].Insert(0, "Noto Sans Inscriptional Parthian");
+			map["java"].Insert(0, "Noto Sans Javanese");
+			map["kthi"].Insert(0, "Noto Sans Kaithi");
+			map["knda"].Insert(0, "Noto Sans Kannada");
+			map["kali"].Insert(0, "Noto Sans KayahLi");
+			map["khar"].Insert(0, "Noto Sans Kharoshthi");
+			map["khmr"].Insert(0, "Noto Sans Khmer");
+			map["khoj"].Insert(0, "Noto Sans Khojki");
+			map["laoo"].Insert(0, "Noto Sans Lao");
+			map["lepc"].Insert(0, "Noto Sans Lepcha");
+			map["limb"].Insert(0, "Noto Sans Limbu");
+			map["lina"].Insert(0, "Noto Sans Linear A");
+			map["linb"].Insert(0, "Noto Sans Linear B");
+			map["lisu"].Insert(0, "Noto Sans Lisu");
+			map["lyci"].Insert(0, "Noto Sans Lycian");
+			map["lydi"].Insert(0, "Noto Sans Lydian");
+			map["mlym"].Insert(0, "Noto Sans Malayalam");
+			map["mand"].Insert(0, "Noto Sans Mandiac");
+			map["mani"].Insert(0, "Noto Sans Manichaean");
+			map["marc"].Insert(0, "Noto Sans Marchen");
+			map["gonm"].Insert(0, "Noto Sans Masaram Gondi");
+			map["medf"].Insert(0, "Noto Sans Medefaidrin");
+			map["mtei"].Insert(0, "Noto Sans Meetei Mayek");
+			map["merc"].Insert(0, "Noto Sans Meroitic");
+			map["mero"].Insert(0, "Noto Sans Meroitic");
+			map["plrd"].Insert(0, "Noto Sans Miao");
+			map["modi"].Insert(0, "Noto Sans Modi");
+			map["mong"].Insert(0, "Noto Sans Mongolian");
+			map["mroo"].Insert(0, "Noto Sans Mro");
+			map["mult"].Insert(0, "Noto Sans Multani");
+			map["mymr"].Insert(0, "Noto Sans Myanmar");
+			map["nkoo"].Insert(0, "Noto Sans Nko");
+			map["nbat"].Insert(0, "Noto Sans Nabataean");
+			map["talu"].Insert(0, "Noto Sans New Tai Lue");
+			map["newa"].Insert(0, "Noto Sans Newa");
+			map["ogam"].Insert(0, "Noto Sans Ogham");
+			map["olck"].Insert(0, "Noto Sans Ol Chiki");
+			map["ital"].Insert(0, "Noto Sans Old Italian");
+			map["narb"].Insert(0, "Noto Sans Old North Arabian");
+			map["perm"].Insert(0, "Noto Sans Old Permic");
+			map["xpeo"].Insert(0, "Noto Sans Old Persian");
+			map["sarb"].Insert(0, "Noto Sans Old South Arabian");
+			map["orkh"].Insert(0, "Noto Sans Old Turkic");
+			map["orya"].Insert(0, "Noto Sans Oriya");
+			map["osge"].Insert(0, "Noto Sans Osage");
+			map["osma"].Insert(0, "Noto Sans Osmanya");
+			map["hmng"].Insert(0, "Noto Sans Pahawh Hmong");
+			map["palm"].Insert(0, "Noto Sans Palmyrene");
+			map["pauc"].Insert(0, "Noto Sans Pau Cin Hau");
+			map["phag"].Insert(0, "Noto Sans Phags Pa");
+			map["phnx"].Insert(0, "Noto Sans Phoenician");
+			map["rjng"].Insert(0, "Noto Sans Rejang");
+			map["runr"].Insert(0, "Noto Sans Runic");
+			map["samr"].Insert(0, "Noto Sans Samaritan");
+			map["saur"].Insert(0, "Noto Sans Saurashtra");
+			map["shrd"].Insert(0, "Noto Sans Sharada");
+			map["shaw"].Insert(0, "Noto Sans Shavian");
+			map["sinh"].Insert(0, "Noto Sans Sinhala");
+			map["sora"].Insert(0, "Noto Sans Sora Sompeng");
+			map["soyo"].Insert(0, "Noto Sans Soyombo");
+			map["sund"].Insert(0, "Noto Sans Sundanese");
+			map["sylo"].Insert(0, "Noto Sans Syloti Nagri");
+			map["zsym"].Insert(0, "Noto Sans Symbols");
+			map["syrc"].Add("Noto Sans Syriac Eastern");
+			map["syrc"].Add("Noto Sans Syriac Western");
+			map["syrc"].Add("Noto Sans Syriac Estrangela");
+			map["tglg"].Insert(0, "Noto Sans Tagalog");
+			map["tagb"].Insert(0, "Noto Sans Tagbanwa");
+			map["tale"].Insert(0, "Noto Sans Tai Le");
+			map["lana"].Insert(0, "Noto Sans Tai Tham");
+			map["tavt"].Insert(0, "Noto Sans Tai Viet");
+			map["takr"].Insert(0, "Noto Sans Takri");
+			map["taml"].Insert(0, "Noto Sans Tamil");
+			map["telu"].Insert(0, "Noto Sans Telugu");
+			map["thaa"].Insert(0, "Noto Sans Thaana");
+			map["thai"].Insert(0, "Noto Sans Thai");
+			map["tfng"].Insert(0, "Noto Sans Tifinagh");
+			map["ugar"].Insert(0, "Noto Sans Ugaritic");
+			map["vaii"].Insert(0, "Noto Sans Vai");
+			map["wcho"].Insert(0, "Noto Sans Wancho");
+			map["wara"].Insert(0, "Noto Sans Warang Citi");
+			map["yiii"].Insert(0, "Noto Sans Yi");
+			return map;
+		}
+		static void FillKeysWithScripts<T>(IDictionary<string, T> map, Func<T> value) {
+			foreach (var s in IdValidity.Enumerate("script")) map.Add(s, value());
+		}
+
+		public FallbackListFontMatcher(LanguageMatching matcher, FontManager manager) : base(manager) {
+			_matcher = matcher;
+		}
+		public override IEnumerable<Typeface> MatchLanguage(LanguageId lang, bool distinctFamily = false) {
+			var supported = MapScriptToTypefaces.Keys.Select(i => new LanguageId(i)).ToList();
+			bool flag = false;
+			while (_matcher.Match(lang, supported, out var match, out var distance)) {
+				if (distance > 40) break;
+				Shared.Logger.Log(0, "UI", "Matching fonts for language {0}, distance = {1}", match, distance);
+				if (match.Script.Equals(UltimateFallbackScript, StringComparison.OrdinalIgnoreCase)) {
+					flag = true;
+				}
+				var candidates = MapScriptToTypefaces[match.Script];
+				foreach (var typeface in EnumerateTypefaces(candidates, distinctFamily)) {
+					yield return typeface;
+				}
+				supported.Remove(match);
+			}
+			if (flag) yield break;
+			Shared.Logger.Log(0, "UI", "Matching fallback fonts");
+			foreach (var typeface in EnumerateTypefaces(MapScriptToTypefaces[UltimateFallbackScript], distinctFamily)) {
+				yield return typeface;
 			}
 		}
-		public void LoadDefaultAndroidFallbackList() {
-			if (Environment.OSVersion.Platform != PlatformID.Unix) return;
-			MapScriptToTypefaces.Clear();
-			ScriptUtils.FillKeysWithScripts(MapScriptToTypefaces, () => new List<string>());
-			MapScriptToTypefaces["zyyy"].Insert(0, "Noto Sans CJK TC"); // TODO Modify default fallback
-			MapScriptToTypefaces["zyyy"].Insert(0, "Noto Sans CJK JP");
-			MapScriptToTypefaces["zyyy"].Insert(0, "Noto Sans CJK SC");
-			MapScriptToTypefaces["zyyy"].Insert(0, "Roboto");
-			MapScriptToTypefaces["zsye"].Insert(0, "Noto Color Emoji");
-			MapScriptToTypefaces["zsye"].Add("Noto Color Emoji Flags");
-			MapScriptToTypefaces["arab"].Insert(0, "Noto Naskh Arabic");
-			MapScriptToTypefaces["adlm"].Insert(0, "Noto Sans Adlam");
-			MapScriptToTypefaces["ahom"].Insert(0, "Noto Sans Ahom");
-			MapScriptToTypefaces["hluw"].Insert(0, "Noto Sans Anatolian Hieroglyphs");
-			MapScriptToTypefaces["armn"].Insert(0, "Noto Sans Armenian");
-			MapScriptToTypefaces["avst"].Insert(0, "Noto Sans Avestan");
-			MapScriptToTypefaces["bali"].Insert(0, "Noto Sans Balinese");
-			MapScriptToTypefaces["bamu"].Insert(0, "Noto Sans Bamum");
-			MapScriptToTypefaces["bass"].Insert(0, "Noto Sans Bassa Vah");
-			MapScriptToTypefaces["batk"].Insert(0, "Noto Sans Batak");
-			MapScriptToTypefaces["beng"].Insert(0, "Noto Sans Bengali");
-			MapScriptToTypefaces["bhks"].Insert(0, "Noto Sans Bhaiksuki");
-			MapScriptToTypefaces["brah"].Insert(0, "Noto Sans Brahmi");
-			MapScriptToTypefaces["bugi"].Insert(0, "Noto Sans Buginese");
-			MapScriptToTypefaces["buhd"].Insert(0, "Noto Sans Buhid");
-			MapScriptToTypefaces["jpan"].Insert(0, "Noto Sans CJK JP");
-			MapScriptToTypefaces["kore"].Insert(0, "Noto Sans CJK KR");
-			MapScriptToTypefaces["hans"].Insert(0, "Noto Sans CJK SC");
-			MapScriptToTypefaces["hant"].Insert(0, "Noto Sans CJK TC");
-			MapScriptToTypefaces["hant"].Add("Noto Sans CJK HK");
-			MapScriptToTypefaces["cans"].Insert(0, "Noto Sans Canadian Aboriginal");
-			MapScriptToTypefaces["cari"].Insert(0, "Noto Sans Carian");
-			MapScriptToTypefaces["cakm"].Insert(0, "Noto Sans Chakma");
-			MapScriptToTypefaces["cham"].Insert(0, "Noto Sans Cham");
-			MapScriptToTypefaces["cher"].Insert(0, "Noto Sans Cherokee");
-			MapScriptToTypefaces["copt"].Insert(0, "Noto Sans Coptic");
-			MapScriptToTypefaces["xsux"].Insert(0, "Noto Sans Cuneiform");
-			MapScriptToTypefaces["cprt"].Insert(0, "Noto Sans Cypriot");
-			MapScriptToTypefaces["dsrt"].Insert(0, "Noto Sans Deseret");
-			MapScriptToTypefaces["deva"].Insert(0, "Noto Sans Devanagari");
-			MapScriptToTypefaces["egyp"].Insert(0, "Noto Sans Egyptian Hieroglyphs");
-			MapScriptToTypefaces["elba"].Insert(0, "Noto Sans Elbasan");
-			MapScriptToTypefaces["ethi"].Insert(0, "Noto Sans Ethiopic");
-			MapScriptToTypefaces["geor"].Insert(0, "Noto Sans Georgian");
-			MapScriptToTypefaces["glag"].Insert(0, "Noto Sans Glagolitic");
-			MapScriptToTypefaces["goth"].Insert(0, "Noto Sans Gothic");
-			MapScriptToTypefaces["gran"].Insert(0, "Noto Sans Grantha");
-			MapScriptToTypefaces["gujr"].Insert(0, "Noto Sans Gujarati");
-			MapScriptToTypefaces["gong"].Insert(0, "Noto Sans Gunjala Gondi");
-			MapScriptToTypefaces["guru"].Insert(0, "Noto Sans Gurmukhi");
-			MapScriptToTypefaces["rohg"].Insert(0, "Noto Sans Hanifi Rohingya");
-			MapScriptToTypefaces["hano"].Insert(0, "Noto Sans Hanunoo");
-			MapScriptToTypefaces["hatr"].Insert(0, "Noto Sans Hatran");
-			MapScriptToTypefaces["hebr"].Insert(0, "Noto Sans Hebrew");
-			MapScriptToTypefaces["armi"].Insert(0, "Noto Sans Imperial Aramaic");
-			MapScriptToTypefaces["phli"].Insert(0, "Noto Sans Inscriptional Pahlavi");
-			MapScriptToTypefaces["prti"].Insert(0, "Noto Sans Inscriptional Parthian");
-			MapScriptToTypefaces["java"].Insert(0, "Noto Sans Javanese");
-			MapScriptToTypefaces["kthi"].Insert(0, "Noto Sans Kaithi");
-			MapScriptToTypefaces["knda"].Insert(0, "Noto Sans Kannada");
-			MapScriptToTypefaces["kali"].Insert(0, "Noto Sans KayahLi");
-			MapScriptToTypefaces["khar"].Insert(0, "Noto Sans Kharoshthi");
-			MapScriptToTypefaces["khmr"].Insert(0, "Noto Sans Khmer");
-			MapScriptToTypefaces["khoj"].Insert(0, "Noto Sans Khojki");
-			MapScriptToTypefaces["laoo"].Insert(0, "Noto Sans Lao");
-			MapScriptToTypefaces["lepc"].Insert(0, "Noto Sans Lepcha");
-			MapScriptToTypefaces["limb"].Insert(0, "Noto Sans Limbu");
-			MapScriptToTypefaces["lina"].Insert(0, "Noto Sans Linear A");
-			MapScriptToTypefaces["linb"].Insert(0, "Noto Sans Linear B");
-			MapScriptToTypefaces["lisu"].Insert(0, "Noto Sans Lisu");
-			MapScriptToTypefaces["lyci"].Insert(0, "Noto Sans Lycian");
-			MapScriptToTypefaces["lydi"].Insert(0, "Noto Sans Lydian");
-			MapScriptToTypefaces["mlym"].Insert(0, "Noto Sans Malayalam");
-			MapScriptToTypefaces["mand"].Insert(0, "Noto Sans Mandiac");
-			MapScriptToTypefaces["mani"].Insert(0, "Noto Sans Manichaean");
-			MapScriptToTypefaces["marc"].Insert(0, "Noto Sans Marchen");
-			MapScriptToTypefaces["gonm"].Insert(0, "Noto Sans Masaram Gondi");
-			MapScriptToTypefaces["medf"].Insert(0, "Noto Sans Medefaidrin");
-			MapScriptToTypefaces["mtei"].Insert(0, "Noto Sans Meetei Mayek");
-			MapScriptToTypefaces["merc"].Insert(0, "Noto Sans Meroitic");
-			MapScriptToTypefaces["mero"].Insert(0, "Noto Sans Meroitic");
-			MapScriptToTypefaces["plrd"].Insert(0, "Noto Sans Miao");
-			MapScriptToTypefaces["modi"].Insert(0, "Noto Sans Modi");
-			MapScriptToTypefaces["mong"].Insert(0, "Noto Sans Mongolian");
-			MapScriptToTypefaces["mroo"].Insert(0, "Noto Sans Mro");
-			MapScriptToTypefaces["mult"].Insert(0, "Noto Sans Multani");
-			MapScriptToTypefaces["mymr"].Insert(0, "Noto Sans Myanmar");
-			MapScriptToTypefaces["nkoo"].Insert(0, "Noto Sans Nko");
-			MapScriptToTypefaces["nbat"].Insert(0, "Noto Sans Nabataean");
-			MapScriptToTypefaces["talu"].Insert(0, "Noto Sans New Tai Lue");
-			MapScriptToTypefaces["newa"].Insert(0, "Noto Sans Newa");
-			MapScriptToTypefaces["ogam"].Insert(0, "Noto Sans Ogham");
-			MapScriptToTypefaces["olck"].Insert(0, "Noto Sans Ol Chiki");
-			MapScriptToTypefaces["ital"].Insert(0, "Noto Sans Old Italian");
-			MapScriptToTypefaces["narb"].Insert(0, "Noto Sans Old North Arabian");
-			MapScriptToTypefaces["perm"].Insert(0, "Noto Sans Old Permic");
-			MapScriptToTypefaces["xpeo"].Insert(0, "Noto Sans Old Persian");
-			MapScriptToTypefaces["sarb"].Insert(0, "Noto Sans Old South Arabian");
-			MapScriptToTypefaces["orkh"].Insert(0, "Noto Sans Old Turkic");
-			MapScriptToTypefaces["orya"].Insert(0, "Noto Sans Oriya");
-			MapScriptToTypefaces["osge"].Insert(0, "Noto Sans Osage");
-			MapScriptToTypefaces["osma"].Insert(0, "Noto Sans Osmanya");
-			MapScriptToTypefaces["hmng"].Insert(0, "Noto Sans Pahawh Hmong");
-			MapScriptToTypefaces["palm"].Insert(0, "Noto Sans Palmyrene");
-			MapScriptToTypefaces["pauc"].Insert(0, "Noto Sans Pau Cin Hau");
-			MapScriptToTypefaces["phag"].Insert(0, "Noto Sans Phags Pa");
-			MapScriptToTypefaces["phnx"].Insert(0, "Noto Sans Phoenician");
-			MapScriptToTypefaces["rjng"].Insert(0, "Noto Sans Rejang");
-			MapScriptToTypefaces["runr"].Insert(0, "Noto Sans Runic");
-			MapScriptToTypefaces["samr"].Insert(0, "Noto Sans Samaritan");
-			MapScriptToTypefaces["saur"].Insert(0, "Noto Sans Saurashtra");
-			MapScriptToTypefaces["shrd"].Insert(0, "Noto Sans Sharada");
-			MapScriptToTypefaces["shaw"].Insert(0, "Noto Sans Shavian");
-			MapScriptToTypefaces["sinh"].Insert(0, "Noto Sans Sinhala");
-			MapScriptToTypefaces["sora"].Insert(0, "Noto Sans Sora Sompeng");
-			MapScriptToTypefaces["soyo"].Insert(0, "Noto Sans Soyombo");
-			MapScriptToTypefaces["sund"].Insert(0, "Noto Sans Sundanese");
-			MapScriptToTypefaces["sylo"].Insert(0, "Noto Sans Syloti Nagri");
-			MapScriptToTypefaces["zsym"].Insert(0, "Noto Sans Symbols");
-			MapScriptToTypefaces["syrn"].Insert(0, "Noto Sans Syriac Eastern");
-			MapScriptToTypefaces["syre"].Insert(0, "Noto Sans Syriac Estrangela");
-			MapScriptToTypefaces["syrj"].Insert(0, "Noto Sans Syriac Western");
-			MapScriptToTypefaces["tglg"].Insert(0, "Noto Sans Tagalog");
-			MapScriptToTypefaces["tagb"].Insert(0, "Noto Sans Tagbanwa");
-			MapScriptToTypefaces["tale"].Insert(0, "Noto Sans Tai Le");
-			MapScriptToTypefaces["lana"].Insert(0, "Noto Sans Tai Tham");
-			MapScriptToTypefaces["tavt"].Insert(0, "Noto Sans Tai Viet");
-			MapScriptToTypefaces["takr"].Insert(0, "Noto Sans Takri");
-			MapScriptToTypefaces["taml"].Insert(0, "Noto Sans Tamil");
-			MapScriptToTypefaces["telu"].Insert(0, "Noto Sans Telugu");
-			MapScriptToTypefaces["thaa"].Insert(0, "Noto Sans Thaana");
-			MapScriptToTypefaces["thai"].Insert(0, "Noto Sans Thai");
-			MapScriptToTypefaces["tfng"].Insert(0, "Noto Sans Tifinagh");
-			MapScriptToTypefaces["ugar"].Insert(0, "Noto Sans Ugaritic");
-			MapScriptToTypefaces["vaii"].Insert(0, "Noto Sans Vai");
-			MapScriptToTypefaces["wcho"].Insert(0, "Noto Sans Wancho");
-			MapScriptToTypefaces["wara"].Insert(0, "Noto Sans Warang Citi");
-			MapScriptToTypefaces["yiii"].Insert(0, "Noto Sans Yi");
-		}
-		public FallbackListFontMatcher(FontManager manager) : base(manager) { }
-		public override IEnumerable<Typeface> MatchScript(string script = null, bool distinctFamily = false) {
-			if (string.IsNullOrEmpty(script)) script = ScriptUtils.UltimateFallbackScript;
-			List<string> candidates;
-			IEnumerable<string> candidateScripts = new string[] { script };
-			while (candidateScripts != null) {
-				foreach (var candidateScript in candidateScripts) {
-					if (MapScriptToTypefaces.TryGetValue(candidateScript, out candidates)) {
-						foreach (var candidate in candidates) {
-							IReadOnlyCollection<Typeface> typefaces1;
-							if (Manager.MapFullNameToTypeface.TryGetValue(candidate, out typefaces1)) {
-								foreach (var typeface in typefaces1) {
-									yield return typeface;
-								}
-							}
-							if (distinctFamily) continue;
-							IReadOnlyCollection<Typeface> typefaces2;
-							if (Manager.MapNameToTypefaces.TryGetValue(candidate, out typefaces2)) {
-								foreach (var typeface in typefaces2) {
-									if (typefaces1.Contains(typeface)) continue;
-									yield return typeface;
-								}
-							}
-						}
+		IEnumerable<Typeface> EnumerateTypefaces(List<string> candidates, bool distinctFamily) {
+			foreach (var candidate in candidates) {
+				if (Manager.MapFullNameToTypeface.TryGetValue(candidate, out var typeface1)) {
+					yield return typeface1;
+				}
+				if (distinctFamily) continue;
+				if (Manager.MapNameToTypefaces.TryGetValue(candidate, out IReadOnlyCollection<Typeface> typefaces2)) {
+					foreach (var typeface in typefaces2) {
+						if (typeface1 == typeface) continue;
+						yield return typeface;
 					}
 				}
-				candidateScripts = ScriptUtils.EnumerateFallbackScripts(script);
 			}
 		}
 	}

Assets/Cryville/Common/Font/FontTable.cs

@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
+#pragma warning disable IDE0049
 namespace Cryville.Common.Font {
 	public abstract class FontTable<T> {
 		protected UInt32 Offset { get; private set; }
@@ -24,15 +25,18 @@ namespace Cryville.Common.Font {
 		readonly UInt16 majorVersion;
 		readonly UInt16 minorVersion;
 		readonly UInt32 numFonts;
-		readonly List<UInt32> tableDirectoryOffsets = new List<UInt32>();
+		readonly List<UInt32> tableDirectoryOffsets = new();
+#pragma warning disable IDE0052 // Reserved
 		readonly String dsigTag;
 		readonly UInt32 dsigLength;
 		readonly UInt32 dsigOffset;
+#pragma warning restore IDE0052 // Reserved
 		public TTCHeader(BinaryReader reader, UInt32 offset) : base(reader, offset) {
 			ttcTag = reader.ReadTag();
-			if (ttcTag != "ttcf") throw new NotImplementedException();
+			if (ttcTag != "ttcf") throw new NotSupportedException();
 			majorVersion = reader.ReadUInt16();
 			minorVersion = reader.ReadUInt16();
+			if (minorVersion != 0) throw new NotSupportedException();
 			numFonts = reader.ReadUInt32();
 			for (UInt32 i = 0; i < numFonts; i++) tableDirectoryOffsets.Add(reader.ReadUInt32());
 			if (majorVersion == 2) {
@@ -45,19 +49,23 @@ namespace Cryville.Common.Font {
 			return tableDirectoryOffsets;
 		}
 		public override TableDirectory GetSubTable(UInt32 item) {
-			var i = (UInt32)item;
+			var i = item;
 			return new TableDirectory(Reader, i);
 		}
 	}
 	public sealed class TableDirectory : FontTable<TableRecord, object> {
 		readonly UInt32 sfntVersion;
 		readonly UInt16 numTables;
+#pragma warning disable IDE0052 // Reserved
 		readonly UInt16 searchRange;
 		readonly UInt16 entrySelector;
 		readonly UInt16 rangeShift;
-		readonly List<TableRecord> tableRecords = new List<TableRecord>();
+#pragma warning restore IDE0052 // Reserved
+		readonly List<TableRecord> tableRecords = new();
 		public TableDirectory(BinaryReader reader, UInt32 offset) : base(reader, offset) {
 			sfntVersion = reader.ReadUInt32();
+			if (sfntVersion != 0x00010000 && sfntVersion != 0x4F54544F &&
+				sfntVersion != 0x74727565 && sfntVersion != 0x74797031) throw new NotSupportedException();
 			numTables = reader.ReadUInt16();
 			searchRange = reader.ReadUInt16();
 			entrySelector = reader.ReadUInt16();
@@ -73,13 +81,11 @@ namespace Cryville.Common.Font {
 		public override IReadOnlyList<TableRecord> GetItems() {
 			return tableRecords;
 		}
-		public override object GetSubTable(TableRecord item) {
-			switch (item.tableTag) {
-				case "name": return new NameTable(Reader, item.offset);
-				case "meta": return new MetaTable(Reader, item.offset);
-				default: throw new NotImplementedException();
-			}
-		}
+		public override object GetSubTable(TableRecord item) => item.tableTag switch {
+			"name" => new NameTable(Reader, item.offset),
+			"meta" => new MetaTable(Reader, item.offset),
+			_ => throw new NotImplementedException(),
+		};
 	}
 	public struct TableRecord {
 		public string tableTag;
@@ -91,56 +97,71 @@ namespace Cryville.Common.Font {
 		readonly UInt16 version;
 		readonly UInt16 count;
 		readonly UInt16 storageOffset;
-		readonly List<NameRecord> nameRecord = new List<NameRecord>();
+		readonly List<NameRecord> nameRecord = new();
 		readonly UInt16 langTagCount;
-		readonly List<LangTagRecord> langTagRecord = new List<LangTagRecord>();
+		readonly List<LangTagRecord> langTagRecord = new();
 		public NameTable(BinaryReader reader, UInt32 offset) : base(reader, offset) {
 			version = reader.ReadUInt16();
 			count = reader.ReadUInt16();
 			storageOffset = reader.ReadUInt16();
 			for (UInt16 i = 0; i < count; i++)
-				nameRecord.Add(new NameRecord {
-					platformID = reader.ReadUInt16(),
-					encodingID = reader.ReadUInt16(),
-					languageID = reader.ReadUInt16(),
-					nameID = (NameID)reader.ReadUInt16(),
-					length = reader.ReadUInt16(),
-					stringOffset = reader.ReadUInt16(),
-				});
+				nameRecord.Add(new NameRecord(
+					reader.ReadUInt16(),
+					reader.ReadUInt16(),
+					reader.ReadUInt16(),
+					(NameID)reader.ReadUInt16(),
+					reader.ReadUInt16(),
+					reader.ReadUInt16()
+				));
 			if (version == 1) {
 				langTagCount = reader.ReadUInt16();
 				for (UInt16 i = 0; i < langTagCount; i++)
-					langTagRecord.Add(new LangTagRecord {
-						length = reader.ReadUInt16(),
-						langTagOffset = reader.ReadUInt16(),
-					});
+					langTagRecord.Add(new LangTagRecord(
+						reader.ReadUInt16(),
+						reader.ReadUInt16()
+					));
+			}
+			foreach (var i in nameRecord)
+				i.Load(reader, offset + storageOffset);
+			if (version == 1) {
+				foreach (var i in langTagRecord)
+					i.Load(reader, offset + storageOffset);
 			}
-			UInt32 origin = (UInt32)reader.BaseStream.Position;
-			for (int i = 0; i < nameRecord.Count; i++) nameRecord[i] = nameRecord[i].Load(reader, origin);
-			for (int i = 0; i < langTagRecord.Count; i++) langTagRecord[i] = langTagRecord[i].Load(reader, origin);
 		}
 		public sealed override IReadOnlyList<NameRecord> GetItems() {
 			return nameRecord;
 		}
 	}
-	public struct NameRecord {
-		public UInt16 platformID;
-		public UInt16 encodingID;
-		public UInt16 languageID;
-		public NameID nameID;
-		public UInt16 length;
-		public UInt16 stringOffset;
-		public String value { get; private set; }
-		public NameRecord Load(BinaryReader reader, UInt32 origin) {
-			reader.BaseStream.Position = origin + stringOffset;
+	public class NameRecord {
+		public UInt16 PlatformID { get; private set; }
+		public UInt16 EncodingID { get; private set; }
+		public UInt16 LanguageID { get; private set; }
+		public NameID NameID { get; private set; }
+		public UInt16 Length { get; private set; }
+		public UInt16 StringOffset { get; private set; }
+		public String Value { get; private set; }
+		public NameRecord(UInt16 platformID, UInt16 encodingID, UInt16 languageID, NameID nameID, UInt16 length, UInt16 stringOffset) {
+			PlatformID = platformID;
+			EncodingID = encodingID;
+			LanguageID = languageID;
+			NameID = nameID;
+			Length = length;
+			StringOffset = stringOffset;
+		}
+		public void Load(BinaryReader reader, UInt32 origin) {
+			reader.BaseStream.Position = origin + StringOffset;
 			Encoding encoding;
-			switch (platformID) {
-				case 0: encoding = Encoding.BigEndianUnicode; break;
-				case 3: encoding = Encoding.BigEndianUnicode; break;
-				default: return this;
+			try {
+				switch (PlatformID) {
+					case 0: encoding = Encoding.BigEndianUnicode; break;
+					case 1: encoding = Encoding.GetEncoding(10000 + EncodingID); break;
+					case 3: encoding = Encoding.BigEndianUnicode; break;
+					default: return;
+				}
 			}
-			value = encoding.GetString(reader.ReadBytes(length));
-			return this;
+			catch (NotSupportedException) { return; }
+			catch (ArgumentException) { return; }
+			Value = encoding.GetString(reader.ReadBytes(Length));
 		}
 	}
 	public enum NameID : UInt16 {
@@ -171,47 +192,58 @@ namespace Cryville.Common.Font {
 		DarkBackgroundPalette          = 24,
 		VariationsPostScriptNamePrefix = 25,
 	}
-	public struct LangTagRecord {
-		public UInt16 length;
-		public UInt16 langTagOffset;
-		public String value { get; private set; }
-		public LangTagRecord Load(BinaryReader reader, UInt32 origin) {
-			reader.BaseStream.Position = origin + langTagOffset;
-			value = Encoding.BigEndianUnicode.GetString(reader.ReadBytes(length));
-			return this;
+	public class LangTagRecord {
+		public UInt16 Length { get; private set; }
+		public UInt16 LangTagOffset { get; private set; }
+		public String Value { get; private set; }
+		public LangTagRecord(UInt16 length, UInt16 langTagOffset) {
+			Length = length;
+			LangTagOffset = langTagOffset;
+		}
+		public void Load(BinaryReader reader, UInt32 origin) {
+			reader.BaseStream.Position = origin + LangTagOffset;
+			Value = Encoding.BigEndianUnicode.GetString(reader.ReadBytes(Length));
 		}
 	}
 	public sealed class MetaTable : FontTable<DataMap> {
 		readonly UInt32 version;
+#pragma warning disable IDE0052 // Reserved
 		readonly UInt32 flags;
+#pragma warning restore IDE0052 // Reserved
 		readonly UInt32 dataMapCount;
-		readonly List<DataMap> dataMaps = new List<DataMap>();
+		readonly List<DataMap> dataMaps = new();
 		public MetaTable(BinaryReader reader, UInt32 offset) : base(reader, offset) {
 			version = reader.ReadUInt32();
+			if (version != 1) throw new NotSupportedException();
 			flags = reader.ReadUInt32();
 			reader.ReadUInt32();
 			dataMapCount = reader.ReadUInt32();
 			for (UInt32 i = 0; i < dataMapCount; i++)
-				dataMaps.Add(new DataMap {
-					tag = reader.ReadTag(),
-					dataOffset = reader.ReadUInt32(),
-					dataLength = reader.ReadUInt32(),
-				});
-			for (int i = 0; i < dataMaps.Count; i++) dataMaps[i] = dataMaps[i].Load(reader, offset);
+				dataMaps.Add(new DataMap (
+					reader.ReadTag(),
+					reader.ReadUInt32(),
+					reader.ReadUInt32()
+				));
+			foreach (var i in dataMaps)
+				i.Load(reader, offset);
 		}
 		public sealed override IReadOnlyList<DataMap> GetItems() {
 			return dataMaps;
 		}
 	}
-	public struct DataMap {
-		public String tag;
-		public UInt32 dataOffset;
-		public UInt32 dataLength;
-		public String value { get; private set; }
-		public DataMap Load(BinaryReader reader, UInt32 origin) {
-			reader.BaseStream.Position = origin + dataOffset;
-			value = Encoding.ASCII.GetString(reader.ReadBytes((int)dataLength));
-			return this;
+	public class DataMap {
+		public String Tag { get; private set; }
+		public UInt32 DataOffset { get; private set; }
+		public UInt32 DataLength { get; private set; }
+		public String Value { get; private set; }
+		public DataMap(String tag, UInt32 dataOffset, UInt32 dataLength) {
+			Tag = tag;
+			DataOffset = dataOffset;
+			DataLength = dataLength;
+		}
+		public void Load(BinaryReader reader, UInt32 origin) {
+			reader.BaseStream.Position = origin + DataOffset;
+			Value = Encoding.ASCII.GetString(reader.ReadBytes((int)DataLength));
 		}
 	}
 	public static class BinaryReaderExtensions {

Assets/Cryville/Common/Font/Typeface.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 
 namespace Cryville.Common.Font {
@@ -23,9 +23,9 @@ namespace Cryville.Common.Font {
 		protected override void GetName(BinaryReader reader) {
 			var dir = new TableDirectory(reader, (uint)reader.BaseStream.Position);
 			var nameTable = (NameTable)dir.GetSubTable((from i in dir.GetItems() where i.tableTag == "name" select i).Single());
-			FamilyName = (from i in nameTable.GetItems() where i.nameID == NameID.FontFamilyName && i.value != null select i.value).First();
-			SubfamilyName = (from i in nameTable.GetItems() where i.nameID == NameID.FontSubfamilyName && i.value != null select i.value).First();
-			FullName = (from i in nameTable.GetItems() where i.nameID == NameID.FullFontName && i.value != null select i.value).First();
+			FamilyName = (from i in nameTable.GetItems() where i.NameID == NameID.FontFamilyName && i.Value != null select i.Value).First();
+			SubfamilyName = (from i in nameTable.GetItems() where i.NameID == NameID.FontSubfamilyName && i.Value != null select i.Value).First();
+			FullName = (from i in nameTable.GetItems() where i.NameID == NameID.FullFontName && i.Value != null select i.Value).First();
 		}
 	}
 }

Assets/Cryville/Common/IO/BinaryReaderBE.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text;
 

Assets/Cryville/Common/IOExtensions.cs

@@ -25,7 +25,7 @@ namespace Cryville.Common {
 		/// <param name="encoding">The encoding of the string.</param>
 		/// <returns>The string read from the reader.</returns>
 		public static string ReadUInt16String(this BinaryReader reader, Encoding encoding = null) {
-			if (encoding == null) encoding = Encoding.UTF8;
+			encoding ??= Encoding.UTF8;
 			var len = reader.ReadUInt16();
 			byte[] buffer = reader.ReadBytes(len);
 			return encoding.GetString(buffer);
@@ -38,7 +38,7 @@ namespace Cryville.Common {
 		/// <param name="value">The string to write by the writer.</param>
 		/// <param name="encoding">The encoding of the string.</param>
 		public static void WriteUInt16String(this BinaryWriter writer, string value, Encoding encoding = null) {
-			if (encoding == null) encoding = Encoding.UTF8;
+			encoding ??= Encoding.UTF8;
 			byte[] buffer = encoding.GetBytes(value);
 			writer.Write((ushort)buffer.Length);
 			writer.Write(buffer);

Assets/Cryville/Common/Identifier.cs

@@ -1,34 +1,35 @@
-using System;
+using System;
 
 namespace Cryville.Common {
 	public struct Identifier : IEquatable<Identifier> {
+		public static Identifier Empty = new(0);
 		public int Key { get; private set; }
-		public object Name { get { return IdentifierManager.SharedInstance.Retrieve(Key); } }
+		public readonly object Name => IdentifierManager.Shared.Retrieve(Key);
 		public Identifier(int key) {
 			Key = key;
 		}
 		public Identifier(object name) {
-			Key = IdentifierManager.SharedInstance.Request(name);
+			Key = IdentifierManager.Shared.Request(name);
 		}
-		public override bool Equals(object obj) {
-			if (obj == null || !(obj is Identifier)) return false;
-			return Equals((Identifier)obj);
+		public override readonly bool Equals(object obj) {
+			if (obj == null || obj is not Identifier other) return false;
+			return Equals(other);
 		}
-		public bool Equals(Identifier other) {
+		public readonly bool Equals(Identifier other) {
 			return Key == other.Key;
 		}
-		public override int GetHashCode() {
+		public override readonly int GetHashCode() {
 			return Key;
 		}
-		public override string ToString() {
+		public override readonly string ToString() {
 			if (Key == 0) return "";
 			return Name.ToString();
 		}
-		public static implicit operator Identifier(string identifier) {
-			return new Identifier(identifier);
+		public static bool operator ==(Identifier lhs, Identifier rhs) {
+			return lhs.Equals(rhs);
 		}
-		public static implicit operator string(Identifier identifier) {
-			return identifier.ToString();
+		public static bool operator !=(Identifier lhs, Identifier rhs) {
+			return !lhs.Equals(rhs);
 		}
 	}
 }