Update instruments.xml to sort Articulations and Channels

Backport of musescore#8289

Author: shoogle

share/instruments/instruments.xml

@@ -7568,12 +7568,12 @@
                         <velocity>100</velocity>
                         <gateTime>100</gateTime>
                   </Articulation>
-                  <Articulation name="sforzato">
-                        <velocity>130</velocity>
-                  </Articulation>
                   <Articulation name="marcato">
                         <velocity>500</velocity>
                   </Articulation>
+                  <Articulation name="sforzato">
+                        <velocity>130</velocity>
+                  </Articulation>
                   <Channel>
                         <controller ctrl="0" value="1"/>
                         <program value="56"/> <!--Marching Snare-->
@@ -7776,12 +7776,12 @@
                         <velocity>100</velocity>
                         <gateTime>100</gateTime>
                   </Articulation>
-                  <Articulation name="sforzato">
-                        <velocity>130</velocity>
-                  </Articulation>
                   <Articulation name="marcato">
                         <velocity>500</velocity>
                   </Articulation>
+                  <Articulation name="sforzato">
+                        <velocity>130</velocity>
+                  </Articulation>
                   <Channel>
                         <controller ctrl="0" value="1"/>
                         <program value="96"/> <!--Marching Tenor-->
@@ -7886,12 +7886,12 @@
                         <velocity>100</velocity>
                         <gateTime>100</gateTime>
                   </Articulation>
-                  <Articulation name="sforzato">
-                        <velocity>130</velocity>
-                  </Articulation>
                   <Articulation name="marcato">
                         <velocity>500</velocity>
                   </Articulation>
+                  <Articulation name="sforzato">
+                        <velocity>130</velocity>
+                  </Articulation>
                   <Channel>
                         <controller ctrl="0" value="1"/>
                         <program value="59"/> <!--Marching Bass-->
@@ -7997,12 +7997,12 @@
                         <velocity>100</velocity>
                         <gateTime>100</gateTime>
                   </Articulation>
-                  <Articulation name="sforzato">
-                        <velocity>130</velocity>
-                  </Articulation>
                   <Articulation name="marcato">
                         <velocity>500</velocity>
                   </Articulation>
+                  <Articulation name="sforzato">
+                        <velocity>130</velocity>
+                  </Articulation>
                   <Channel>
                         <controller ctrl="0" value="1"/>
                         <program value="58"/> <!--Marching Cymbals-->
@@ -10542,6 +10542,12 @@ Aeolus organ synthesizer, currently disabled -->
                   <Channel name="open">
                         <program value="27"/> <!--Electric Guitar (clean)-->
                   </Channel>
+                  <Channel name="mute">
+                        <program value="28"/> <!--Electric Guitar (muted)-->
+                  </Channel>
+                  <Channel name="jazz">
+                        <program value="26"/> <!--Electric Guitar (jazz)-->
+                  </Channel>
                   <Channel name="harmonics">
                         <program value="31"/> <!--Guitar Harmonics-->
                   </Channel>
@@ -10551,12 +10557,6 @@ Aeolus organ synthesizer, currently disabled -->
                   <Channel name="overdriven">
                         <program value="29"/> <!--Overdriven Guitar-->
                   </Channel>
-                  <Channel name="mute">
-                        <program value="28"/> <!--Electric Guitar (muted)-->
-                  </Channel>
-                  <Channel name="jazz">
-                        <program value="26"/> <!--Electric Guitar (jazz)-->
-                  </Channel>
                   <genre>common</genre>
                   <genre>jazz</genre>
                   <genre>popular</genre>
@@ -11398,6 +11398,12 @@ Aeolus organ synthesizer, currently disabled -->
                   <singleNoteDynamics>0</singleNoteDynamics>
                   <transposeDiatonic>-7</transposeDiatonic>
                   <transposeChromatic>-12</transposeChromatic>
+                  <Channel name="slap">
+                        <program value="36"/> <!--Slap Bass 1-->
+                  </Channel>
+                  <Channel name="pop">
+                        <program value="37"/> <!--Slap Bass 2-->
+                  </Channel>
                   <Channel name="pizzicato">
                         <program value="32"/> <!--Acoustic Bass-->
                   </Channel>
@@ -11407,12 +11413,6 @@ Aeolus organ synthesizer, currently disabled -->
                   <Channel name="tremolo">
                         <program value="44"/> <!--Tremolo Strings-->
                   </Channel>
-                  <Channel name="slap">
-                        <program value="36"/> <!--Slap Bass 1-->
-                  </Channel>
-                  <Channel name="pop">
-                        <program value="37"/> <!--Slap Bass 2-->
-                  </Channel>
                   <genre>common</genre>
                   <genre>jazz</genre>
             </Instrument>