Skip to content

use unicode × instead of ascii x for repeat counts #33625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stevengj wants to merge 1 commit into
base: main
Choose a base branch
from
Open

use unicode × instead of ascii x for repeat counts #33625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/engraving/types/typesconv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,8 +953,8 @@ ParenthesesMode TConv::fromXml(const AsciiStringView& str, ParenthesesMode def)
}

static const std::vector<Item<RepeatPlayCountPreset> > 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") },
};
Expand Down
2 changes: 1 addition & 1 deletion src/importexport/tabledit/tests/data/reading_list_11.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<playCountCustomText></playCountCustomText>
<eid>M_M</eid>
<style>repeat_play_count</style>
<text>3x</text>
<text>3×</text>
</PlayCountText>
</voice>
</Measure>
Expand Down
2 changes: 1 addition & 1 deletion src/importexport/tabledit/tests/data/reading_list_12.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
<playCountCustomText></playCountCustomText>
<eid>P_P</eid>
<style>repeat_play_count</style>
<text>4x</text>
<text>4×</text>
</PlayCountText>
</voice>
</Measure>
Expand Down
2 changes: 1 addition & 1 deletion src/notationscene/qml/MuseScore/NotationScene/styledialog/RepeatPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/notationscene/qml/MuseScore/NotationScene/styledialog/repeatplaycounttextmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") },
Expand Down
Loading