diff --git a/src/SymbolHandler.mss b/src/SymbolHandler.mss index f8328e8..eba82df 100644 --- a/src/SymbolHandler.mss +++ b/src/SymbolHandler.mss @@ -17,9 +17,10 @@ function InitSymbolHandlers () { '37', 'HandleControlEvent', //mordent '38', 'HandleControlEvent', //turn '39', 'HandleControlEvent', //inverted turn - '52', 'HandleModifier', //heel - '53', 'HandleModifier', //heel (2) (was toe in previous version, but this seems to be wrong) - '54', 'HandleModifier', //toe + '52', 'HandleModifier', //heel 1 + '53', 'HandleModifier', //heel 2 + '54', 'HandleModifier', //toe 1 + '55', 'HandleModifier', //toe 2 '160', 'HandleModifier', //stop '162', 'HandleModifier', //open '163', 'HandleModifier', //damp @@ -72,9 +73,10 @@ function InitSymbolMap () { '37', CreateSparseArray('Mordent', CreateDictionary('form','upper')), //mordent '38', CreateSparseArray('Turn', CreateDictionary('form', 'upper')), //turn '39', CreateSparseArray('Turn', CreateDictionary('form', 'lower')), //inverted turn - '52', CreateSparseArray('Artic', CreateDictionary('artic','heel')), //heel - '53', CreateSparseArray('Artic', CreateDictionary('artic','heel')), //heel (2) (was toe in previous version, but this seems to be wrong) - '54', CreateSparseArray('Artic', CreateDictionary('artic','toe')), //toe + '52', CreateSparseArray('Artic', CreateDictionary('artic','heel')), //heel 1 + '53', CreateSparseArray('Artic', CreateDictionary('artic','heel')), //heel 2 + '54', CreateSparseArray('Artic', CreateDictionary('artic','toe')), //toe 1 + '55', CreateSparseArray('Artic', CreateDictionary('artic','toe')), //toe 2 '160', CreateSparseArray('Artic', CreateDictionary('artic','stop')), //stop '162', CreateSparseArray('Artic', CreateDictionary('artic','open')), //open '163', CreateSparseArray('Artic', CreateDictionary('artic','damp')), //damp diff --git a/test/mocha/test-symbols.js b/test/mocha/test-symbols.js index ebc6da1..48ba582 100644 --- a/test/mocha/test-symbols.js +++ b/test/mocha/test-symbols.js @@ -25,8 +25,8 @@ describe("Symbols", function() { }); describe("Modifiers (children of note): Articulations", function() { var artics = xpath.evaluateXPath('//*:artic', meiSymbols); - it("21 articulations were created", function () { - assert.strictEqual(artics.length, 21, "Not all 21 articulations were created"); + it("22 articulations were created", function () { + assert.strictEqual(artics.length, 22, "Not all 22 articulations were created"); }); it(" is child of ", function() { for (let count = 0; count < artics.length; count++) { @@ -37,8 +37,7 @@ describe("Symbols", function() { utils.assertHasAttr(artics, "artic"); }); it(" with @place", function() { - utils.assertElsHasAttr(artics, [9, 10, 11, 12, 13, 14], 'place'); + utils.assertElsHasAttr(artics, [10, 11, 12, 13, 14, 15], 'place'); }); }); }); - \ No newline at end of file diff --git a/test/sibmeiTestSibs/symbols.sib b/test/sibmeiTestSibs/symbols.sib index 617f733..a5ac6d6 100644 Binary files a/test/sibmeiTestSibs/symbols.sib and b/test/sibmeiTestSibs/symbols.sib differ