From eea9ca8aa4b46feb0856e93d5b6fcaffa5e0802a Mon Sep 17 00:00:00 2001 From: "Steven G. Johnson" Date: Sat, 30 May 2026 16:50:00 -0400 Subject: [PATCH] =?UTF-8?q?use=20unicode=20=C3=97=20instead=20of=20ascii?= =?UTF-8?q?=20x=20for=20repeat=20counts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/engraving/types/typesconv.cpp | 4 ++-- src/importexport/tabledit/tests/data/reading_list_11.mscx | 2 +- src/importexport/tabledit/tests/data/reading_list_12.mscx | 2 +- .../qml/MuseScore/NotationScene/styledialog/RepeatPage.qml | 2 +- .../NotationScene/styledialog/repeatplaycounttextmodel.cpp | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/engraving/types/typesconv.cpp b/src/engraving/types/typesconv.cpp index cbb2829b2a51a..e62282a0a5b9b 100644 --- a/src/engraving/types/typesconv.cpp +++ b/src/engraving/types/typesconv.cpp @@ -953,8 +953,8 @@ ParenthesesMode TConv::fromXml(const AsciiStringView& str, ParenthesesMode def) } static const std::vector > REPEAT_COUNT_PRESET = { - { RepeatPlayCountPreset::X_N, "xn", muse::TranslatableString("engraving", "x%1") }, - { RepeatPlayCountPreset::N_X, "nx", muse::TranslatableString("engraving", "%1x") }, + { RepeatPlayCountPreset::X_N, "xn", muse::TranslatableString("engraving", "×%1") }, + { RepeatPlayCountPreset::N_X, "nx", muse::TranslatableString("engraving", "%1×") }, { RepeatPlayCountPreset::PLAY_N_TIMES, "playntimes", muse::TranslatableString("engraving", "Play %1 times") }, { RepeatPlayCountPreset::N_REPEATS, "nrepeats", muse::TranslatableString("engraving", "%1 repeats") }, }; diff --git a/src/importexport/tabledit/tests/data/reading_list_11.mscx b/src/importexport/tabledit/tests/data/reading_list_11.mscx index bbb812b761d46..3b13d84a0095b 100644 --- a/src/importexport/tabledit/tests/data/reading_list_11.mscx +++ b/src/importexport/tabledit/tests/data/reading_list_11.mscx @@ -116,7 +116,7 @@ M_M - 3x + diff --git a/src/importexport/tabledit/tests/data/reading_list_12.mscx b/src/importexport/tabledit/tests/data/reading_list_12.mscx index 4adc7f96dce11..c353bd4cb4a71 100644 --- a/src/importexport/tabledit/tests/data/reading_list_12.mscx +++ b/src/importexport/tabledit/tests/data/reading_list_12.mscx @@ -172,7 +172,7 @@ P_P - 4x + diff --git a/src/notationscene/qml/MuseScore/NotationScene/styledialog/RepeatPage.qml b/src/notationscene/qml/MuseScore/NotationScene/styledialog/RepeatPage.qml index 53a7b1e8f6363..066ff448ee32d 100644 --- a/src/notationscene/qml/MuseScore/NotationScene/styledialog/RepeatPage.qml +++ b/src/notationscene/qml/MuseScore/NotationScene/styledialog/RepeatPage.qml @@ -160,7 +160,7 @@ Rectangle { } CheckBox { - text: qsTrc("notation/editstyle/repeatplaycount", "Show for single repeats (e.g. “x2”)") + text: qsTrc("notation/editstyle/repeatplaycount", "Show for single repeats (e.g. “×2”)") checked: repeatPlayCountTextModel.repeatPlayCountShowSingleRepeats.value === true onClicked: repeatPlayCountTextModel.repeatPlayCountShowSingleRepeats.value = !repeatPlayCountTextModel.repeatPlayCountShowSingleRepeats.value diff --git a/src/notationscene/qml/MuseScore/NotationScene/styledialog/repeatplaycounttextmodel.cpp b/src/notationscene/qml/MuseScore/NotationScene/styledialog/repeatplaycounttextmodel.cpp index 73a8f9128080a..1b0f05f9ba2d2 100644 --- a/src/notationscene/qml/MuseScore/NotationScene/styledialog/repeatplaycounttextmodel.cpp +++ b/src/notationscene/qml/MuseScore/NotationScene/styledialog/repeatplaycounttextmodel.cpp @@ -42,10 +42,10 @@ QVariantList RepeatPlayCountTextModel::textPresetOptions() const { QVariantList options { QVariantMap{ - { "text", muse::qtrc("notation/editstyle/repeatplaycount", "x3") }, + { "text", muse::qtrc("notation/editstyle/repeatplaycount", "×3") }, { "value", mu::engraving::RepeatPlayCountPreset::X_N } }, QVariantMap{ - { "text", muse::qtrc("notation/editstyle/repeatplaycount", "3x") }, + { "text", muse::qtrc("notation/editstyle/repeatplaycount", "3×") }, { "value", mu::engraving::RepeatPlayCountPreset::N_X } }, QVariantMap{ { "text", muse::qtrc("notation/editstyle/repeatplaycount", "Play 3 times") },