diff --git a/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Formats/LrcEncoderTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Formats/LrcEncoderTest.cs
index 779bc1792..6e0fd8583 100644
--- a/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Formats/LrcEncoderTest.cs
+++ b/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Formats/LrcEncoderTest.cs
@@ -26,7 +26,7 @@ public void TestDecodeEncodedBeatmap(string fileName)
{
var decoded = decode(fileName, out var encoded);
- // Note : this test case does not cover ruby and romaji property
+ // Note : this test case does not cover ruby property
Assert.That(decoded.HitObjects.Count, Is.EqualTo(encoded.HitObjects.Count));
Assert.That(encoded.Serialize(), Is.EqualTo(decoded.Serialize()));
}
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Helper/TestCaseTagHelper.cs b/osu.Game.Rulesets.Karaoke.Tests/Helper/TestCaseTagHelper.cs
index 5e74455b8..f55692a6d 100644
--- a/osu.Game.Rulesets.Karaoke.Tests/Helper/TestCaseTagHelper.cs
+++ b/osu.Game.Rulesets.Karaoke.Tests/Helper/TestCaseTagHelper.cs
@@ -222,7 +222,7 @@ public static Lyric ParseLyricWithTimeTag(string? str)
///
///
/// [0]name:singer001 -> singer with id and name.
- /// [0]romaji:singer001 -> singer with id and romaji.
+ /// [0]romanisation:singer001 -> singer with id and romanisation.
/// [0]eg:singer001 -> singer with id and english name.
///
/// Singer string format
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Objects/LyricTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Objects/LyricTest.cs
index af3b66800..9b71f6c39 100644
--- a/osu.Game.Rulesets.Karaoke.Tests/Objects/LyricTest.cs
+++ b/osu.Game.Rulesets.Karaoke.Tests/Objects/LyricTest.cs
@@ -161,7 +161,7 @@ public void TestReferenceLyricPropertyChanged()
public void TestReferenceLyricListPropertyChanged()
{
// test modify property inside the list.
- // ruby, romaji tag time-tag.
+ // e.g. ruby, time-tag and romanisation.
var timeTag = TestCaseTagHelper.ParseTimeTag("[0,start]:1100#^ka");
var rubyTag = TestCaseTagHelper.ParseRubyTag("[0]:か");
@@ -191,12 +191,12 @@ public void TestReferenceLyricListPropertyChanged()
// and because there's no change inside the tag, so there's version change.
Assert.AreEqual(0, lyric.TimeTagsTimingVersion.Value);
- Assert.AreEqual(0, lyric.TimeTagsRomajiVersion.Value);
+ Assert.AreEqual(0, lyric.TimeTagsRomanisationVersion.Value);
Assert.AreEqual(0, lyric.RubyTagsVersion.Value);
// it's time to change the property in the list.
timeTag.Time = 2000;
- timeTag.RomanisedSyllable = "romaji";
+ timeTag.RomanisedSyllable = "ka--";
rubyTag.Text = "ruby";
// property should be equal.
@@ -205,7 +205,7 @@ public void TestReferenceLyricListPropertyChanged()
// and note that because only one property is different, so version should change once.
Assert.AreEqual(1, lyric.TimeTagsTimingVersion.Value);
- Assert.AreEqual(1, lyric.TimeTagsRomajiVersion.Value);
+ Assert.AreEqual(1, lyric.TimeTagsRomanisationVersion.Value);
Assert.AreEqual(1, lyric.RubyTagsVersion.Value);
}
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneLyricEditorScreen.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneLyricEditorScreen.cs
index c62f28f05..e3eac667d 100644
--- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneLyricEditorScreen.cs
+++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneLyricEditorScreen.cs
@@ -87,7 +87,7 @@ public void TestEditTimeTagMode()
}
[Test]
- public void TestEditRomajiMode()
+ public void TestEditRomanisation()
{
switchToMode(LyricEditorMode.EditRomanisation);
clickEditStepButtons();
diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/KaraokeLegacyBeatmapDecoder.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/KaraokeLegacyBeatmapDecoder.cs
index 62a900fd5..c7c1ae2fb 100644
--- a/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/KaraokeLegacyBeatmapDecoder.cs
+++ b/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/KaraokeLegacyBeatmapDecoder.cs
@@ -50,7 +50,7 @@ protected override void ParseLine(Beatmap beatmap, Section section, string line)
return;
}
- if (line.ToLower().StartsWith("@ruby", StringComparison.Ordinal) || line.ToLower().StartsWith("@romaji", StringComparison.Ordinal))
+ if (line.ToLower().StartsWith("@ruby", StringComparison.Ordinal))
{
// lrc queue
lrcLines.Add(line);
diff --git a/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetEditCheckerConfigManager.cs b/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetEditCheckerConfigManager.cs
index 6e7b2ebb6..6dc7c4e78 100644
--- a/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetEditCheckerConfigManager.cs
+++ b/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetEditCheckerConfigManager.cs
@@ -14,7 +14,6 @@ protected override void InitialiseDefaults()
// Lyric
SetDefault(KaraokeRulesetEditCheckerSetting.LyricRubyPositionSorting, RubyTagsUtils.Sorting.Asc);
- SetDefault(KaraokeRulesetEditCheckerSetting.LyricRomajiPositionSorting, RubyTagsUtils.Sorting.Asc);
SetDefault(KaraokeRulesetEditCheckerSetting.LyricTimeTagTimeSelfCheck, SelfCheck.BasedOnStart);
SetDefault(KaraokeRulesetEditCheckerSetting.LyricTimeTagTimeGroupCheck, GroupCheck.Asc);
}
@@ -23,7 +22,6 @@ protected override void InitialiseDefaults()
public enum KaraokeRulesetEditCheckerSetting
{
LyricRubyPositionSorting,
- LyricRomajiPositionSorting,
LyricTimeTagTimeSelfCheck,
LyricTimeTagTimeGroupCheck,
}
diff --git a/osu.Game.Rulesets.Karaoke/Graphics/Sprites/Processor/BaseDisplayProcessor.cs b/osu.Game.Rulesets.Karaoke/Graphics/Sprites/Processor/BaseDisplayProcessor.cs
index 1520bf5cb..264f219db 100644
--- a/osu.Game.Rulesets.Karaoke/Graphics/Sprites/Processor/BaseDisplayProcessor.cs
+++ b/osu.Game.Rulesets.Karaoke/Graphics/Sprites/Processor/BaseDisplayProcessor.cs
@@ -87,7 +87,7 @@ protected class AvailableProperty : IDisposable
public readonly IBindable RubyTagsVersion = new Bindable();
public readonly IBindable TextBindable = new Bindable();
public readonly IBindableList TimeTagsBindable = new BindableList();
- public readonly IBindable TimeTagsRomajiVersion = new Bindable();
+ public readonly IBindable TimeTagsRomanisationVersion = new Bindable();
public readonly IBindable TimeTagsTimingVersion = new Bindable();
public AvailableProperty(Lyric lyric)
@@ -96,7 +96,7 @@ public AvailableProperty(Lyric lyric)
RubyTagsVersion.BindTo(lyric.RubyTagsVersion);
TextBindable.BindTo(lyric.TextBindable);
TimeTagsBindable.BindTo(lyric.TimeTagsBindable);
- TimeTagsRomajiVersion.BindTo(lyric.TimeTagsRomajiVersion);
+ TimeTagsRomanisationVersion.BindTo(lyric.TimeTagsRomanisationVersion);
TimeTagsTimingVersion.BindTo(lyric.TimeTagsTimingVersion);
}
@@ -106,7 +106,7 @@ public void Dispose()
RubyTagsVersion.UnbindAll();
TextBindable.UnbindAll();
TimeTagsBindable.UnbindAll();
- TimeTagsRomajiVersion.UnbindAll();
+ TimeTagsRomanisationVersion.UnbindAll();
TimeTagsTimingVersion.UnbindAll();
}
}
diff --git a/osu.Game.Rulesets.Karaoke/Graphics/Sprites/Processor/LyricFirstDisplayProcessor.cs b/osu.Game.Rulesets.Karaoke/Graphics/Sprites/Processor/LyricFirstDisplayProcessor.cs
index a5a8835e8..2f7a33abd 100644
--- a/osu.Game.Rulesets.Karaoke/Graphics/Sprites/Processor/LyricFirstDisplayProcessor.cs
+++ b/osu.Game.Rulesets.Karaoke/Graphics/Sprites/Processor/LyricFirstDisplayProcessor.cs
@@ -40,7 +40,7 @@ protected override void ProcessBindableChange(AvailableProperty property)
UpdateBottomText();
UpdateTimeTags();
});
- property.TimeTagsRomajiVersion.BindValueChanged(_ =>
+ property.TimeTagsRomanisationVersion.BindValueChanged(_ =>
{
UpdateBottomText();
});
diff --git a/osu.Game.Rulesets.Karaoke/Graphics/Sprites/Processor/RomanisedSyllableFirstDisplayProcessor.cs b/osu.Game.Rulesets.Karaoke/Graphics/Sprites/Processor/RomanisedSyllableFirstDisplayProcessor.cs
index f59c1c075..ef58c6057 100644
--- a/osu.Game.Rulesets.Karaoke/Graphics/Sprites/Processor/RomanisedSyllableFirstDisplayProcessor.cs
+++ b/osu.Game.Rulesets.Karaoke/Graphics/Sprites/Processor/RomanisedSyllableFirstDisplayProcessor.cs
@@ -38,7 +38,7 @@ protected override void ProcessBindableChange(AvailableProperty property)
// Ruby change might affect the center text, which will affect all property.
UpdateAll();
});
- property.TimeTagsRomajiVersion.BindValueChanged(_ =>
+ property.TimeTagsRomanisationVersion.BindValueChanged(_ =>
{
// Ruby change might affect the center text, which will affect all property.
UpdateAll();
diff --git a/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs b/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs
index e8f628578..c5e942992 100644
--- a/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs
+++ b/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs
@@ -108,7 +108,7 @@ public override IEnumerable GetDefaultKeyBindings(int variant = 0) =
new KeyBinding(new[] { InputKey.Alt, InputKey.BracketLeft }, KaraokeEditAction.PreviousEditMode),
new KeyBinding(new[] { InputKey.Alt, InputKey.BracketRight }, KaraokeEditAction.NextEditMode),
- // Edit Ruby / romaji tag.
+ // Edit Ruby tag.
new KeyBinding(new[] { InputKey.Z, InputKey.Left }, KaraokeEditAction.EditRubyTagReduceStartIndex),
new KeyBinding(new[] { InputKey.Z, InputKey.Right }, KaraokeEditAction.EditRubyTagIncreaseStartIndex),
new KeyBinding(new[] { InputKey.X, InputKey.Left }, KaraokeEditAction.EditRubyTagReduceEndIndex),
diff --git a/osu.Game.Rulesets.Karaoke/Objects/Lyric_Binding.cs b/osu.Game.Rulesets.Karaoke/Objects/Lyric_Binding.cs
index 05574bdff..fdc3c25fb 100644
--- a/osu.Game.Rulesets.Karaoke/Objects/Lyric_Binding.cs
+++ b/osu.Game.Rulesets.Karaoke/Objects/Lyric_Binding.cs
@@ -25,9 +25,9 @@ public partial class Lyric
private readonly Bindable timeTagsTimingVersion = new();
[JsonIgnore]
- public IBindable TimeTagsRomajiVersion => timeTagsRomajiVersion;
+ public IBindable TimeTagsRomanisationVersion => timeTagsRomanisationVersion;
- private readonly Bindable timeTagsRomajiVersion = new();
+ private readonly Bindable timeTagsRomanisationVersion = new();
[JsonIgnore]
public IBindable RubyTagsVersion => rubyTagsVersion;
@@ -56,7 +56,7 @@ private void initInternalBindingEvent()
foreach (var c in args.NewItems.Cast())
{
c.TimingChanged += timingInvalidate;
- c.SyllableChanged += romajiInvalidate;
+ c.SyllableChanged += romanisationInvalidate;
}
break;
@@ -68,7 +68,7 @@ private void initInternalBindingEvent()
foreach (var c in args.OldItems.Cast())
{
c.TimingChanged -= timingInvalidate;
- c.SyllableChanged -= romajiInvalidate;
+ c.SyllableChanged -= romanisationInvalidate;
}
break;
@@ -77,7 +77,7 @@ private void initInternalBindingEvent()
updateLyricTime();
void timingInvalidate() => timeTagsTimingVersion.Value++;
- void romajiInvalidate() => timeTagsRomajiVersion.Value++;
+ void romanisationInvalidate() => timeTagsRomanisationVersion.Value++;
};
TimeTagsTimingVersion.ValueChanged += _ =>
@@ -191,7 +191,7 @@ private void initReferenceLyricEvent()
});
}, false);
- bindValueChange(e, l => l.TimeTagsRomajiVersion, (_, config) =>
+ bindValueChange(e, l => l.TimeTagsRomanisationVersion, (_, config) =>
{
if (config is not SyncLyricConfig syncLyricConfig || !syncLyricConfig.SyncTimeTagProperty)
return;
diff --git a/osu.Game.Rulesets.Karaoke/Objects/TimeTag.cs b/osu.Game.Rulesets.Karaoke/Objects/TimeTag.cs
index 0b08864f5..a2a4066af 100644
--- a/osu.Game.Rulesets.Karaoke/Objects/TimeTag.cs
+++ b/osu.Game.Rulesets.Karaoke/Objects/TimeTag.cs
@@ -53,12 +53,12 @@ public double? Time
public readonly Bindable FirstSyllableBindable = new();
///
- /// Mark if this romaji is the first letter of the romaji word.
+ /// Mark if this romanised syllable is the first letter of the romanisation.
///
///
/// There's the Japanese lyric:
/// 枯れた世界に輝く
- /// There's the Romaji:
+ /// There's the romanisation:
/// kareta sekai ni kagayaku.
/// And it will be separated as:
/// ka|re|ta se|kai ni ka|ga|ya|ku.
@@ -75,8 +75,11 @@ public bool FirstSyllable
public readonly Bindable RomanisedSyllableBindable = new();
///
- /// Romaji
+ /// Romanised syllable
///
+ ///
+ /// Ka, ra, o, ke.
+ ///
public string? RomanisedSyllable
{
get => RomanisedSyllableBindable.Value;
diff --git a/osu.Game.Rulesets.Karaoke/Objects/Utils/LyricUtils.cs b/osu.Game.Rulesets.Karaoke/Objects/Utils/LyricUtils.cs
index d71574f42..31e7f08eb 100644
--- a/osu.Game.Rulesets.Karaoke/Objects/Utils/LyricUtils.cs
+++ b/osu.Game.Rulesets.Karaoke/Objects/Utils/LyricUtils.cs
@@ -33,7 +33,8 @@ public static void RemoveText(Lyric lyric, int charGap, int count = 1)
if (charGap + count >= textLength)
count = textLength - charGap;
- // deal with ruby and romaji, might remove and shifting.
+ // deal with ruby and romanisation.
+ // might remove and shifting.
lyric.RubyTags = processTags(lyric.RubyTags, charGap, count);
lyric.TimeTags = processTimeTags(lyric.TimeTags, charGap, count);
@@ -88,7 +89,7 @@ public static void AddText(Lyric lyric, int charGap, string text)
if (offset == 0)
return;
- // deal with ruby and romaji with shifting.
+ // deal with ruby and romanisation with shifting.
lyric.RubyTags = processTags(lyric.RubyTags, charGap, offset);
lyric.TimeTags = processTimeTags(lyric.TimeTags, charGap, offset);
diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/PreviewKaraokeSpriteText.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/PreviewKaraokeSpriteText.cs
index 730d85aa0..da09e6704 100644
--- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/PreviewKaraokeSpriteText.cs
+++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/PreviewKaraokeSpriteText.cs
@@ -225,11 +225,11 @@ private void load(ISkinSource skin, ShaderManager? shaderManager)
// Apply text font info
var lyricFont = newConfig.MainTextFont;
var rubyFont = newConfig.RubyTextFont;
- var romajiFont = newConfig.RomanisationTextFont;
+ var romanisationTextFont = newConfig.RomanisationTextFont;
Font = getFont(lyricFont.Size);
TopTextFont = getFont(rubyFont.Size);
- BottomTextFont = getFont(romajiFont.Size);
+ BottomTextFont = getFont(romanisationTextFont.Size);
triggerSizeChangedEvent();
@@ -251,6 +251,6 @@ public Vector2 GetTimeTagPosition(TextIndex index)
return TextIndexUtils.GetValueByState(index, drawRectangle.BottomLeft, drawRectangle.BottomRight);
}
- // todo: get romanization position.
+ // todo: get romanisation position.
}
}
diff --git a/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/ConfigScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/ConfigScreen.cs
index 72bbfac0b..45243a9e3 100644
--- a/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/ConfigScreen.cs
+++ b/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/ConfigScreen.cs
@@ -28,7 +28,7 @@ protected override Section[] CreatePropertiesContainer()
{
new IntervalSection(),
new PositionSection(),
- new RubyRomajiSection(),
+ new RubyAndRomanisationSection(),
};
protected override Container CreatePreviewArea()
diff --git a/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/IntervalSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/IntervalSection.cs
index fe45ea69c..bcffdcc15 100644
--- a/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/IntervalSection.cs
+++ b/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/IntervalSection.cs
@@ -12,7 +12,7 @@ internal partial class IntervalSection : LyricConfigSection
{
private readonly LabelledRealTimeSliderBar lyricIntervalSliderBar;
private readonly LabelledRealTimeSliderBar rubyIntervalSliderBar;
- private readonly LabelledRealTimeSliderBar romajiIntervalSliderBar;
+ private readonly LabelledRealTimeSliderBar romanisationIntervalSliderBar;
protected override LocalisableString Title => "Interval";
@@ -44,10 +44,10 @@ public IntervalSection()
Default = 10,
},
},
- romajiIntervalSliderBar = new LabelledRealTimeSliderBar
+ romanisationIntervalSliderBar = new LabelledRealTimeSliderBar
{
- Label = "Romaji interval",
- Description = "Romaji interval section",
+ Label = "Romanisation interval",
+ Description = "Romanisation interval section",
Current = new BindableNumber
{
MinValue = 0,
@@ -67,7 +67,7 @@ private void load(LyricFontInfoManager lyricFontInfoManager)
var lyricFontInfo = e.NewValue;
applyCurrent(lyricIntervalSliderBar.Current, lyricFontInfo.LyricsInterval);
applyCurrent(rubyIntervalSliderBar.Current, lyricFontInfo.RubyInterval);
- applyCurrent(romajiIntervalSliderBar.Current, lyricFontInfo.RomanisationInterval);
+ applyCurrent(romanisationIntervalSliderBar.Current, lyricFontInfo.RomanisationInterval);
static void applyCurrent(Bindable bindable, T value)
=> bindable.Value = bindable.Default = value;
@@ -75,6 +75,6 @@ static void applyCurrent(Bindable bindable, T value)
lyricIntervalSliderBar.Current.BindValueChanged(x => lyricFontInfoManager.ApplyCurrentLyricFontInfoChange(l => l.LyricsInterval = x.NewValue));
rubyIntervalSliderBar.Current.BindValueChanged(x => lyricFontInfoManager.ApplyCurrentLyricFontInfoChange(l => l.RubyInterval = x.NewValue));
- romajiIntervalSliderBar.Current.BindValueChanged(x => lyricFontInfoManager.ApplyCurrentLyricFontInfoChange(l => l.RomanisationInterval = x.NewValue));
+ romanisationIntervalSliderBar.Current.BindValueChanged(x => lyricFontInfoManager.ApplyCurrentLyricFontInfoChange(l => l.RomanisationInterval = x.NewValue));
}
}
diff --git a/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/RubyRomajiSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/RubyAndRomanisationSection.cs
similarity index 67%
rename from osu.Game.Rulesets.Karaoke/Screens/Skin/Config/RubyRomajiSection.cs
rename to osu.Game.Rulesets.Karaoke/Screens/Skin/Config/RubyAndRomanisationSection.cs
index 39682fff5..91f69ffef 100644
--- a/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/RubyRomajiSection.cs
+++ b/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/RubyAndRomanisationSection.cs
@@ -11,16 +11,16 @@
namespace osu.Game.Rulesets.Karaoke.Screens.Skin.Config;
-internal partial class RubyRomajiSection : LyricConfigSection
+internal partial class RubyAndRomanisationSection : LyricConfigSection
{
private readonly LabelledEnumDropdown rubyAlignmentDropdown;
- private readonly LabelledEnumDropdown romajiAlignmentDropdown;
+ private readonly LabelledEnumDropdown romanisationAlignmentDropdown;
private readonly LabelledRealTimeSliderBar rubyMarginSliderBar;
- private readonly LabelledRealTimeSliderBar romajiMarginSliderBar;
+ private readonly LabelledRealTimeSliderBar romanisationMarginSliderBar;
- protected override LocalisableString Title => "Ruby/Romaji";
+ protected override LocalisableString Title => "Ruby/Romanisation";
- public RubyRomajiSection()
+ public RubyAndRomanisationSection()
{
Children = new Drawable[]
{
@@ -29,10 +29,10 @@ public RubyRomajiSection()
Label = "Ruby alignment",
Description = "Ruby alignment section",
},
- romajiAlignmentDropdown = new LabelledEnumDropdown
+ romanisationAlignmentDropdown = new LabelledEnumDropdown
{
- Label = "Romaji alignment",
- Description = "Romaji alignment section",
+ Label = "Romanisation alignment",
+ Description = "Romanisation alignment section",
},
rubyMarginSliderBar = new LabelledRealTimeSliderBar
{
@@ -46,10 +46,10 @@ public RubyRomajiSection()
Default = 10,
},
},
- romajiMarginSliderBar = new LabelledRealTimeSliderBar
+ romanisationMarginSliderBar = new LabelledRealTimeSliderBar
{
- Label = "Romaji margin",
- Description = "Romaji margin section",
+ Label = "Romanisation margin",
+ Description = "Romanisation margin section",
Current = new BindableNumber
{
MinValue = 0,
@@ -68,17 +68,17 @@ private void load(LyricFontInfoManager lyricFontInfoManager)
{
var lyricFontInfo = e.NewValue;
applyCurrent(rubyAlignmentDropdown.Current, lyricFontInfo.RubyAlignment);
- applyCurrent(romajiAlignmentDropdown.Current, lyricFontInfo.RomanisationAlignment);
+ applyCurrent(romanisationAlignmentDropdown.Current, lyricFontInfo.RomanisationAlignment);
applyCurrent(rubyMarginSliderBar.Current, lyricFontInfo.RubyMargin);
- applyCurrent(romajiMarginSliderBar.Current, lyricFontInfo.RomanisationMargin);
+ applyCurrent(romanisationMarginSliderBar.Current, lyricFontInfo.RomanisationMargin);
static void applyCurrent(Bindable bindable, T value)
=> bindable.Value = bindable.Default = value;
}, true);
rubyAlignmentDropdown.Current.BindValueChanged(x => lyricFontInfoManager.ApplyCurrentLyricFontInfoChange(l => l.RubyAlignment = x.NewValue));
- romajiAlignmentDropdown.Current.BindValueChanged(x => lyricFontInfoManager.ApplyCurrentLyricFontInfoChange(l => l.RomanisationAlignment = x.NewValue));
+ romanisationAlignmentDropdown.Current.BindValueChanged(x => lyricFontInfoManager.ApplyCurrentLyricFontInfoChange(l => l.RomanisationAlignment = x.NewValue));
rubyMarginSliderBar.Current.BindValueChanged(x => lyricFontInfoManager.ApplyCurrentLyricFontInfoChange(l => l.RubyMargin = x.NewValue));
- romajiMarginSliderBar.Current.BindValueChanged(x => lyricFontInfoManager.ApplyCurrentLyricFontInfoChange(l => l.RomanisationMargin = x.NewValue));
+ romanisationMarginSliderBar.Current.BindValueChanged(x => lyricFontInfoManager.ApplyCurrentLyricFontInfoChange(l => l.RomanisationMargin = x.NewValue));
}
}