HOME 1 year ago
parent
commit
ab7ed677e8
2 changed files with 15 additions and 9 deletions
  1. 15 2
      BeatLyrics.Tool/Utils/JapanesePhonetic.cs
  2. 0 7
      BeatLyrics.sln

+ 15 - 2
BeatLyrics.Tool/Utils/JapanesePhonetic.cs

@@ -141,8 +141,8 @@ namespace BeatLyrics.Tool.Utils
                         var hira2 = match.Groups[4].Value;
 
                         // 聞き飽き
-                        if (match.Groups.Count == 5 
-                            && Enumerable.Range(1, 4).All(p => match.Groups[p].Value.Length == 1) 
+                        if (match.Groups.Count == 5
+                            && Enumerable.Range(1, 4).All(p => match.Groups[p].Value.Length == 1)
                             && hira1 == hira2 && displayText.Length == yomiText.Length)
                         {
                             lst.Add(new TextTuple { Text = displayText[0].ToString(), Ruby = yomiText[0].ToString() });
@@ -152,6 +152,19 @@ namespace BeatLyrics.Tool.Utils
                             continue;
                         }
 
+                        //聞き届  け
+                        //ききとどけ
+                        if (match.Groups.Count == 5
+                            && Enumerable.Range(1, 4).All(p => match.Groups[p].Value.Length == 1)
+                            && displayText.Length + 1 == yomiText.Length && yomiText[0] == yomiText[1])
+                        {
+                            lst.Add(new TextTuple { Text = displayText[0].ToString(), Ruby = yomiText[0].ToString() });
+                            lst.Add(new TextTuple { Text = hira1, Ruby = hira1 });
+                            lst.Add(new TextTuple { Text = displayText[2].ToString(), Ruby = yomiText[2].ToString() + yomiText[3] });
+                            lst.Add(new TextTuple { Text = hira2, Ruby = hira2 });
+                            continue;
+                        }
+
                         var split = yomiText.Split(new[] { hira1, hira2 }, StringSplitOptions.RemoveEmptyEntries);
 
                         lst.Add(new TextTuple { Text = kan1, Ruby = split[0] });

+ 0 - 7
BeatLyrics.sln

@@ -14,12 +14,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "@", "@", "{A8D98CA3-D10A-4E
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "BeatLyrics.Shared", "BeatLyrics.Shared\BeatLyrics.Shared.shproj", "{BE605F1F-F452-404C-98B0-364BCB14F3C0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BsYurHttpStatus", "..\BeatWidget\BsYurHttpStatus\BsYurHttpStatus.csproj", "{4515D1ED-3E8A-4C1A-AB32-BC1F54EAF0DF}"
-EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		BeatLyrics.Shared\BeatLyrics.Shared.projitems*{159ec5ec-9340-4cc1-9c09-4b0cca902b82}*SharedItemsImports = 5
-		..\BeatWidget\BsWidgetShareCodes\BsWidgetShareCodes.projitems*{4515d1ed-3e8a-4c1a-ab32-bc1f54eaf0df}*SharedItemsImports = 5
 		BeatLyrics.Shared\BeatLyrics.Shared.projitems*{be605f1f-f452-404c-98b0-364bcb14f3c0}*SharedItemsImports = 13
 		BeatLyrics.Shared\BeatLyrics.Shared.projitems*{e50656df-85a0-4a37-8f64-618d2dcac8d8}*SharedItemsImports = 4
 	EndGlobalSection
@@ -36,10 +33,6 @@ Global
 		{E50656DF-85A0-4A37-8F64-618D2DCAC8D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E50656DF-85A0-4A37-8F64-618D2DCAC8D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E50656DF-85A0-4A37-8F64-618D2DCAC8D8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4515D1ED-3E8A-4C1A-AB32-BC1F54EAF0DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4515D1ED-3E8A-4C1A-AB32-BC1F54EAF0DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4515D1ED-3E8A-4C1A-AB32-BC1F54EAF0DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4515D1ED-3E8A-4C1A-AB32-BC1F54EAF0DF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE