Skip to content
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.

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

instruments.xml: Make drum names refer to instrument not sound #8835

Merged
merged 1 commit into from Aug 18, 2021

Conversation

shoogle
Copy link
Contributor

@shoogle shoogle commented Aug 12, 2021

Run share/instruments/update_instruments_xml.py to fetch the latest version of the online spreadsheet. In this version, drum names have been updated to refer to the actual drum being notated rather than the MIDI sound used for playback. The MIDI sound is often a substitute because the actual instrument sound is not available.

Drum names are displayed as tooltips in the drumset palette, which appears when you enter notes on a percussion staff. They are also displayed in the "Edit Drumset" dialog available from that palette.

Drum names suggested by @zacjansheski.

Run share/instruments/update_instruments_xml.py to fetch the latest
version of the online spreadsheet. In this version, drum names have
been updated to refer to the actual drum being notated rather than
the MIDI sound used for playback. The MIDI sound is often a substitute
because the actual instrument sound is not available.

Drum names are displayed as tooltips in the drumset palette, which
appears when you enter notes on a percussion staff. They are also
displayed in the "Edit Drumset" dialog available from that palette.
@RomanPudashkin RomanPudashkin merged commit 937b349 into musescore:master Aug 18, 2021
@@ -6923,7 +6923,7 @@
<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>Low Agogo</name>
<name>Brake Drum</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not "Automobile Brake Drums"? Should result in one string less to translate.
If not, we'd need to enhance the generateTS.py to also extract those strings from instruments.xml, else it'd end up untranslated

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't want drum names to get too long if we can help it because we're planning to display them in the drum palette below each note icon. We will need to enhance generateTS.py to extract drum names because they don't always match the drumset instrument name (many drumsets have multiple drums).

generateTS.py needs a lot of work before release (e.g. to account for how instrument names are constructed from multiple components in MU4, and to allow the translation of an identical string to be different for different instruments - i.e. the instrument ID must be given as context to the tr() function).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, good to know that this is in scope

@@ -7056,7 +7056,7 @@
<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>Acoustic Snare</name>
<name>Snare</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might need adjustments in ../importexport/guitarpro/importgtp.cpp and ../libmscore/drumset.cpp
If not, we'd need to enhance the generateTS.py to also extract those strings from instruments.xml, else it'd end up untranslated

@@ -7265,7 +7265,7 @@
<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>Acoustic Snare</name>
<name>Snare</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sane

@@ -7326,7 +7326,7 @@
<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>Electric Snare</name>
<name>Snare</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

@@ -7378,15 +7378,15 @@
<head>normal</head>
<line>-1</line>
<voice>0</voice>
<name>Mute High Conga</name>
<name>High Tabla</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here we'd need to enhance the generateTS.py to also extract those strings from instruments.xml, else it'd end up untranslated

<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
<Drum pitch="64"> <!--Low Conga-->
<head>normal</head>
<line>1</line>
<voice>0</voice>
<name>Low Conga</name>
<name>Low Tabla</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>Chinese Cymbal</name>
<name>Bowl Gong</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same (unless changed to "Bowl Gongs")

@@ -8140,15 +8140,15 @@
<head>normal</head>
<line>-1</line>
<voice>0</voice>
<name>High Wood Block</name>
<name>High Temple Block</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same

<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
<Drum pitch="77"> <!--Low Woodblock-->
<head>normal</head>
<line>1</line>
<voice>0</voice>
<name>Low Wood Block</name>
<name>Low Temple Block</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

@@ -8882,37 +8882,37 @@
<head>normal</head>
<line>7</line>
<voice>0</voice>
<name>Drum4</name>
<name>Drum 4</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same (but not worse than before)

<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
<Drum pitch="37"> <!--Side Stick-->
<head>cross</head>
<line>7</line>
<voice>0</voice>
<name>Drum4 Rim</name>
<name>Drum 4 Rim</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

<stem>1</stem>
<shortcut>B</shortcut>
</Drum>
<Drum pitch="38"> <!--Acoustic Snare-->
<head>diamond</head>
<line>7</line>
<voice>0</voice>
<name>Drum4 Buzz</name>
<name>Drum 4 Buzz</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

