From a4821f9457032d96c68edd34bae0461460f87ec1 Mon Sep 17 00:00:00 2001 From: Daniel Ray Date: Fri, 6 Apr 2018 13:11:06 +0200 Subject: [PATCH 1/7] Started Editing instruments.xml to better align standards Removed "instruments" from Genre type. Changed "ethnic" with "world". --- share/instruments/instruments.xml | 184 +++++++++++++++--------------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/share/instruments/instruments.xml b/share/instruments/instruments.xml index 7094c9043fee..07c53ecdd4c2 100644 --- a/share/instruments/instruments.xml +++ b/share/instruments/instruments.xml @@ -1,19 +1,19 @@ - Common instruments + Common - Jazz instruments + Jazz - Orchestral instruments + Orchestral Early music - - Ethnic instruments + + World music 100 @@ -293,7 +293,7 @@ - ethnic + world Dizi @@ -307,7 +307,7 @@ - ethnic + world C Dizi @@ -321,7 +321,7 @@ - ethnic + world A Dizi @@ -335,7 +335,7 @@ - ethnic + world G Dizi @@ -349,7 +349,7 @@ - ethnic + world F Dizi @@ -363,7 +363,7 @@ - ethnic + world E Dizi @@ -377,7 +377,7 @@ - ethnic + world B♭ Fife @@ -445,7 +445,7 @@ - ethnic + world Gemshorn @@ -529,7 +529,7 @@ - ethnic + world G Soprano Ocarina @@ -543,7 +543,7 @@ - ethnic + world F Soprano Ocarina @@ -557,7 +557,7 @@ - ethnic + world C Soprano Ocarina @@ -571,7 +571,7 @@ - ethnic + world B♭ Soprano Ocarina @@ -585,7 +585,7 @@ - ethnic + world G Alto Ocarina @@ -599,7 +599,7 @@ - ethnic + world F Alto Ocarina @@ -613,7 +613,7 @@ - ethnic + world C Alto Ocarina @@ -627,7 +627,7 @@ - ethnic + world B♭­ Alto Ocarina @@ -641,7 +641,7 @@ - ethnic + world C Bass Ocarina @@ -655,7 +655,7 @@ - ethnic + world Pan Flute @@ -669,7 +669,7 @@ - ethnic + world Quena @@ -683,7 +683,7 @@ - ethnic + world C Quena @@ -697,7 +697,7 @@ - ethnic + world G Quena @@ -711,7 +711,7 @@ - ethnic + world F Quena @@ -725,7 +725,7 @@ - ethnic + world Quena @@ -739,7 +739,7 @@ - ethnic + world Recorder @@ -1339,7 +1339,7 @@ - ethnic + world F Duduk @@ -1353,7 +1353,7 @@ - ethnic + world E Duduk @@ -1367,7 +1367,7 @@ - ethnic + world Duduk @@ -1381,7 +1381,7 @@ - ethnic + world C Duduk @@ -1395,7 +1395,7 @@ - ethnic + world B Duduk @@ -1409,7 +1409,7 @@ - ethnic + world B♭ Duduk @@ -1423,7 +1423,7 @@ - ethnic + world A Duduk @@ -1437,7 +1437,7 @@ - ethnic + world G Duduk @@ -1451,7 +1451,7 @@ - ethnic + world A Bass Duduk @@ -1465,7 +1465,7 @@ - ethnic + world Soprano Kelhorn @@ -1478,7 +1478,7 @@ - ethnic + world Alto Kelhorn @@ -1491,7 +1491,7 @@ - ethnic + world Tenor Kelhorn @@ -1504,7 +1504,7 @@ - ethnic + world Bass Kelhorn @@ -1517,7 +1517,7 @@ - ethnic + world Greatbass Kelhorn @@ -1530,7 +1530,7 @@ - ethnic + world Rauschpfeife @@ -1544,7 +1544,7 @@ - ethnic + world Sopranino Rauschpfeife @@ -1558,7 +1558,7 @@ - ethnic + world Soprano Rauschpfeife @@ -1572,7 +1572,7 @@ - ethnic + world Shenai @@ -1586,7 +1586,7 @@ - ethnic + world Clarinet @@ -1693,7 +1693,7 @@ - ethnic + world B♭ Clarinet @@ -1979,7 +1979,7 @@ - ethnic + world Octavin @@ -2729,7 +2729,7 @@ - ethnic + world Soprano Sheng @@ -2743,7 +2743,7 @@ - ethnic + world Alto Sheng @@ -2757,7 +2757,7 @@ - ethnic + world Tenor Sheng @@ -2771,7 +2771,7 @@ - ethnic + world Bass Sheng @@ -2785,7 +2785,7 @@ - ethnic + world @@ -3603,7 +3603,7 @@ - ethnic + world Bugle @@ -4369,7 +4369,7 @@ - ethnic + world Didgeridoo @@ -4383,7 +4383,7 @@ - ethnic + world Horagai @@ -4397,7 +4397,7 @@ - ethnic + world Shofar @@ -4411,7 +4411,7 @@ - ethnic + world Vuvuzela @@ -4425,7 +4425,7 @@ - ethnic + world @@ -5004,7 +5004,7 @@ - ethnic + world Treble Kalimba @@ -5016,7 +5016,7 @@ - ethnic + world Alto Kalimba @@ -5028,7 +5028,7 @@ - ethnic + world @@ -5244,7 +5244,7 @@ - ethnic + world Bongos @@ -5400,7 +5400,7 @@ - ethnic + world Cuica @@ -5431,7 +5431,7 @@ - ethnic + world Finger Cymbals @@ -5603,7 +5603,7 @@ - ethnic + world Tubo @@ -5625,7 +5625,7 @@ - ethnic + world Metal Castanets @@ -5647,7 +5647,7 @@ - ethnic + world orchestra @@ -6019,7 +6019,7 @@ - ethnic + world Güiro @@ -6042,7 +6042,7 @@ - ethnic + world jazz @@ -6066,7 +6066,7 @@ - ethnic + world orchestra @@ -6090,7 +6090,7 @@ - ethnic + world Quijada @@ -6113,7 +6113,7 @@ - ethnic + world Vibraslap @@ -8669,7 +8669,7 @@ ITB 4 string Irish Tenor Banjo pluck.banjo.tenor - ethnic + world 19 43 @@ -8692,7 +8692,7 @@ pluck.banjo.tenor tablature - ethnic + world Balalaika @@ -8713,7 +8713,7 @@ - ethnic + world Piccolo Balalaika @@ -8854,7 +8854,7 @@ - ethnic + world Bouzouki @@ -8876,7 +8876,7 @@ - ethnic + world Soprano Guitar @@ -9032,7 +9032,7 @@ - ethnic + world Acoustic Guitar @@ -9255,7 +9255,7 @@ - ethnic + world Oud @@ -9282,7 +9282,7 @@ earlymusic - ethnic + world Lute @@ -9701,7 +9701,7 @@ - ethnic + world Sitar @@ -9715,7 +9715,7 @@ - ethnic + world Ukulele @@ -10090,7 +10090,7 @@ - ethnic + world Brač @@ -10111,7 +10111,7 @@ - ethnic + world Čelo @@ -10134,7 +10134,7 @@ - ethnic + world Bugarija @@ -10157,7 +10157,7 @@ - ethnic + world Berda @@ -10180,7 +10180,7 @@ - ethnic + world @@ -10231,7 +10231,7 @@ - ethnic + world Nyckelharpa @@ -10251,7 +10251,7 @@ - ethnic + world Violin From 985e49509d3174abc22a53d964404e12f086b033 Mon Sep 17 00:00:00 2001 From: Daniel Ray Date: Fri, 6 Apr 2018 14:54:28 +0200 Subject: [PATCH 2/7] Added/Modified instruments.xml Genres Added new for "Pop/Rock", "Concert Band", "Marching", "Electronic", and "Classroom" Genres to better align with needs of popular music segment (GuitarPro) and education segment. Updated attributes for every instrment. --- share/instruments/instruments.xml | 330 ++++++++++++++++++++++++++---- 1 file changed, 287 insertions(+), 43 deletions(-) diff --git a/share/instruments/instruments.xml b/share/instruments/instruments.xml index 07c53ecdd4c2..3c4d5e54b4a5 100644 --- a/share/instruments/instruments.xml +++ b/share/instruments/instruments.xml @@ -3,18 +3,33 @@ Common - - Jazz - - - Orchestral - - - Early music - - - World music - + + Pop/Rock + + + Jazz + + + Orchestra + + + Concert Band + + + Marching Band + + + Electronic Music + + + World Music + + + Early Music + + + Classroom + 100 100 @@ -80,6 +95,8 @@ common jazz orchestra + concertband + marching D♭ Piccolo @@ -116,6 +133,9 @@ common jazz orchestra + popular + concertband + marching Treble Flute @@ -180,7 +200,7 @@ jazz orchestra - common + concertband Bass Flute @@ -754,6 +774,7 @@ common + classroom Garklein Recorder @@ -892,6 +913,7 @@ + classroom B♭ Tin Whistle @@ -948,6 +970,7 @@ common orchestra + concertband Baroque Oboe @@ -1009,8 +1032,8 @@ - common orchestra + concertband Baritone Oboe @@ -1602,7 +1625,6 @@ - jazz Piccolo Clarinet @@ -1633,6 +1655,7 @@ + concertband C Clarinet @@ -1678,6 +1701,7 @@ jazz orchestra + concertband G Clarinet @@ -1693,7 +1717,6 @@ - world B♭ Clarinet @@ -1712,6 +1735,9 @@ common orchestra + concertband + jazz + marching A Clarinet @@ -1727,7 +1753,6 @@ - common orchestra @@ -1744,6 +1769,7 @@ + concertband Basset Clarinet @@ -1794,6 +1820,8 @@ common jazz orchestra + concertband + marching B♭ Bass Clarinet (Bass Clef) @@ -1810,7 +1838,6 @@ - common orchestra @@ -1828,7 +1855,6 @@ - common orchestra @@ -1846,7 +1872,6 @@ - common orchestra @@ -1864,6 +1889,7 @@ + concertband Contrabass Clarinet @@ -1882,6 +1908,7 @@ jazz orchestra + concertband Chalumeau @@ -2008,6 +2035,7 @@ common orchestra + concertband Contrabassoon @@ -2023,8 +2051,8 @@ - common orchestra + concertband Reed Contrabass @@ -2257,6 +2285,8 @@ common jazz orchestra + concertband + marching Aulochrome @@ -2305,6 +2335,9 @@ common jazz orchestra + popular + concertband + marching Melody Saxophone @@ -2340,6 +2373,9 @@ common jazz orchestra + popular + concertband + marching Baritone Saxophone @@ -2359,6 +2395,8 @@ common jazz orchestra + concertband + marching Bass Saxophone @@ -2423,7 +2461,7 @@ - common + world @@ -2442,6 +2480,7 @@ common jazz + popular 12 Hole C Chromatic Harmonica @@ -2686,6 +2725,7 @@ + world Concertina @@ -2823,6 +2863,8 @@ common orchestra + concertband + marching High C Horn @@ -3002,6 +3044,7 @@ + concertband C Cornet @@ -3039,6 +3082,7 @@ common jazz + concertband A Cornet @@ -3116,6 +3160,8 @@ + concertband + marching Baritone Horn (Treble Clef) @@ -3133,6 +3179,7 @@ + concertband Posthorn @@ -3177,7 +3224,6 @@ - jazz Piccolo Trumpet @@ -3215,6 +3261,7 @@ orchestra + concertband Piccolo Trumpet in A @@ -3326,7 +3373,6 @@ - common orchestra @@ -3346,8 +3392,10 @@ - common - orchestra + jazz + popular + concertband + marching A Trumpet @@ -3630,6 +3678,7 @@ + marching Alto Bugle @@ -3643,6 +3692,7 @@ + marching Baritone Bugle @@ -3658,6 +3708,7 @@ + marching Flugelhorn @@ -3675,6 +3726,8 @@ jazz orchestra + concertband + marching Fiscorn @@ -3720,6 +3773,7 @@ + marching Mellophone Bugle @@ -3733,6 +3787,7 @@ + marching Contrabass Bugle @@ -3748,6 +3803,7 @@ + marching Mellophone @@ -3764,6 +3820,7 @@ jazz + marching Ophicleide @@ -3986,6 +4043,9 @@ common jazz orchestra + popular + concertband + marching Trombone (Treble Clef) @@ -4043,8 +4103,6 @@ - common - orchestra Bass Trombone @@ -4058,9 +4116,10 @@ - common jazz orchestra + concertband + marching Contrabass Trombone @@ -4102,8 +4161,9 @@ - common orchestra + concertband + marching Euphonium (Treble Clef) @@ -4121,6 +4181,8 @@ + concertband + marching Tuba @@ -4137,6 +4199,8 @@ common jazz orchestra + concertband + marching F Tuba @@ -4206,8 +4270,7 @@ 22-72 - - common + orchestra @@ -4292,6 +4355,7 @@ jazz + marching B♭ Sousaphone @@ -4308,6 +4372,7 @@ jazz + marching Wagner Tuba @@ -4444,6 +4509,8 @@ common orchestra + concertband + marching Roto-toms @@ -4457,7 +4524,6 @@ - orchestra Glockenspiel @@ -4477,6 +4543,9 @@ common jazz orchestra + concertband + marching + classroom Orff Soprano Glockenspiel @@ -4490,6 +4559,7 @@ + classroom Orff Alto Glockenspiel @@ -4503,6 +4573,7 @@ + classroom Crotales @@ -4519,8 +4590,9 @@ - common + concertband orchestra + marching Tubaphone @@ -4567,6 +4639,8 @@ common jazz orchestra + concertband + marching Metallophone @@ -4580,6 +4654,7 @@ + classroom Orff Soprano Metallophone @@ -4593,6 +4668,7 @@ + classroom Orff Alto Metallophone @@ -4606,6 +4682,7 @@ + classroom Orff Bass Metallophone @@ -4619,6 +4696,7 @@ + classroom Tubular Bells @@ -4634,6 +4712,7 @@ common orchestra + concertband Steel Drums @@ -4833,6 +4912,9 @@ common jazz orchestra + concertband + marching + classroom Orff Soprano Xylophone @@ -4846,6 +4928,7 @@ + classroom Orff Alto Xylophone @@ -4859,6 +4942,7 @@ + classroom Orff Bass Xylophone @@ -4872,6 +4956,7 @@ + classroom Xylomarimba @@ -4912,6 +4997,8 @@ common jazz orchestra + concertband + marching Marimba @@ -4930,6 +5017,8 @@ common jazz orchestra + concertband + marching Bass Marimba @@ -5049,6 +5138,9 @@ common jazz orchestra + popular + concertband + marching Snare Drum @@ -5081,6 +5173,8 @@ common orchestra + concertband + marching Bass Drum @@ -5105,6 +5199,8 @@ common orchestra + concertband + marching Piccolo Snare Drum @@ -5222,6 +5318,8 @@ orchestra + concertband + marching Chinese Tom-toms @@ -5277,6 +5375,10 @@ orchestra jazz + popular + concertband + marching + classroom Congas @@ -5317,6 +5419,9 @@ orchestra jazz + popular + concertband + marching Timbales @@ -5348,6 +5453,8 @@ jazz + concertband + marching Frame Drum @@ -5370,6 +5477,7 @@ + world Tablas @@ -5454,6 +5562,7 @@ + classroom Hi-hat @@ -5515,6 +5624,8 @@ orchestra + concertband + marching Bells @@ -5536,7 +5647,6 @@ - orchestra Sleigh Bells @@ -5559,6 +5669,7 @@ + classroom Bell Plate @@ -5671,6 +5782,8 @@ + concertband + marching Iron Pipes @@ -5768,6 +5881,9 @@ common orchestra + concertband + marching + classroom Temple Blocks @@ -5799,6 +5915,8 @@ orchestra + concertband + marching Triangle @@ -5831,6 +5949,9 @@ common orchestra + concertband + marching + classroom Cymbal @@ -5856,6 +5977,9 @@ common orchestra + concertband + marching + classroom Ride Cymbal @@ -5908,6 +6032,8 @@ + concertband + marching Crash Cymbal @@ -5930,6 +6056,8 @@ + concertband + marching Splash Cymbal @@ -5951,6 +6079,8 @@ + concertband + marching Cowbell @@ -5973,6 +6103,7 @@ + classroom Claves @@ -5997,6 +6128,9 @@ common jazz + concertband + marching + classroom Castanets @@ -6044,6 +6178,7 @@ world jazz + classroom Maracas @@ -6068,6 +6203,7 @@ world orchestra + classroom Cabasa @@ -6136,6 +6272,8 @@ + concertband + classroom Slit Drum @@ -6181,6 +6319,8 @@ orchestra + concertband + classroom Ratchet @@ -6247,6 +6387,7 @@ + classroom Wooden Wind Chimes @@ -6314,6 +6455,8 @@ orchestra + concertband + marching Glass Wind Chimes @@ -6400,6 +6543,7 @@ + classroom Hand Clap @@ -6422,6 +6566,8 @@ + popular + classroom Slap @@ -6466,6 +6612,8 @@ + popular + classroom Tambourine @@ -6490,6 +6638,10 @@ common orchestra + popular + concertband + marching + classroom Percussion @@ -6659,6 +6811,9 @@ orchestra + popular + concertband + marching @@ -6757,7 +6912,7 @@ 56 - common + marching Tenor Drums @@ -6962,7 +7117,7 @@ 96 - common + marching Bass Drums @@ -7069,7 +7224,7 @@ 59 - common + marching Cymbals @@ -7177,8 +7332,8 @@ 58 - common orchestra + marching @@ -7380,6 +7535,7 @@ + common @@ -7407,6 +7563,8 @@ common jazz orchestra + popular + classroom Grand Piano @@ -7429,6 +7587,7 @@ 95 orchestra + concertband Upright Piano @@ -7472,6 +7631,7 @@ 95 jazz + popular Toy Piano @@ -7493,6 +7653,7 @@ 100 95 + classroom Clavichord @@ -7589,6 +7750,7 @@ jazz + popular Clavinet @@ -7628,6 +7790,7 @@ common jazz orchestra + popular Percussive Organ @@ -7663,6 +7826,7 @@ jazz + popular Rotary Organ @@ -8118,6 +8282,8 @@ + popular + marching Atmosphere Synthesizer @@ -8135,6 +8301,8 @@ + popular + marching Brightness Synthesizer @@ -8152,6 +8320,8 @@ + popular + marching Crystal Synthesizer @@ -8169,6 +8339,8 @@ + popular + marching Echoes Synthesizer @@ -8186,6 +8358,8 @@ + popular + marching Goblins Synthesizer @@ -8203,6 +8377,8 @@ + popular + marching Rain Synthesizer @@ -8220,6 +8396,8 @@ + popular + marching Sci-fi Synthesizer @@ -8237,6 +8415,8 @@ + popular + marching Soundtrack Synthesizer @@ -8254,6 +8434,8 @@ + popular + marching Pad Synthesizer @@ -8292,6 +8474,8 @@ + popular + marching New Age Synthesizer @@ -8309,6 +8493,8 @@ + popular + marching Warm Synthesizer @@ -8326,6 +8512,8 @@ + popular + marching Poly Synthesizer @@ -8343,6 +8531,8 @@ + popular + marching Choir Synthesizer @@ -8360,6 +8550,8 @@ + popular + marching Bowed Synthesizer @@ -8377,6 +8569,8 @@ + popular + marching Metallic Synthesizer @@ -8394,6 +8588,8 @@ + popular + marching Halo Synthesizer @@ -8411,6 +8607,8 @@ + popular + marching Sweep Synthesizer @@ -8428,6 +8626,8 @@ + popular + marching Saw Synthesizer @@ -8445,6 +8645,8 @@ + popular + marching Sine Synthesizer @@ -8462,6 +8664,8 @@ + popular + marching Square Synthesizer @@ -8479,6 +8683,8 @@ + popular + marching Ondes Martenot @@ -8494,6 +8700,8 @@ + popular + marching Mallet Synthesizer @@ -8508,6 +8716,8 @@ + popular + marching Bass Synthesizer @@ -8528,6 +8738,8 @@ + popular + marching Brass Synthesizer @@ -8548,6 +8760,8 @@ + popular + marching String Synthesizer @@ -8568,6 +8782,8 @@ + popular + marching Theremin @@ -8585,6 +8801,8 @@ + popular + marching Percussion Synthesizer @@ -8607,6 +8825,8 @@ + popular + marching @@ -8633,6 +8853,7 @@ common jazz + popular Banjo [Tablature] @@ -8944,6 +9165,7 @@ common + popular Guitar (Treble Clef) @@ -9057,6 +9279,8 @@ common jazz + popular + classroom Acoustic Guitar (Treble Clef) @@ -9092,6 +9316,7 @@ tablature common + classroom 11-string Alto Guitar @@ -9145,6 +9370,7 @@ + popular Pedal Steel Guitar @@ -9158,6 +9384,7 @@ + popular common + popular Harp @@ -9581,6 +9811,7 @@ + popular Mandolin [Tablature] @@ -9589,6 +9820,7 @@ pluck.mandolin tablature + popular Mandola @@ -9737,6 +9969,8 @@ common + popular + classroom Ukulele [Tablature] @@ -9746,6 +9980,8 @@ tablature common + popular + classroom Ukulele (Low G) @@ -9831,6 +10067,8 @@ common jazz + popular + marching Bass Guitar [Tablature] @@ -9840,6 +10078,7 @@ tablature common + popular common + popular Fretless Electric Bass @@ -9948,6 +10189,8 @@ + popular + jazz 5-str. Electric Bass @@ -9980,6 +10223,7 @@ common jazz + popular 5-str. Electric Bass [Tablature] @@ -9988,6 +10232,7 @@ tablature common + popular 5-str. Electric Bass @@ -10274,6 +10519,7 @@ common jazz orchestra + popular Violins @@ -10358,6 +10604,7 @@ common jazz orchestra + popular Violoncellos @@ -10403,6 +10650,7 @@ common jazz orchestra + concertband Contrabasses @@ -10425,15 +10673,11 @@ - orchestra contrabass Double Bass Db. - common - jazz - orchestra Pardessus de viole From e4cc6481b0a585688e77ed1113a8acfe654c723e Mon Sep 17 00:00:00 2001 From: Daniel Ray Date: Fri, 6 Apr 2018 15:09:12 +0200 Subject: [PATCH 3/7] Modified instruments.xml InstrumentGroup Updated naming syntax to emphasize instrument family and more clearly differentiate (ex: "Marching Percussion" to "Percussion - Marching", "Plucked Strings" to "Strings - Plucked") --- share/instruments/instruments.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/share/instruments/instruments.xml b/share/instruments/instruments.xml index 3c4d5e54b4a5..5b36c89bc2d3 100644 --- a/share/instruments/instruments.xml +++ b/share/instruments/instruments.xml @@ -59,7 +59,7 @@ 100 - Woodwind + Woodwinds Winds W. @@ -4494,7 +4494,7 @@ - Pitched Percussion + Percussion - Pitched Timpani Timp. @@ -5121,7 +5121,7 @@ - Unpitched Percussion + Percussion - Unpitched Drumset Drs. @@ -6817,7 +6817,7 @@ - Battery Percussion + Percussion - Marching Snare Drum S.D. @@ -8244,7 +8244,7 @@ - Electronic Instruments + Electronic Effect Synthesizer Synth. @@ -8830,7 +8830,7 @@ - Plucked Strings + Strings - Plucked Banjo Bj. @@ -10429,7 +10429,7 @@ - Strings + Strings - Bowed Strings St. From 5fa7ebcec2e8541c092e797e7d949b7dde9ea536 Mon Sep 17 00:00:00 2001 From: Daniel Ray Date: Fri, 6 Apr 2018 16:45:03 +0200 Subject: [PATCH 4/7] Modified names of percussion instruments to align with same instrument in VDL --- share/instruments/instruments.xml | 64 +++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/share/instruments/instruments.xml b/share/instruments/instruments.xml index 5b36c89bc2d3..7a7897428f65 100644 --- a/share/instruments/instruments.xml +++ b/share/instruments/instruments.xml @@ -4513,9 +4513,9 @@ marching - Roto-toms - Rt-t. - Roto-toms + Roto-Toms + Roto + Roto-Toms drum.rototom G 1 @@ -4527,7 +4527,7 @@ Glockenspiel - Glk. + Glock. Glockenspiel pitched-percussion.glockenspiel G @@ -4577,7 +4577,7 @@ Crotales - Cro. + Crot. Crotales metal.crotales G @@ -4608,7 +4608,7 @@ Almglocken - Agl. + Almg. Almglocken metal.bells.almglocken 2 @@ -4699,9 +4699,9 @@ classroom - Tubular Bells - Tu. Be. - Tubular Bells + Chimes + Cme. + Chimes or Tubular Bells pitched-percussion.tubular-bells G 1 @@ -4831,7 +4831,7 @@ Tuned Gongs - Td. Go. + Td. Gon. Tuned Gongs metal.gong F @@ -5124,7 +5124,7 @@ Percussion - Unpitched Drumset - Drs. + D. Set Drumset drum.group.set PERC @@ -5143,8 +5143,8 @@ marching - Snare Drum - Sn. Dr. + Concert Snare Drum + Con. Sn. Snare Drum PERC drum.snare-drum @@ -5177,8 +5177,8 @@ marching - Bass Drum - B. Dr. + Concert Bass Drum + Con. BD Bass Drum PERC drum.bass-drum @@ -5203,8 +5203,8 @@ marching - Piccolo Snare Drum - P. Sn. Dr. + Piccolo Snare + Picc. Sn. Piccolo Snare Drum PERC drum.snare-drum @@ -5233,9 +5233,9 @@ - Military Drum - Mil. Dr. - Military Drum + Field Drum + Field Dr. + Military Field Drum drum.snare-drum PERC percussion @@ -5263,9 +5263,9 @@ - Tom Toms - Toms - Tom Toms + Concert Toms + C. Toms + Concert Toms drum.tom-tom PERC percussion @@ -5322,8 +5322,8 @@ marching - Chinese Tom-toms - Ch. To. + Chinese Tom-Toms + Ch. Toms Chinese Tom-toms drum.group.chinese PERC @@ -5346,7 +5346,7 @@ Bongos - Bo. + Bon. Bongos drum.bongo PERC @@ -5382,7 +5382,7 @@ Congas - Co. + Con. Congas drum.conga PERC @@ -5603,9 +5603,9 @@ - Tam-tam - Tam-tam - Tam-tam + Tam-Tam + Tam + Tam-Tam metal.tamtam PERC percussion @@ -5695,7 +5695,7 @@ Bowl Gongs - Bw. Go. + Bw. Gon. Bowl Gongs metal.gong PERC @@ -6207,7 +6207,7 @@ Cabasa - Cab. + Cabs. Cabasa rattle.cabasa PERC From b66ebb364c63dd3f6a4683d08a13f362355e14a0 Mon Sep 17 00:00:00 2001 From: Daniel Ray Date: Fri, 6 Apr 2018 18:10:08 +0200 Subject: [PATCH 5/7] Reverted abbreviations for drumset and snare drum --- share/instruments/instruments.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/instruments/instruments.xml b/share/instruments/instruments.xml index 7a7897428f65..8e8a67c97a76 100644 --- a/share/instruments/instruments.xml +++ b/share/instruments/instruments.xml @@ -3,7 +3,7 @@ Common - + Pop/Rock @@ -5124,7 +5124,7 @@ Percussion - Unpitched Drumset - D. Set + Drs. Drumset drum.group.set PERC @@ -5143,8 +5143,8 @@ marching - Concert Snare Drum - Con. Sn. + Snare Drum + Sn. Dr. Snare Drum PERC drum.snare-drum From 91afd5b0eeb45b80df5154b8f2f63c1ebcaa0a24 Mon Sep 17 00:00:00 2001 From: Daniel Ray Date: Fri, 6 Apr 2018 19:01:34 +0200 Subject: [PATCH 6/7] Updated musicXMLid for multiple instruments. --- share/instruments/instruments.xml | 1120 ++++++++++------------------- 1 file changed, 392 insertions(+), 728 deletions(-) diff --git a/share/instruments/instruments.xml b/share/instruments/instruments.xml index 8e8a67c97a76..d32c92ff3e3d 100644 --- a/share/instruments/instruments.xml +++ b/share/instruments/instruments.xml @@ -3,33 +3,33 @@ Common - - Pop/Rock - - - Jazz - - - Orchestra - - - Concert Band - - - Marching Band - - - Electronic Music - - - World Music - - - Early Music - - - Classroom - + + Pop/Rock + + + Jazz + + + Orchestra + + + Concert Band + + + Marching Band + + + Electronic Music + + + World Music + + + Early Music + + + Classroom + 100 100 @@ -98,22 +98,22 @@ concertband marching - - D♭ Piccolo - D♭ Picc. - Piccolo Flute in Db - wind.flutes.flute.piccolo - G - G8va - 1 - 75-106 - 75-109 - 8 - 13 - - - - + + D♭ Piccolo + D♭ Picc. + Piccolo Flute in Db + wind.flutes.flute.piccolo + G + G8va + 1 + 75-106 + 75-109 + 8 + 13 + + + + Flute Fl. @@ -172,7 +172,7 @@ Sub Contra-alto Flute Sc-a. Fl. Subcontra-alto Flute - wind.flutes.flute + wind.flutes.flute.subcontrabass G F 1 @@ -1721,8 +1721,7 @@ B♭ Clarinet B♭ Cl. - B♭ Clarinet (same as clarinet, added for MusicXML 3 - compatibility) + B♭ Clarinet (same as clarinet, added for MusicXML 3 compatibility) wind.reed.clarinet.bflat G 1 @@ -1858,22 +1857,22 @@ orchestra - A Bass Clarinet (Bass Clef) - A B. Cl. - Bass Clarinet (Bass Clef) - wind.reed.clarinet.bass - F - F - 1 - 36-74 - 36-78 - -2 - -3 - - - - orchestra - + A Bass Clarinet (Bass Clef) + A B. Cl. + Bass Clarinet (Bass Clef) + wind.reed.clarinet.bass + F + F + 1 + 36-74 + 36-78 + -2 + -3 + + + + orchestra + Contra-alto Clarinet C-a. Cl. @@ -2883,7 +2882,7 @@ Horn in B♭ B♭ Hn. High B♭ Horn - brass.natural-horn + brass.french-horn G 1 44-77 @@ -3455,8 +3454,7 @@ Tenor Trumpet T. Tpt. - Tenor Trumpet (included for MusicXML 3 compatibility no - range information available) + Tenor Trumpet (included for MusicXML 3 compatibility no range information available) brass.trumpet.tenor G 1 @@ -3668,7 +3666,7 @@ Soprano Bugle - Sop. Bu. + Sop. Soprano Bugle brass.bugle.soprano G @@ -3682,7 +3680,7 @@ Alto Bugle - Alt. Bu. + Alto Alto Bugle brass.bugle.alto G @@ -3696,7 +3694,7 @@ Baritone Bugle - Bar. Bu. + Bari. Bugle brass.bugle.baritone G @@ -3761,7 +3759,7 @@ Euphonium Bugle - Euph. Bu. + Euph. Euphonium Bugle brass.bugle.euphonium-bugle G @@ -3777,7 +3775,7 @@ Mellophone Bugle - Mel. Bu. + Mello Bugle brass.bugle.mellophone-bugle G @@ -3791,7 +3789,7 @@ Contrabass Bugle - Con. Bu. + Contra Contrabass Bugle brass.bugle.contrabass G @@ -3807,7 +3805,7 @@ Mellophone - Mph. + Mello Mellophone brass.mellophone G @@ -4270,7 +4268,7 @@ 22-72 - + orchestra @@ -5143,7 +5141,7 @@ marching - Snare Drum + Concert Snare Drum Sn. Dr. Snare Drum PERC @@ -5627,7 +5625,7 @@ concertband marching - + Bells Be. Bells @@ -6063,6 +6061,7 @@ Splash Cymbal Sp. Cym. Splash Cymbal + metal.cymbal.splash PERC percussion 1 @@ -6348,7 +6347,7 @@ Thundersheet Thu. Thundersheet - effect.thunder + metal.thundersheet PERC percussion 1 @@ -6506,6 +6505,7 @@ Stones Sto. Stones + rattle.lava-stones PERC percussion 1 @@ -6527,6 +6527,7 @@ Finger Snap Fi. Sna. Finger Snap + effect.snap PERC percussion 1 @@ -6922,188 +6923,188 @@ percussion PERC 1 - - 0 - 7 - 0 - Drum 4 - A - 1 - - - 1 - 7 - 0 - Drum4 Rim - B - 1 - - - 2 - 7 - 0 - Drum4 Buzz - 1 - - - 6 - 7 - 0 - Drum4 Muted - 1 - - - 5 - 7 - 0 - Drum4 Shell - 1 - - - 3 - -1 - 0 - sticks - 2 - - - 0 - 5 - 0 - Drum3 - C - 1 - - - 1 - 5 - 0 - Drum3 Rim - D - 1 - - - 2 - 5 - 0 - Drum3 Buzz - 1 - - - 6 - 5 - 0 - Drum3 Muted - 1 - - - 5 - 5 - 0 - Drum3 Shell - 1 - - - 0 - 3 - 0 - Drum2 - E - 1 - - - 1 - 3 - 0 - Drum2 Rim - F - 1 - - - 2 - 3 - 0 - Drum2 Buzz - 1 - - - 6 - 3 - 0 - Drum2 Muted - 1 - - - 0 - 1 - 0 - Drum1 - G - 1 - - - 1 - 1 - 0 - Drum1 Rim - 1 - - - 2 - 1 - 0 - Drum1 Buzz - 1 - - - 6 - 1 - 0 - Drum1 Muted - 1 - - - 0 - -1 - 0 - Spock 1 - 1 - - - 1 - -1 - 0 - Spock 1 Rim - 1 - - - 2 - -1 - 0 - Spock 1 Buzz - 1 - - - 0 - -2 - 0 - Spock 2 - 1 - - - 1 - -2 - 0 - Spock 2 Rim - 1 - - - 2 - -2 - 0 - Spock 2 Buzz - 1 - + + 0 + 7 + 0 + Drum 4 + A + 1 + + + 1 + 7 + 0 + Drum4 Rim + B + 1 + + + 2 + 7 + 0 + Drum4 Buzz + 1 + + + 6 + 7 + 0 + Drum4 Muted + 1 + + + 5 + 7 + 0 + Drum4 Shell + 1 + + + 3 + -1 + 0 + sticks + 2 + + + 0 + 5 + 0 + Drum3 + C + 1 + + + 1 + 5 + 0 + Drum3 Rim + D + 1 + + + 2 + 5 + 0 + Drum3 Buzz + 1 + + + 6 + 5 + 0 + Drum3 Muted + 1 + + + 5 + 5 + 0 + Drum3 Shell + 1 + + + 0 + 3 + 0 + Drum2 + E + 1 + + + 1 + 3 + 0 + Drum2 Rim + F + 1 + + + 2 + 3 + 0 + Drum2 Buzz + 1 + + + 6 + 3 + 0 + Drum2 Muted + 1 + + + 0 + 1 + 0 + Drum1 + G + 1 + + + 1 + 1 + 0 + Drum1 Rim + 1 + + + 2 + 1 + 0 + Drum1 Buzz + 1 + + + 6 + 1 + 0 + Drum1 Muted + 1 + + + 0 + -1 + 0 + Spock 1 + 1 + + + 1 + -1 + 0 + Spock 1 Rim + 1 + + + 2 + -1 + 0 + Spock 1 Buzz + 1 + + + 0 + -2 + 0 + Spock 2 + 1 + + + 1 + -2 + 0 + Spock 2 Rim + 1 + + + 2 + -2 + 0 + Spock 2 Buzz + 1 + 100 100 @@ -7127,90 +7128,90 @@ percussion PERC 1 - - 0 - 7 - 0 - Bass Drum 1 - A - 1 - - - 1 - 7 - 0 - Bass Drum 1 Rim Knock - B - 1 - - - 0 - 5 - 0 - Bass Drum 2 - C - 1 - - - 1 - 5 - 0 - Bass Drum 2 Rim Knock - D - 1 - - - 0 - 3 - 0 - Bass Drum 3 - E - 1 - - - 1 - 3 - 0 - Bass Drum 3 Rim Knock - F - 1 - - - 0 - 1 - 0 - Bass Drum 4 - G - 1 - - - 1 - 1 - 0 - Bass Drum 4 Rim Knock - 1 - - - 0 - -1 - 0 - Bass Drum 5 - 1 - - - 1 - -1 - 0 - Bass Drum 5 Rim Knock - 1 - - - 5 - 4 - 0 - Simultaneous Hit - 1 - + + 0 + 7 + 0 + Bass Drum 1 + A + 1 + + + 1 + 7 + 0 + Bass Drum 1 Rim Knock + B + 1 + + + 0 + 5 + 0 + Bass Drum 2 + C + 1 + + + 1 + 5 + 0 + Bass Drum 2 Rim Knock + D + 1 + + + 0 + 3 + 0 + Bass Drum 3 + E + 1 + + + 1 + 3 + 0 + Bass Drum 3 Rim Knock + F + 1 + + + 0 + 1 + 0 + Bass Drum 4 + G + 1 + + + 1 + 1 + 0 + Bass Drum 4 Rim Knock + 1 + + + 0 + -1 + 0 + Bass Drum 5 + 1 + + + 1 + -1 + 0 + Bass Drum 5 Rim Knock + 1 + + + 5 + 4 + 0 + Simultaneous Hit + 1 + 100 100 @@ -7339,7 +7340,7 @@ Vocals - Voice Vo. @@ -7865,347 +7866,8 @@ common orchestra - @@ -8707,6 +8369,7 @@ Mallet Synthesizer Mal. Syn. Mallet Synthesizer + synth.group 2 G 1 @@ -8808,7 +8471,7 @@ Percussion Synthesizer Perc. Syn. Percussion Synthesizer - "drum.snare-drum.electric" + drum.tom-tom.synth PERC percussion 1 @@ -8861,7 +8524,7 @@ Banjo (Tablature) pluck.banjo tablature - + common jazz @@ -8886,34 +8549,34 @@ - Irish Tenor Banjo - ITB - 4 string Irish Tenor Banjo - pluck.banjo.tenor - world - - 19 - 43 - 50 - 57 - 64 - - G8vb - 1 - 43-69 - 43-76 - - - + Irish Tenor Banjo + ITB + 4 string Irish Tenor Banjo + pluck.banjo.tenor + world + + 19 + 43 + 50 + 57 + 64 + + G8vb + 1 + 43-69 + 43-76 + + + - Irish Tenor Banjo [Tablature] - irish-tenor-banjo - Irish Tenor Banjo (Tablature) - pluck.banjo.tenor - tablature - - world + Irish Tenor Banjo [Tablature] + irish-tenor-banjo + Irish Tenor Banjo (Tablature) + pluck.banjo.tenor + tablature + + world Balalaika @@ -9199,7 +8862,7 @@ Acoustic Nylon Strung Guitar (Tablature) pluck.guitar.nylon-string tablature - + common @@ -9314,7 +8977,7 @@ Acoustic Steel Strung Guitar (Tablature) pluck.guitar.acoustic tablature - + common classroom @@ -9387,7 +9050,7 @@ popular - Electric Guitar El. Guit. @@ -9444,7 +9107,7 @@ electric-guitar Electric Guitar (Tablature) tablature - + common popular @@ -9543,7 +9206,7 @@ Lute (Tablature) pluck.lute tablature - + earlymusic @@ -9819,13 +9482,14 @@ Mandolin (Tablature) pluck.mandolin tablature - - popular + + popular Mandola Mda. Mandola + pluck.mandola 24 48 @@ -9978,7 +9642,7 @@ Ukulele (4-str. TAB) pluck.ukulele tablature - + common popular classroom @@ -10027,7 +9691,7 @@ Baritone Ukulele Bar. Uk. Baritone Ukulele - pluck.ukulele + pluck.ukulele.tenor 18 50 @@ -10076,7 +9740,7 @@ Bass Guitar (Tablature) pluck.bass tablature - + common popular @@ -10157,7 +9821,7 @@ Electric Bass (Tablature) pluck.bass.electric tablature - + common popular @@ -10230,7 +9894,7 @@ 5-string-electric-bass 5-string Electric Bass (Tablature) tablature - + common popular @@ -10271,7 +9935,7 @@ 5-string-electric-bass-high-c 5-string Electric Bass (High C/Tenor) (Tablature) tablature - + jazz @@ -10311,7 +9975,7 @@ 6-string-electric-bass 6-string Electric Bass (Tablature) tablature - + jazz @@ -10822,7 +10486,7 @@ viola-da-gamba Viola da gamba (Tablature) tablature - + earlymusic @@ -10914,4 +10578,4 @@ earlymusic - + \ No newline at end of file From 35e437faa71f9d936aa217aa9dde5d6e2256f483 Mon Sep 17 00:00:00 2001 From: Daniel Ray Date: Fri, 6 Apr 2018 19:32:28 +0200 Subject: [PATCH 7/7] Resolved Concert Snare Drum conflict --- share/instruments/instruments.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/instruments/instruments.xml b/share/instruments/instruments.xml index d32c92ff3e3d..8e5db65d7b15 100644 --- a/share/instruments/instruments.xml +++ b/share/instruments/instruments.xml @@ -5141,7 +5141,7 @@ marching - Concert Snare Drum + Snare Drum Sn. Dr. Snare Drum PERC