fix #315963: Add Flügelhorns to instruments/orders.xml

[bmarwell]

Resolves: https://musescore.org/en/node/315963

Add Flügelhorns as discussed in the issue to concert bands, orchestral and big bands, jazz combos and brass ensembles.

I also added a whitespace fix.

---

No code changes, so no compilation needed. I verified by loading the modified file into my settings.

• I signed CLA
• I made sure the code in the PR follows the coding rules
• I made sure the code compiles on my machine
• I made sure there are no unnecessary changes in the code
• I made sure the title of the PR reflects the core meaning of the issue you are solving
• I made sure the commit message(s) contain a description and answer the question "Why do those changes fix that particular issue?" or "Why are those changes really necessary as improvements?"
• I made sure the commit message title starts with "fix #424242:" if there is a related issue
• I created the test (mtest, vtest, script test) to verify the changes I made

[bmarwell]

Do I still need to sign the CLA? I know it is not needed for small changes in the ASF.

[Jojo-Schmitz]

Yes

[bmarwell]

Yes

https://musescore.org/en/user/18490/cla

Trivial patches like spelling fixes or missing words won't require an agreement, since anybody could do those. However, almost anything will require a CLA.

@Jojo-Schmitz are you sure? :)

[bmarwell]

✅ Signed

[Jojo-Schmitz]

@Jojo-Schmitz are you sure? :)

No. But signing the CLA doesn't hurt. And this is is not fixing a spelling mistake nor adding a missing word, it does change the functionality of the program, the sorting of instruments

[Jojo-Schmitz]

Please rebase against 3.x

[njvdberg]

When modifying orders.xml also the templates in share/templates// must be checked and possible updated too. This is because the score order is copied into the score file to prevent changes in existing score when the default order is changed for some reason (like this 😉).
If the templates are not updated, users using the templates and add a Flugelhorn will see the same problems as we see now.

[bmarwell]

When modifying orders.xml also the templates in share/templates/_/_ must be checked and possible updated too. This is because the score order is copied into the score file to prevent changes in existing score when the default order is changed for some reason (like this ).
If the templates are not updated, users using the templates and add a Flugelhorn will see the same problems as we see now.

There is nothing to update. I do not see why we would want to add Flügelhorns by default to Big Band, Jazz or other templates. The idea is in issue #315963 to make them orderable if they are added afterwards.

Updating the templates with adding randomly instruments (only because they also appear in the orders.xml) should be another issue. But I do not see why keeping them synced in that manner is useful.

But I agree, if there were Flügelhorns already in the templates, we would need to update them as well. For Brass Band, I did not change the ordering so no need to change the brass band template.

[bmarwell]

@Jojo-Schmitz @njvdberg please re-review. I checked the templates as requested and rebased the PR.

[njvdberg]

Since the templates contains a copy of the score orders, changes in the score orders have to be applied to the templates too. The Big Band, Jazz and other templates have to be updated because the score order in orders.xml for these score orders are modified. E.g. in line 276 of orders.xml the family flugelhorns are added to the score order Brass Ensemble. This same score order is used in the template share/templates/03-Chamber_Music/05-Brass_Quartet.mscx (and also in 06-Brass_Quintet.mscx). Now these score orders are out of sync.

[Jojo-Schmitz]

So the templates do not need to get Instruments added, but their order updated, right? So that if you manually add a flugelhorn family instrument to a score created from those templates, it does get added at the right spot.

[njvdberg]

That's true, no instruments should be added, only the order should be updated.
When the orders are out of sync, the score will behave different depending it was create via a template or by choosing instruments yourself.

[bmarwell]

Thanks for the clarification. I misunderstood it the first time.

I will update it soon. Thanks for the kind hint, much appreciated!

[bmarwell]

@Jojo-Schmitz @njvdberg I really didn’t know where to add a new family and where not.
Bit I think this seems to work as expected.

[njvdberg]

Now you are adding the instrument to the template but it should be added to the order in the template. So, open the template in a text editor and add the line <family>trumpets</family> at the right place.
E.g. for share/templates/03-Chamber_Music/05-Brass_Quartet.mscx, find the line where the score order starts (tag <Order id="brass-ensemble" customized="1">, for me at line 28). Next find the section where you want to add the flugelhorn, so in the section with id brass and add the line <family>flugelhorns</family> at the same place you placed it in the same score order in orders.xml.
The content between <Order ...> .. </Order> should be the same in orders.xml and in the templates.

[njvdberg]

A lot of remarks but as you see, it are the same remarks in the different files.
Good job!

[bmarwell]

Now you are adding the instrument to the template but it should be added to the order in the template. So, open the template in a text editor and add the line <family>trumpets</family> at the right place.
E.g. for share/templates/03-Chamber_Music/05-Brass_Quartet.mscx, find the line where the score order starts (tag <Order id="brass-ensemble" customized="1">, for me at line 28). Next find the section where you want to add the flugelhorn, so in the section with id brass and add the line <family>flugelhorns</family> at the same place you placed it in the same score order in orders.xml.
The content between <Order ...> .. </Order> should be the same in orders.xml and in the templates.

If you were right, why was there no Flügelhorns when I opened the file?

It IS between the order tags, I double checked.

Probably the rebase messed things up. I accidentally Rebased on 3.6 first and then on 3.x again.

I will change that later and will also be put the Flügelhorns below the trumpets.

[bmarwell]

@njvdberg thanks for the hints and explanations! I updated all the files accordingly, they should now sync up nicely.

[njvdberg]

@bmarwell Sorry, I was a little occupied last few day but will have a look again tomorrow.

[njvdberg]

Checked, look great, thanks!

[igorkorsukov]

@bmarwell Could you please port the changes to the master

[bmarwell]

@igorkorsukov Someone already did that, git cherry-pick d2c604274db31dc18c3374479988d246fcf55495 is empty.

[Jojo-Schmitz]

Indeed, in b122c98

[igorkorsukov]

@bmarwell ok, thank you :)
@Jojo-Schmitz thank you, too :)