<stem>1</stem>
</Drum>
<Drum pitch="39"> <!--Hand Clap-->
<head>xcircle</head>
<line>7</line>
<voice>0</voice>
<name>Drum4 Muted</name>
<name>Drum 4 Muted</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

<stem>1</stem>
</Drum>
<Drum pitch="40"> <!--Electric Snare-->
<head>slash</head>
<line>7</line>
<voice>0</voice>
<name>Drum4 Shell</name>
<name>Drum 4 Shell</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

@@ -8926,96 +8926,96 @@
<head>normal</head>
<line>5</line>
<voice>0</voice>
<name>Drum3</name>
<name>Drum 3</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

<stem>1</stem>
<shortcut>C</shortcut>
</Drum>
<Drum pitch="49"> <!--Crash Cymbal 1-->
<head>cross</head>
<line>5</line>
<voice>0</voice>
<name>Drum3 Rim</name>
<name>Drum 3 Rim</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

<stem>1</stem>
</Drum>
<Drum pitch="51"> <!--Ride Cymbal 1-->
<head>xcircle</head>
<line>5</line>
<voice>0</voice>
<name>Drum3 Muted</name>
<name>Drum 3 Muted</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

<stem>1</stem>
</Drum>
<Drum pitch="52"> <!--Chinese Cymbal-->
<head>slash</head>
<line>5</line>
<voice>0</voice>
<name>Drum3 Shell</name>
<name>Drum 3 Shell</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

<stem>1</stem>
</Drum>
<Drum pitch="60"> <!--High Bongo-->
<head>normal</head>
<line>3</line>
<voice>0</voice>
<name>Drum2</name>
<name>Drum 2</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

<stem>1</stem>
<shortcut>E</shortcut>
</Drum>
<Drum pitch="61"> <!--Low Bongo-->
<head>cross</head>
<line>3</line>
<voice>0</voice>
<name>Drum2 Rim</name>
<name>Drum 2 Rim</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

<stem>1</stem>
<shortcut>F</shortcut>
</Drum>
<Drum pitch="62"> <!--Mute High Conga-->
<head>diamond</head>
<line>3</line>
<voice>0</voice>
<name>Drum2 Buzz</name>
<name>Drum 2 Buzz</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

<stem>1</stem>
</Drum>
<Drum pitch="63"> <!--Open High Conga-->
<head>xcircle</head>
<line>3</line>
<voice>0</voice>
<name>Drum2 Muted</name>
<name>Drum 2 Muted</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

<stem>1</stem>
</Drum>
<Drum pitch="72"> <!--Long Whistle-->
<head>normal</head>
<line>1</line>
<voice>0</voice>
<name>Drum1</name>
<name>Drum 1</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

<stem>1</stem>
<shortcut>G</shortcut>
</Drum>
<Drum pitch="73"> <!--Short Guiro-->
<head>cross</head>
<line>1</line>
<voice>0</voice>
<name>Drum1 Rim</name>
<name>Drum 1 Rim</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

<stem>1</stem>
</Drum>
<Drum pitch="74"> <!--Long Guiro-->
<head>diamond</head>
<line>1</line>
<voice>0</voice>
<name>Drum1 Buzz</name>
<name>Drum 1 Buzz</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

<stem>1</stem>
</Drum>
<Drum pitch="75"> <!--Claves-->
<head>xcircle</head>
<line>1</line>
<voice>0</voice>
<name>Drum1 Muted</name>
<name>Drum 1 Muted</name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

<shortName>Be.</shortName>
<trackName>Ride Bell</trackName>
<longName>Ride Bell</longName>
<shortName>Ri. Be.</shortName>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change (at least) requires a run of generateTs.py to get the translatable strings updated into instrumentsxml.h

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

generateTs.py is not currently working 100% but will be fixed before release. See #8835 (comment)

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 18, 2021
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 18, 2021
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 19, 2021
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 19, 2021
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 30, 2021
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 1, 2021
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 2, 2021
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 2, 2021
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 9, 2021
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 10, 2021
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 23, 2021
@shoogle shoogle deleted the drum-names branch September 23, 2021 12:50
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 26, 2021
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 29, 2021
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request May 12, 2022
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Mar 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants