Text to MIDI

jazz-soft · Sep 16, 2021 · 1cfde03 · 1cfde03
1 parent 103de55
commit 1cfde03
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -68,15 +68,15 @@ by running `npm remove midi-test --save-dev`.
 
 ```html
 <script src="https://cdn.jsdelivr.net/npm/jzz"></script>       // the latest version, or
-<script src="https://cdn.jsdelivr.net/npm/jzz@1.4.0"></script> // any particular version
+<script src="https://cdn.jsdelivr.net/npm/jzz@1.4.1"></script> // any particular version
 //...
 ```
 
 ##### CDN (unpkg)
 
 ```html
 <script src="https://unpkg.com/jzz"></script>       // the latest version, or
-<script src="https://unpkg.com/jzz@1.4.0"></script> // any particular version
+<script src="https://unpkg.com/jzz@1.4.1"></script> // any particular version
 //...
 ```
 
@@ -195,9 +195,11 @@ navigator.requestMIDIAccess = JZZ.requestMIDIAccess;
 JZZ.MIDI.freq('A5'); // => 440
 JZZ.MIDI.freq(69);   // => 440
 JZZ.MIDI.freq(69.5); // => 452.8929841231365
-
+// from the frequency:
 JZZ.MIDI.midi(440);  // => 69
 JZZ.MIDI.midi(450);  // => 69.38905773230853
+// or from the name:
+JZZ.MIDI.midi('A5'); // => 69
 ```
 
 ## Additional modules

diff --git a/javascript/JZZ.js b/javascript/JZZ.js
@@ -14,7 +14,7 @@
 })(this, function() {
 
   var _scope = typeof window === 'undefined' ? global : window;
-  var _version = '1.4.0';
+  var _version = '1.4.1';
   var i, j, k, m, n;
 
   /* istanbul ignore next */
@@ -1555,7 +1555,10 @@
     _float(f0);
     return Math.log2(f / f0) * 12;
   };
-  MIDI.midi = function(f, f0) { return MIDI.shift(f, f0) + 69; };
+  MIDI.midi = function(f, f0) {
+    if (f != parseFloat(f)) return _7bn(f);
+    return MIDI.shift(f, f0) + 69;
+  };
   MIDI.to14b = function(x) {
     _float(x);
     return x <= 0 ? 0 : x >= 1 ? 0x3fff : Math.floor(x * 0x4000);

diff --git a/minified/JZZ.js b/minified/JZZ.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jzz",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "MIDI library for Node.js and web-browsers",
   "main": "javascript/JZZ.js",
   "scripts": {
@@ -26,7 +26,7 @@
     "grunt-contrib-jshint": "^3.0.0",
     "grunt-contrib-uglify": "^5.0.1",
     "midi-test": "^1.1.8",
-    "mocha": "^9.1.0",
+    "mocha": "^9.1.1",
     "nyc": "^15.1.0",
     "web-midi-test": "^1.1.8"
   },

diff --git a/test/common.js b/test/common.js
@@ -647,7 +647,9 @@ describe('MIDI messages', function() {
   });
   it('midi', function() {
     assert.equal(JZZ.MIDI.midi(50) - JZZ.MIDI.shift(50), 69);
+    assert.equal(JZZ.MIDI.midi('C#5'), 61);
     assert.throws(function() { JZZ.MIDI.midi(50, 'dummy'); });
+    assert.throws(function() { JZZ.MIDI.midi('dummy'); });
   });
   it('to14b', function() {
     assert.equal(JZZ.MIDI.to14b(-.01), 0);

diff --git a/web-midi-api/package.json b/web-midi-api/package.json
@@ -13,7 +13,7 @@
     "web-midi-api"
   ],
   "dependencies": {
-    "jzz": "^1.4.0"
+    "jzz": "^1.4.1"
   },
   "contributors": [
     {