Merge branch 'radical-file-changes' into 'main'

Radicals: remove duplicates and update replace glyphs See merge request Wacton/Desu!2
waacton · Jan 5, 2022 · 11ff816 · 11ff816
2 parents 75d54e3 + a329604
commit 11ff816
Show file tree

Hide file tree

Showing 46 changed files with 1,123 additions and 357 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: mcr.microsoft.com/dotnet/sdk:5.0
+image: mcr.microsoft.com/dotnet/sdk:6.0
 
 stages:
     - build

diff --git a/Desu.ExampleConsole/Desu.ExampleConsole.csproj b/Desu.ExampleConsole/Desu.ExampleConsole.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <ApplicationIcon>Desu.ico</ApplicationIcon>
     <AssemblyName>Wacton.Desu.ExampleConsole</AssemblyName>
     <RootNamespace>Wacton.Desu.ExampleConsole</RootNamespace>
     <Authors>William Acton</Authors>
     <Company>William Acton</Company>
-    <LangVersion>7.1</LangVersion>
+    <LangVersion>10</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Desu.ExampleWpf/Desu.ExampleWpf.csproj b/Desu.ExampleWpf/Desu.ExampleWpf.csproj
@@ -38,7 +38,7 @@
     <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Desu.ico</ApplicationIcon>
+    <ApplicationIcon>..\Desu\Resources\Desu.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -101,9 +101,6 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Desu.ico" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Desu\Desu.csproj">
       <Project>{6542d85e-dbfc-4d60-a643-e3c583182ef9}</Project>

diff --git a/Desu.ExampleWpf/Desu.ico b/Desu.ExampleWpf/Desu.ico
diff --git a/Desu.Tests/Desu.Tests.csproj b/Desu.Tests/Desu.Tests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 

diff --git a/Desu.Tests/GlyphReplacement.cs b/Desu.Tests/GlyphReplacement.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using System.Collections.Generic;
+using Wacton.Desu.Radicals;
+
+namespace Wacton.Desu.Tests
+{
+    public class GlyphReplacement
+    {
+        [Test]
+        public void ByString()
+        {
+            var input = "化个并刈込尚忙扎汁犯艾邦阡老杰礼疔禹初買滴乞";
+            var expected = "⺅𠆢丷⺉⻌⺌⺖⺘⺡⺨⺾⻏⻖⺹⺣⺭⽧⽱⻂⺲啇𠂉";
+            var actual = GlyphMap.Replace(input);
+            Assert.That(actual, Is.EqualTo(expected));
+        }
+
+        [Test]
+        public void ByList()
+        {
+            var input = new List<string> { "化", "个", "并", "刈", "込", "尚", "忙", "扎", "汁", "犯", "艾", "邦", "阡", "老", "杰", "礼", "疔", "禹", "初", "買", "滴", "乞" };
+            var expected = new List<string> { "⺅", "𠆢", "丷", "⺉", "⻌", "⺌", "⺖", "⺘", "⺡", "⺨", "⺾", "⻏", "⻖", "⺹", "⺣", "⺭", "⽧", "⽱", "⻂", "⺲", "啇", "𠂉" };
+            var actual = GlyphMap.Replace(input);
+            Assert.That(actual, Is.EqualTo(expected));
+        }
+    }
+}
diff --git a/Desu.Tests/JapaneseAssert.cs → Desu.Tests/Japanese/Assertions.cs b/Desu.Tests/JapaneseAssert.cs → Desu.Tests/Japanese/Assertions.cs
@@ -2,11 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using Wacton.Desu.Japanese;
-using Wacton.Desu.Tests.Japanese;
 
-namespace Wacton.Desu.Tests
+namespace Wacton.Desu.Tests.Japanese
 {
-    public static class JapaneseAssert
+    public static class Assertions
     {
         public static void AssertEntry(TestEntry testEntry, IEnumerable<IJapaneseEntry> japaneseEntries)
         {

diff --git a/Desu.Tests/Japanese/TestEntries.cs b/Desu.Tests/Japanese/TestEntries.cs
@@ -279,6 +279,11 @@ public static TestEntry Withコロナ()
             {
                 Text = "ウィズコロナ",
             };
+
+            var reading2 = new TestReading
+            {
+                Text = "ウイズコロナ",
+            };
 
             var sense1 = new TestSense
             {
@@ -295,7 +300,7 @@ public static TestEntry Withコロナ()
             {
                 Sequence = 2845709,
                 Kanjis = new List<IKanji> { kanji1 },
-                Readings = new List<IReading> { reading1 },
+                Readings = new List<IReading> { reading1, reading2 },
                 Senses = new List<ISense> { sense1 }
             };
 
@@ -437,6 +442,118 @@ public static TestEntry 九百()
 
             return testEntry;
         }
+
+        public static TestEntry 蘇格蘭()
+        {
+            var kanji1 = new TestKanji
+            {
+                Text = "蘇格蘭",
+                Informations = new List<KanjiInformation> {
+                    KanjiInformation("ateji (phonetic) reading"),
+                    KanjiInformation("rarely-used kanji form")
+                }
+            };
+
+            var reading1 = new TestReading
+            {
+                Text = "スコットランド",
+            };
+
+            var sense1 = new TestSense
+            {
+                PartsOfSpeech = new List<PartOfSpeech> { PartOfSpeech("noun (common) (futsuumeishi)") },
+                Miscellanea = new List<Miscellaneous> { Miscellaneous("word usually written using kana alone") },
+                Glosses = new List<Gloss> { new Gloss("Scotland", Language("eng"), null, null) }
+            };
+
+            var sense2 = new TestSense
+            {
+                Glosses = new List<Gloss> {
+                    new Gloss("Schotland", Language("dut"), null, null),
+                    new Gloss("{afk.} Sch.", Language("dut"), null, null)
+                }
+            };
+
+            var sense3 = new TestSense
+            {
+                Glosses = new List<Gloss> {
+                    new Gloss("Schottland (Nordteil Großbritanniens einschl. der Hebriden, Orkney- und Shetland-Inseln)", Language("ger"), null, null),
+                }
+            };
+
+            var sense4 = new TestSense
+            {
+                Glosses = new List<Gloss> { new Gloss("Шотландия", Language("rus"), null, null) }
+            };
+
+            var sense5 = new TestSense
+            {
+                Glosses = new List<Gloss> { new Gloss("escocia", Language("spa"), null, null) }
+            };
+
+            var sense6 = new TestSense
+            {
+                Glosses = new List<Gloss> { new Gloss("Skottland", Language("swe"), null, null) }
+            };
+
+            var testEntry = new TestEntry
+            {
+                Sequence = 1069140,
+                Kanjis = new List<IKanji> { kanji1 },
+                Readings = new List<IReading> { reading1 },
+                Senses = new List<ISense> { sense1, sense2, sense3, sense4, sense5, sense6 }
+            };
+
+            return testEntry;
+        }
+
+        public static TestEntry 羊水()
+        {
+            var kanji1 = new TestKanji
+            {
+                Text = "羊水",
+                Priorities = new List<Priority> { Priority("news2"), Priority("nf33") }
+            };
+
+            var reading1 = new TestReading
+            {
+                Text = "ようすい",
+                Priorities = new List<Priority> { Priority("news2"), Priority("nf33") }
+            };
+
+            var sense1 = new TestSense
+            {
+                PartsOfSpeech = new List<PartOfSpeech> { PartOfSpeech("noun (common) (futsuumeishi)") },
+                Fields = new List<Field> { Field("pathology") },
+                Glosses = new List<Gloss> { new Gloss("amniotic fluid", Language("eng"), null, null) }
+            };
+
+            var sense2 = new TestSense
+            {
+                Glosses = new List<Gloss> {
+                    new Gloss("Fruchtwasser", Language("ger"), null, null),
+                    new Gloss("Amnionflüssigkeit", Language("ger"), null, null),
+                    new Gloss("Liquor amnii", Language("ger"), null, null)
+                }
+            };
+
+            var sense3 = new TestSense
+            {
+                Glosses = new List<Gloss> {
+                    new Gloss("fostervatten", Language("swe"), null, null),
+                }
+            };
+
+            var testEntry = new TestEntry
+            {
+                Sequence = 1662330,
+                Kanjis = new List<IKanji> { kanji1 },
+                Readings = new List<IReading> { reading1 },
+                Senses = new List<ISense> { sense1, sense2, sense3 }
+            };
+
+            return testEntry;
+        }
 
         public static TestEntry タチ()
         {

diff --git a/Desu.Tests/JapaneseEntry.cs b/Desu.Tests/JapaneseEntry.cs
@@ -16,30 +16,36 @@ public void Setup()
         }
 
         [Test]
-        public void 食べる() => JapaneseAssert.AssertEntry(TestEntries.食べる(), japaneseEntries);
+        public void 食べる() => Assertions.AssertEntry(TestEntries.食べる(), japaneseEntries);
 
         [Test]
-        public void 々() => JapaneseAssert.AssertEntry(TestEntries.々(), japaneseEntries);
+        public void 々() => Assertions.AssertEntry(TestEntries.々(), japaneseEntries);
 
         [Test]
-        public void βカロテン() => JapaneseAssert.AssertEntry(TestEntries.βカロテン(), japaneseEntries);
+        public void βカロテン() => Assertions.AssertEntry(TestEntries.βカロテン(), japaneseEntries);
 
         [Test]
-        public void Withコロナ() => JapaneseAssert.AssertEntry(TestEntries.Withコロナ(), japaneseEntries);
+        public void Withコロナ() => Assertions.AssertEntry(TestEntries.Withコロナ(), japaneseEntries);
 
         [Test]
-        public void サーターアンダギー() => JapaneseAssert.AssertEntry(TestEntries.サーターアンダギー(), japaneseEntries);
+        public void サーターアンダギー() => Assertions.AssertEntry(TestEntries.サーターアンダギー(), japaneseEntries);
 
         [Test]
-        public void 九百() => JapaneseAssert.AssertEntry(TestEntries.九百(), japaneseEntries);
+        public void 九百() => Assertions.AssertEntry(TestEntries.九百(), japaneseEntries);
+
+        [Test]
+        public void 蘇格蘭() => Assertions.AssertEntry(TestEntries.蘇格蘭(), japaneseEntries);
+
+        [Test]
+        public void 羊水() => Assertions.AssertEntry(TestEntries.羊水(), japaneseEntries);
 
         [Test]
-        public void タチ() => JapaneseAssert.AssertEntry(TestEntries.タチ(), japaneseEntries);
+        public void タチ() => Assertions.AssertEntry(TestEntries.タチ(), japaneseEntries);
 
         [Test]
-        public void コンビナートキャンペーン() => JapaneseAssert.AssertEntry(TestEntries.コンビナートキャンペーン(), japaneseEntries);
+        public void コンビナートキャンペーン() => Assertions.AssertEntry(TestEntries.コンビナートキャンペーン(), japaneseEntries);
 
         [Test]
-        public void ヽ() => JapaneseAssert.AssertEntry(TestEntries.ヽ(), japaneseEntries); // first entry in JMdict
+        public void ヽ() => Assertions.AssertEntry(TestEntries.ヽ(), japaneseEntries); // first entry in JMdict
     }
 }
diff --git a/Desu.Tests/JapaneseEntryAsync.cs b/Desu.Tests/JapaneseEntryAsync.cs
@@ -17,30 +17,36 @@ public async Task Setup()
         }
 
         [Test]
-        public void 食べる() => JapaneseAssert.AssertEntry(TestEntries.食べる(), japaneseEntries);
+        public void 食べる() => Assertions.AssertEntry(TestEntries.食べる(), japaneseEntries);
 
         [Test]
-        public void 々() => JapaneseAssert.AssertEntry(TestEntries.々(), japaneseEntries);
+        public void 々() => Assertions.AssertEntry(TestEntries.々(), japaneseEntries);
 
         [Test]
-        public void βカロテン() => JapaneseAssert.AssertEntry(TestEntries.βカロテン(), japaneseEntries);
+        public void βカロテン() => Assertions.AssertEntry(TestEntries.βカロテン(), japaneseEntries);
 
         [Test]
-        public void Withコロナ() => JapaneseAssert.AssertEntry(TestEntries.Withコロナ(), japaneseEntries);
+        public void Withコロナ() => Assertions.AssertEntry(TestEntries.Withコロナ(), japaneseEntries);
 
         [Test]
-        public void サーターアンダギー() => JapaneseAssert.AssertEntry(TestEntries.サーターアンダギー(), japaneseEntries);
+        public void サーターアンダギー() => Assertions.AssertEntry(TestEntries.サーターアンダギー(), japaneseEntries);
 
         [Test]
-        public void 九百() => JapaneseAssert.AssertEntry(TestEntries.九百(), japaneseEntries);
+        public void 九百() => Assertions.AssertEntry(TestEntries.九百(), japaneseEntries);
+
+        [Test]
+        public void 蘇格蘭() => Assertions.AssertEntry(TestEntries.蘇格蘭(), japaneseEntries);
+
+        [Test]
+        public void 羊水() => Assertions.AssertEntry(TestEntries.羊水(), japaneseEntries);
 
         [Test]
-        public void タチ() => JapaneseAssert.AssertEntry(TestEntries.タチ(), japaneseEntries);
+        public void タチ() => Assertions.AssertEntry(TestEntries.タチ(), japaneseEntries);
 
         [Test]
-        public void コンビナートキャンペーン() => JapaneseAssert.AssertEntry(TestEntries.コンビナートキャンペーン(), japaneseEntries);
+        public void コンビナートキャンペーン() => Assertions.AssertEntry(TestEntries.コンビナートキャンペーン(), japaneseEntries);
 
         [Test]
-        public void ヽ() => JapaneseAssert.AssertEntry(TestEntries.ヽ(), japaneseEntries); // first entry in JMdict
+        public void ヽ() => Assertions.AssertEntry(TestEntries.ヽ(), japaneseEntries); // first entry in JMdict
     }
 }
diff --git a/Desu.Tests/KanjiAssert.cs → Desu.Tests/Kanji/Assertions.cs b/Desu.Tests/KanjiAssert.cs → Desu.Tests/Kanji/Assertions.cs
@@ -2,11 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using Wacton.Desu.Kanji;
-using Wacton.Desu.Tests.Kanji;
 
-namespace Wacton.Desu.Tests
+namespace Wacton.Desu.Tests.Kanji
 {
-    public static class KanjiAssert
+    public static class Assertions
     {
         public static void AssertEntry(TestEntry testEntry, IEnumerable<IKanjiEntry> kanjiEntries)
         {