diff --git a/BetterLyrics.Plugins.Romaji/RomajiPlugin.cs b/BetterLyrics.Plugins.Romaji/RomajiPlugin.cs index 7402ca2..9280c8f 100644 --- a/BetterLyrics.Plugins.Romaji/RomajiPlugin.cs +++ b/BetterLyrics.Plugins.Romaji/RomajiPlugin.cs @@ -25,8 +25,8 @@ namespace BetterLyrics.Plugins.Romaji string? result = null; if (targetLangCode == "ja-latin") { - var lines = RomajiHelper.ToRomaji(text); - result = string.Join("\n", lines.Select(p => string.Join(" ", p.Units.Select(q => q.Romaji)))); + var lines = text.Split("\n"); + result = string.Join("\n", lines.Select(p => string.Join(" ", RomajiHelper.ToRomaji(p).FirstOrDefault()?.Units.Select(q => q.Romaji) ?? [""]))); } return Task.FromResult(result); } diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/PluginConfigs/BetterLyrics.Plugins.Romaji_TrimmingConfig.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/PluginConfigs/BetterLyrics.Plugins.Romaji_TrimmingConfig.cs index f460290..af2b617 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/PluginConfigs/BetterLyrics.Plugins.Romaji_TrimmingConfig.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/PluginConfigs/BetterLyrics.Plugins.Romaji_TrimmingConfig.cs @@ -17,13 +17,20 @@ internal static class BetterLyrics_Plugins_Romaji_Config [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Byte))] [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Char))] [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Collections.Generic.Dictionary<,>))] + [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Collections.Generic.EqualityComparer<>))] + [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Collections.Generic.ICollection<>))] [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Collections.Generic.IEnumerable<>))] [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Collections.Generic.IEnumerator<>))] + [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Collections.Generic.IList<>))] + [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Collections.Generic.IReadOnlyCollection<>))] + [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Collections.Generic.IReadOnlyList<>))] [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Collections.Generic.LinkedList<>))] [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Collections.Generic.LinkedListNode<>))] [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Collections.Generic.List<>))] + [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Collections.ICollection))] [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Collections.IEnumerable))] [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Collections.IEnumerator))] + [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Collections.IList))] [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Collections.ObjectModel.Collection<>))] [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Collections.ObjectModel.ObservableCollection<>))] [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.ComponentModel.INotifyPropertyChanged))] @@ -43,6 +50,7 @@ internal static class BetterLyrics_Plugins_Romaji_Config [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.IAsyncResult))] [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.IComparable<>))] [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.IDisposable))] + [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.IndexOutOfRangeException))] [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Int16))] [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Int32))] [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(System.Int64))]