fix word-width

Author: nateyu

lib/adapter/esc.js

@@ -1,10 +1,9 @@
 'use strict'
 
-const wordWidth = require('word-width')
 const iconv = require('iconv-lite')
 const escpos = require('escpos')
 const qrcodeGenerator = require('../qrcode')
-const { wordWrap, sliceText } = require('../utils')
+const { wordWrap, sliceText, calWords } = require('../utils')
 const _ = escpos.command
 
 /**
@@ -30,7 +29,7 @@ escpos.Printer.prototype.tableCustomExt = function (data, encoding) {
       cellWidth = obj.cols
     }
 
-    var textLenghth = wordWidth(obj.text)
+    var textLenghth = calWords(obj.text)
 
     // If text is too wide go to next line
     if (cellWidth < textLenghth || (obj.chunks && obj.chunks.length)) {
@@ -57,7 +56,7 @@ escpos.Printer.prototype.tableCustomExt = function (data, encoding) {
     }
 
     if (obj.align === 'CENTER') {
-      const spaces = (cellWidth - wordWidth(obj.text.trim())) / 2
+      const spaces = (cellWidth - calWords(obj.text.trim())) / 2
       for (let j = 0; j < spaces; j++) {
         lineStr += ' '
       }
@@ -67,15 +66,15 @@ escpos.Printer.prototype.tableCustomExt = function (data, encoding) {
         lineStr += ' '
       }
     } else if (obj.align === 'RIGHT') {
-      const spaces = cellWidth - wordWidth(obj.text.trim())
+      const spaces = cellWidth - calWords(obj.text.trim())
       for (let j = 0; j < spaces; j++) {
         lineStr += ' '
       }
       if (obj.text !== '') { lineStr += obj.text.trim() }
     } else {
       if (obj.text !== '') { lineStr += obj.text.trim() }
 
-      const spaces = cellWidth - wordWidth(obj.text.trim())
+      const spaces = cellWidth - calWords(obj.text.trim())
       for (let j = 0; j < spaces; j++) {
         lineStr += ' '
       }

lib/utils.js

@@ -1,7 +1,19 @@
 'use strict'
 
 const wordWith = require('word-width')
-const isChinese = require('is-chinese')
+
+const calWords = function (text) {
+  const pins = ["’", "√"]
+  let len = wordWith(text)
+  for(let i=0;i<text.length;i++) {
+    if (pins.includes(text[i])) {
+      len ++
+    }
+  }
+  return len
+}
+
+exports.calWords = calWords
 
 exports.converter = function (...args) {
   const key = args.join('-')
@@ -30,14 +42,10 @@ exports.converter = function (...args) {
   return valueMap[key]
 }
 
-exports.calWords = function (text) {
-  return wordWith(text)
-}
-
 const wordWrap = function (text, width = 1) {
   let chunk = []
   let lineStr = ''
-  let tokenRe = /.+?(\b|$)/g
+  let tokenRe = /.+?(\s|$)/g
   let words = text.match(tokenRe)
 
   if (width <= 0) {
@@ -51,8 +59,8 @@ const wordWrap = function (text, width = 1) {
   for (let index = 0; index < words.length; index++) {
     let word = words[index]
     let preAppendStr = lineStr + word
-    let chunkSize = wordWith(preAppendStr)
-    let wordSize = wordWith(word)
+    let chunkSize = calWords(preAppendStr)
+    let wordSize = calWords(word)
 
     if (chunkSize < width) {
       lineStr += word
@@ -70,11 +78,11 @@ const wordWrap = function (text, width = 1) {
       } else {
         let slices = sliceText(word, width)
         if (slices.length === 1) {
-          wordWith(slices[0]) < width ? lineStr += slices[0] : chunk.push(slices[0])
+          calWords(slices[0]) < width ? lineStr += slices[0] : chunk.push(slices[0])
         } else if (slices.length > 1) {
           chunk = chunk.concat(slices.slice(0, slices.length - 1))
           let last = slices[slices.length - 1]
-          wordWith(last) < width ? lineStr += last : chunk.push(last)
+          calWords(last) < width ? lineStr += last : chunk.push(last)
         }
       }
     }
@@ -93,9 +101,9 @@ const sliceText = function (text, width = 1) {
     let preAppendStr = lineStr + char
     if (width === 1) {
       char.length && chunk.push(char)
-    } else if (wordWith(preAppendStr) < width) {
+    } else if (calWords(preAppendStr) < width) {
       lineStr += char
-    } else if (wordWith(preAppendStr) === width) {
+    } else if (calWords(preAppendStr) === width) {
       preAppendStr.length && chunk.push(preAppendStr)
       lineStr = ''
     } else {