Merge pull request #24 from hitz-group/GaneshTILLX/change-to-utf-enco…

…ding

Ganesh tillx/change to utf encoding

package.json

@@ -8,7 +8,7 @@
     "xml",
     "printer"
   ],
-  "version": "0.2.4",
+  "version": "0.2.7",
   "files": [
     "lib",
     "LICENSE",

src/buffer-builder.ts

@@ -3,14 +3,14 @@ import { MutableBuffer } from "mutable-buffer";
 import Image from "./image";
 export class BufferBuilder {
   private buffer: MutableBuffer;
+  private hasGSCommand: boolean;
+  private doEmphasise: boolean;
 
   constructor(private defaultSettings: boolean = true) {
     this.buffer = new MutableBuffer();
+    this.hasGSCommand = true;
+    this.doEmphasise = false;
 
-    if (this.defaultSettings) {
-      this.resetCharacterSize();
-      this.resetCharacterCodeTable();
-    }
   }
 
   public end(): BufferBuilder {
@@ -26,13 +26,40 @@ export class BufferBuilder {
     width: number = 0,
     height: number = 0
   ): BufferBuilder {
-    let size = (width << 4) + height;
-    this.buffer.write(Command.GS_exclamation(size));
+    if(this.hasGSCommand)
+    {
+      let size = (width << 4) + height;
+      this.buffer.write(Command.GS_exclamation(size));
+    }
+    else{
+      let mode = (width>0?(1<<5):0)+(height>0?(1<<4):0)+(this.doEmphasise?(1<<3):0)+1;
+      this.buffer.write(Command.ESC_exclamation(mode));
+    }
+
+    return this;
+  }
+
+  public setPrintMode(setting:boolean): BufferBuilder {
+    this.hasGSCommand = setting;
+    if(setting) this.resetCharacterEncoding();
+    this.resetCharacterSize();
     return this;
   }
 
   public resetCharacterSize(): BufferBuilder {
-    this.buffer.write(Command.GS_exclamation(0));
+    if(this.hasGSCommand)
+    {
+      this.buffer.write(Command.GS_exclamation(0));
+    }
+    else
+    {
+      this.buffer.write(Command.ESC_exclamation(1));
+    }
+    return this;
+  }
+
+  public resetCharacterEncoding(): BufferBuilder {
+    this.buffer.write(Command.FS_ob_C_fe_utf);
     return this;
   }
 
@@ -47,12 +74,12 @@ export class BufferBuilder {
   }
 
   public startBold(): BufferBuilder {
-    this.buffer.write(Command.ESC_E(1));
+    this.hasGSCommand? this.buffer.write(Command.ESC_E(1)):this.doEmphasise=true;
     return this;
   }
 
   public endBold(): BufferBuilder {
-    this.buffer.write(Command.ESC_E(0));
+    this.hasGSCommand? this.buffer.write(Command.ESC_E(0)):this.doEmphasise=false;
     return this;
   }
 
@@ -142,7 +169,7 @@ export class BufferBuilder {
   }
 
   public printText(text: string): BufferBuilder {
-    this.buffer.write(text, "ascii");
+    this.buffer.write(text, "utf8");
     return this;
   }
 

src/command.ts

@@ -27,6 +27,7 @@ export class Command {
   public static ESC_Z              = (m: number, n: number, k: number): number[] => [Command.ESC, 0x5A, m, n, k]; // ESCZmnk
 
   public static FS_and: number[]   = [Command.FS, 0x40]; //ESC@
+  public static FS_ob_C_fe_utf     = [Command.FS, 0x28, 0x43, 0x02, 0x00, 0x30, 0x02]; //UTF-8 encoding
 
   public static GS_exclamation     = (n: number): number[] => [Command.GS, 0x21, n]; // ESC!n
   public static GS_B               = (n: number): number[] => [Command.GS, 0x42, n]; // GSBn

src/node-factory.ts

@@ -13,6 +13,7 @@ import WhiteModeNode from './nodes/white-mode-node';
 import PaperCutNode from './nodes/paper-cut-node';
 import ImageNode from './nodes/image-node';
 import OpenCashDrawerNode from './nodes/open-cash-drawer-node';
+import PrintModeNode from './nodes/print-mode';
 
 export class NodeFactory {
 
@@ -33,6 +34,7 @@ export class NodeFactory {
       case 'paper-cut': return new PaperCutNode(node);
       case 'open-cash-drawer': return new OpenCashDrawerNode(node);
       case 'image':       return new ImageNode(node);
+      case 'print-mode':  return new PrintModeNode(node);
 
       default:           return null;
     }

src/nodes/print-mode.ts

@@ -0,0 +1,27 @@
+import { XMLNode } from '../xml-node';
+import { BufferBuilder } from '../buffer-builder';
+
+export default class PrintModeNode extends XMLNode {
+
+  constructor(node: any) {
+    super(node);
+  }
+
+  public open(bufferBuilder: BufferBuilder): BufferBuilder {
+    if(this.attributes.mode === 'U220')
+    {
+      bufferBuilder.setPrintMode(false);
+    }
+    else
+    {
+      bufferBuilder.setPrintMode(true);
+    }
+    return bufferBuilder;
+  }
+
+  public close(bufferBuilder: BufferBuilder): BufferBuilder {
+    bufferBuilder.resetAlign();
+    return bufferBuilder;
+  }
+
+}