Patch-release for #122 and #128

metafloor · Mar 11, 2019 · d6e15a7 · d6e15a7
1 parent 0b4275d
commit d6e15a7
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ found at the end of this document.
 
 ## Status 
 
-* Current bwip-js version is 1.7.1 (2018-08-01)
+* Current bwip-js version is 1.7.2 (2019-03-11)
 * Current BWIPP version is 2018-02-04
 * Node.js compatibility: 0.12+
 * Browser compatibility: IE10+, Edge, Firefox, Chrome

diff --git a/barcode.ps b/barcode.ps
diff --git a/bwipjs.js b/bwipjs.js
@@ -602,7 +602,7 @@ BWIPJS.prototype.render = function(callback) {
 	}
 }
 
-BWIPJS.VERSION = '1.7.1 (2018-08-01)';
+BWIPJS.VERSION = '1.7.2 (2019-03-11)';
 if (typeof module === 'object' && module.exports) {
 	module.exports = BWIPJS;
 }
diff --git a/bwipp-min.js b/bwipp-min.js
diff --git a/bwipp.js b/bwipp.js
@@ -4,7 +4,7 @@
 // This code was automatically generated from:
 // Barcode Writer in Pure PostScript - Version 2018-02-04
 //
-// Copyright (c) 2011-2018 Mark Warren
+// Copyright (c) 2011-2019 Mark Warren
 // Copyright (c) 2004-2014 Terry Burton
 //
 // Licensed MIT. See the LICENSE file in the bwip-js root directory.
@@ -5406,7 +5406,7 @@ function BWIPP() {
 		$1.checksum = (10 - ($1.checksum % 10)) % 10; /*5599*/
 		if ($1.barcode.length == 18) { /*5604*/
 			if ($get($1.barcode, 17) != ($1.checksum + 48)) { /*5603*/
-				$k[$j++] = "bwipp.databaromniBadCheckDigit"; /*5602*/
+				$k[$j++] = "bwipp.databarlimitedBadCheckDigit"; /*5602*/
 				$k[$j++] = "Incorrect GS1 DataBar Limited check digit provided"; /*5602*/
 				$0.raiseerror(); /*5602*/
 			} /*5602*/

diff --git a/node-fonts.js b/node-fonts.js
@@ -102,7 +102,11 @@ function getglyph(fontid, charcode, width, height) {
 	if (!font) {
 		// We can avoid this Sync() interface (the browser version does), but
 		// requires more work for the user.
-		var bytes = fs.readFileSync(__dirname + '/fonts/fnt' + fontid +
+		var fontdir = process.env.BWIPJS_FONTS || __dirname + '/fonts';
+		if (fontdir[fontdir.length-1] == '/') {
+			fontdir = fontdir.substr(0, fontdir.length-1);
+		}
+		var bytes = fs.readFileSync(fontdir + '/fnt' + fontid +
 									(monochr ? 'm-' : 'a-') + size + '.bin');
 		fontset.fonts[fkey] = font = { bytes:bytes, glyphs:[] };
 	} 

diff --git a/package.json b/package.json
@@ -1,9 +1,8 @@
 {
   "name": "bwip-js",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "JavaScript barcode generator supporting over 90 types and standards.",
   "main": "node-bwipjs.js",
-  "module": "browser-bwipjs.js",
   "browser": "browser-bwipjs.js",
   "bin": {
     "bwip-js": "./bin/node-bwipjs.js"