v0.2.6

shellyln · Sep 11, 2018 · 898b2e6 · 898b2e6
1 parent 8811d54
commit 898b2e6
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 29 deletions.
diff --git a/packages/_debug_app/package-lock.json b/packages/_debug_app/package-lock.json
diff --git a/packages/_debug_app/package.json b/packages/_debug_app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "red-agate-debug-env",
   "private": true,
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "red-agate debug environment",
   "keywords": [],
   "main": "./dist/app.js",
@@ -17,10 +17,10 @@
     "puppeteer": "^1.7.0"
   },
   "peerDependencies": {
-    "red-agate": "^0.2.5",
-    "red-agate-barcode": "^0.2.5",
+    "red-agate": "^0.2.6",
+    "red-agate-barcode": "^0.2.6",
     "red-agate-math": "^0.2.0",
-    "red-agate-svg-canvas": "^0.2.5",
+    "red-agate-svg-canvas": "^0.2.6",
     "red-agate-util": "^0.2.0"
   },
   "devDependencies": {

diff --git a/packages/_lib-dist/package-lock.json b/packages/_lib-dist/package-lock.json
diff --git a/packages/_lib-dist/package.json b/packages/_lib-dist/package.json
@@ -1,7 +1,7 @@
 {
   "name": "red-agate-lib-dist",
   "private": true,
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "red-agate debug environment",
   "keywords": [],
   "main": "./dist/app.js",
@@ -17,11 +17,11 @@
     "puppeteer": "^1.7.0"
   },
   "peerDependencies": {
-    "red-agate": "^0.2.5",
-    "red-agate-barcode": "^0.2.5",
+    "red-agate": "^0.2.6",
+    "red-agate-barcode": "^0.2.6",
     "red-agate-math": "^0.2.0",
-    "red-agate-react-host": "^0.2.5",
-    "red-agate-svg-canvas": "^0.2.5",
+    "red-agate-react-host": "^0.2.6",
+    "red-agate-svg-canvas": "^0.2.6",
     "red-agate-util": "^0.2.0"
   },
   "devDependencies": {

diff --git a/packages/red-agate-barcode/package-lock.json b/packages/red-agate-barcode/package-lock.json
diff --git a/packages/red-agate-barcode/package.json b/packages/red-agate-barcode/package.json
@@ -1,7 +1,7 @@
 {
   "name": "red-agate-barcode",
   "private": false,
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "red-agate barcode tag library.",
   "keywords": [
     "QR Code",
@@ -24,9 +24,9 @@
   },
   "dependencies": {},
   "peerDependencies": {
-    "red-agate": "^0.2.5",
+    "red-agate": "^0.2.6",
     "red-agate-math": "^0.2.0",
-    "red-agate-svg-canvas": "^0.2.5",
+    "red-agate-svg-canvas": "^0.2.6",
     "red-agate-util": "^0.2.0"
   },
   "devDependencies": {

diff --git a/packages/red-agate-react-host/package-lock.json b/packages/red-agate-react-host/package-lock.json
diff --git a/packages/red-agate-react-host/package.json b/packages/red-agate-react-host/package.json
@@ -1,7 +1,7 @@
 {
   "name": "red-agate-react-host",
   "private": false,
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Using react componetns from RedAgate.",
   "keywords": [
     "RedAgate",
@@ -17,9 +17,9 @@
   },
   "dependencies": {},
   "peerDependencies": {
-    "red-agate": "^0.2.5",
+    "red-agate": "^0.2.6",
     "red-agate-math": "^0.2.0",
-    "red-agate-svg-canvas": "^0.2.5",
+    "red-agate-svg-canvas": "^0.2.6",
     "red-agate-util": "^0.2.0",
     "react": "^16.4.2",
     "react-dom": "^16.4.2"

diff --git a/packages/red-agate-svg-canvas/package-lock.json b/packages/red-agate-svg-canvas/package-lock.json
diff --git a/packages/red-agate-svg-canvas/package.json b/packages/red-agate-svg-canvas/package.json
@@ -1,7 +1,7 @@
 {
   "name": "red-agate-svg-canvas",
   "private": false,
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "red-agate svg canvas library.",
   "keywords": [
     "SVG",

diff --git a/packages/red-agate-svg-canvas/src/drawing/canvas/SvgCanvas.ts b/packages/red-agate-svg-canvas/src/drawing/canvas/SvgCanvas.ts
@@ -1410,8 +1410,17 @@ export class SvgCanvas implements VectorCanvas2D {
         this.content += "</g>";
     }
 
+
+    // tslint:disable-next-line:variable-name
+    private _fontHeightRatio = 1.25;
+    public get fontHeightRatio(): number {
+        return this._fontHeightRatio;
+    }
+    public set fontHeightRatio(value: number) {
+        this._fontHeightRatio = value;
+    }
     public measureText(text: string): { width: number; } {
-        const re = this.font.match(/(\d+(?:.\d+))(px|pt|in|mm|em|rem|%)/);
+        const re = this.font.match(/(\d+(?:.\d+)?)(px|pt|in|mm|em|rem|%)/);
         let scale = 1;
         let size = 12;
         if (re) {
@@ -1437,7 +1446,10 @@ export class SvgCanvas implements VectorCanvas2D {
             }
             size = Number.parseFloat(re[1]);
         }
-        return { width: scale * size * text.length };
+        return { width: Math.round(scale * size * Array.from(text
+            .replace(/[\u200B-\u200D\uFEFF\u200E\u200F]/g, '')
+            .normalize('NFKC')).length / this.fontHeightRatio)
+        };
     }
 
     public clearRect(x: number, y: number, w: number, h: number): void {

diff --git a/packages/red-agate/package-lock.json b/packages/red-agate/package-lock.json
diff --git a/packages/red-agate/package.json b/packages/red-agate/package.json
@@ -1,7 +1,7 @@
 {
   "name": "red-agate",
   "private": false,
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Static HTML|XML|SVG renderer using JSX, suitable for report output.",
   "keywords": [
     "svg",
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "red-agate-math": "^0.2.0",
-    "red-agate-svg-canvas": "^0.2.5",
+    "red-agate-svg-canvas": "^0.2.6",
     "red-agate-util": "^0.2.0"
   },
   "peerDependencies": {