abstract-image 3.3.2 → 3.4.0

package/lib/exporters/eps-export-image.js

@@ -21,7 +21,24 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.epsExportImage = void 0;
 const R = __importStar(require("ramda"));
-function epsExportImage(root) {
+function epsExportImage(root, characterEncoding) {
+    if (characterEncoding === "iso-latin-1-encoding") {
+        const eps = [
+            ...createEpsHeaderLines(root),
+            ...createIsoLatin1FontLines(root),
+            ...R.unnest(root.components.map((c) => epsExportComponent(c, root.size.height, "iso-latin-1-encoding"))),
+        ].join("\n");
+        return encodeLatin1Encoding(eps);
+    }
+    else {
+        return [
+            ...createEpsHeaderLines(root),
+            ...R.unnest(root.components.map((c) => epsExportComponent(c, root.size.height, "standard-encoding"))),
+        ].join("\n");
+    }
+}
+exports.epsExportImage = epsExportImage;
+function createEpsHeaderLines(root) {
     return [
         "%!PS-Adobe-3.0 EPSF-3.0",
         `%%BoundingBox: 0 0 ${root.size.width} ${root.size.height}`,
@@ -39,11 +56,9 @@ function epsExportImage(root) {
         "savematrix setmatrix",
         "end",
         "} def",
-        ...R.unnest(root.components.map(c => epsExportComponent(c, root.size.height)))
-    ].join("\n");
+    ];
 }
-exports.epsExportImage = epsExportImage;
-function epsExportComponent(c, height) {
+function epsExportComponent(c, height, characterEncoding) {
     switch (c.type) {
         case "ellipse": {
             const cx = (c.topLeft.x + c.bottomRight.x) * 0.5;
@@ -51,72 +66,66 @@ function epsExportComponent(c, height) {
             const rx = 0.5 * (c.bottomRight.x - c.topLeft.x);
             const ry = 0.5 * (c.bottomRight.y - c.topLeft.y);
             return [
-                ...getColored(c.fillColor, [
-                    `${cx} ${cy} ${rx} ${ry} 0 360 ellipse`,
-                    "closepath",
-                    "fill"
-                ]),
+                ...getColored(c.fillColor, [`${cx} ${cy} ${rx} ${ry} 0 360 ellipse`, "closepath", "fill"]),
                 ...getColored(c.strokeColor, [
                     `${cx} ${cy} ${rx} ${ry} 0 360 ellipse`,
                     "closepath",
                     `${c.strokeThickness} setlinewidth`,
-                    "stroke"
-                ])
+                    "stroke",
+                ]),
             ];
         }
         case "group": {
-            return R.unnest(c.children.map(cc => epsExportComponent(cc, height)));
+            return R.unnest(c.children.map((cc) => epsExportComponent(cc, height, characterEncoding)));
         }
         case "line": {
             return getColored(c.strokeColor, [
                 `${c.start.x} ${height - c.start.y} moveto`,
                 `${c.end.x} ${height - c.end.y} lineto`,
                 `${c.strokeThickness} setlinewidth`,
-                "stroke"
+                "stroke",
             ]);
         }
         case "polygon": {
             return [
                 ...getColored(c.fillColor, [
                     `${c.points[0].x} ${height - c.points[0].y} moveto`,
-                    ...c.points.map(p => `${p.x} ${height - p.y} lineto`),
+                    ...c.points.map((p) => `${p.x} ${height - p.y} lineto`),
                     "closepath",
                     `${c.strokeThickness} setlinewidth`,
-                    "fill"
+                    "fill",
                 ]),
                 ...getColored(c.strokeColor, [
                     `${c.points[0].x} ${height - c.points[0].y} moveto`,
-                    ...c.points.map(p => `${p.x} ${height - p.y} lineto`),
+                    ...c.points.map((p) => `${p.x} ${height - p.y} lineto`),
                     "closepath",
-                    "stroke"
-                ])
+                    "stroke",
+                ]),
             ];
         }
         case "polyline": {
             return getColored(c.strokeColor, [
                 `${c.points[0].x} ${height - c.points[0].y} moveto`,
-                ...c.points.map(p => `${p.x} ${height - p.y} lineto`),
+                ...c.points.map((p) => `${p.x} ${height - p.y} lineto`),
                 `${c.strokeThickness} setlinewidth`,
-                "stroke"
+                "stroke",
             ]);
         }
         case "rectangle": {
             const w = c.bottomRight.x - c.topLeft.x;
             const h = c.bottomRight.y - c.topLeft.y;
             return [
-                ...getColored(c.fillColor, [
-                    `${c.topLeft.x} ${height - c.bottomRight.y} ${w} ${h} rectfill`
-                ]),
+                ...getColored(c.fillColor, [`${c.topLeft.x} ${height - c.bottomRight.y} ${w} ${h} rectfill`]),
                 ...getColored(c.strokeColor, [
                     `${c.strokeThickness} setlinewidth`,
-                    `${c.topLeft.x} ${height - c.bottomRight.y} ${w} ${h} rectstroke`
-                ])
+                    `${c.topLeft.x} ${height - c.bottomRight.y} ${w} ${h} rectstroke`,
+                ]),
             ];
         }
         case "text": {
             return getColored(c.textColor, [
                 `gsave`,
-                `/${c.fontFamily} findfont`,
+                `/${createFontName(characterEncoding, c.fontFamily)} findfont`,
                 `${c.fontSize} scalefont setfont`,
                 `${c.position.x} ${height - c.position.y} moveto`,
                 getTextXOffset(c),
@@ -124,7 +133,7 @@ function epsExportComponent(c, height) {
                 `rmoveto`,
                 `${-c.clockwiseRotationDegrees} rotate`,
                 `(${c.text}) show`,
-                `grestore`
+                `grestore`,
             ]);
         }
         default:
@@ -157,9 +166,81 @@ function getColored(color, instructions) {
     if (color.a === 0) {
         return [];
     }
-    return [
-        `${color.r / 255} ${color.g / 255} ${color.b / 255} setrgbcolor`,
-        ...instructions
-    ];
+    return [`${color.r / 255} ${color.g / 255} ${color.b / 255} setrgbcolor`, ...instructions];
+}
+function createFontName(characterEncoding, fontFamily) {
+    if (characterEncoding === "iso-latin-1-encoding") {
+        return `${fontFamily}-ISOLatin1`;
+    }
+    else {
+        return fontFamily;
+    }
+}
+function encodeLatin1Encoding(text) {
+    // ISOLatin1Encoding is close to iso-8859-1 encoding (https://en.wikipedia.org/wiki/PostScript_Latin_1_Encoding)
+    // Code points 0-256 returned by codePointAt() maps to iso-8859-1
+    const unknownCharacter = "?".codePointAt(0) || 32;
+    const output = [];
+    // Array.from() to handle characters consisting of multiple code points
+    for (const c of Array.from(text)) {
+        if (c.length > 1) {
+            output.push(unknownCharacter);
+        }
+        else {
+            const cp = c.codePointAt(0) || 32;
+            if (cp > 255) {
+                output.push(unknownCharacter);
+            }
+            output.push(cp);
+        }
+    }
+    return new Uint8Array(output);
+}
+function createIsoLatin1FontLines(root) {
+    const fontFamilies = getUsedFontFamilies(root.components);
+    const lines = [];
+    for (const fontFamily of fontFamilies) {
+        // 1. Makes a copy of the font dictionary, including all entries except the one whose
+        // key is FID. (This exclusion is necessary only in LanguageLevel 1; in Language-
+        // Level 2, the interpreter ignores any existing FID entry in a font being defined.)
+        //
+        // 2. Installs the desired change: replaces the font’s Encoding array with the value of
+        // ISOLatin1Encoding, which is a built-in, 256-element array of character names
+        // defined in systemdict.
+        //
+        // 3. Registers this modified font under a new name (Helvetica-ISOLatin1).
+        //
+        // https://www.adobe.com/jp/print/postscript/pdfs/PLRM.pdf
+        lines.push(...[
+            `/${fontFamily} findfont`,
+            "dup length dict begin",
+            "  { 1 index /FID ne",
+            "      {def}",
+            "      {pop pop}",
+            "    ifelse",
+            "  } forall",
+            "  /Encoding ISOLatin1Encoding def",
+            "  currentdict",
+            "end",
+            `/${createFontName("iso-latin-1-encoding", fontFamily)} exch definefont pop`,
+        ]);
+    }
+    return lines;
+}
+function getUsedFontFamilies(components) {
+    const families = [];
+    for (const c of components) {
+        switch (c.type) {
+            case "text":
+                families.push(c.fontFamily);
+                break;
+            case "group":
+                families.push(...getUsedFontFamilies(c.children));
+                break;
+            default:
+                break;
+        }
+    }
+    return R.uniq(families);
 }
 //# sourceMappingURL=eps-export-image.js.map

package/lib/exporters/eps-export-image.js.map

@@ -1 +1 @@
-{"version":3,"file":"eps-export-image.js","sourceRoot":"","sources":["../../src/exporters/eps-export-image.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"eps-export-image.js","sourceRoot":"","sources":["../../src/exporters/eps-export-image.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abstract-image",
-  "version": "3.3.2",
+  "version": "3.4.0",
   "description": "Dynamically create images using code or JSX and render to any format",
   "repository": "https://github.com/dividab/abstract-visuals/tree/master/packages/abstract-image",
   "main": "lib/index.js",
@@ -16,13 +16,15 @@
   ],
   "dependencies": {
     "base64-js": "^1.2.0",
+    "ramda": "^0.22.1",
     "react": "^16.12.0",
     "react-dom": "^16.12.0"
   },
   "devDependencies": {
     "@types/base64-js": "^1.2.5",
+    "@types/ramda": "^0.25.29",
     "@types/react": "^16.9.0",
     "@types/react-dom": "^16.9.0"
   },
-  "gitHead": "b672d84296a7b57fb4caaa69ad99771e6c399723"
+  "gitHead": "cc48e3f14a9ec319766ae3322bcdd98748718cab"
 }

package/src/__stories__/react-svg-export/example-1.stories.tsx

@@ -1,54 +1,54 @@
-import * as React from "react";
-import { Meta } from "@storybook/react";
-import * as AbstractImage from "../..";
-
-export function ReactSvgExportExample1(): React.ReactElement<{}> {
-  const components = [
-    AbstractImage.createLine(
-      AbstractImage.createPoint(0, 200),
-      AbstractImage.createPoint(400, 200),
-      AbstractImage.black,
-      1
-    ),
-    AbstractImage.createLine(
-      AbstractImage.createPoint(200, 0),
-      AbstractImage.createPoint(200, 400),
-      AbstractImage.black,
-      1
-    ),
-    AbstractImage.createText(
-      AbstractImage.createPoint(200, 200),
-      "Testing texting",
-      "Arial",
-      20,
-      AbstractImage.black,
-      "normal",
-      0,
-      "center",
-      "uniform",
-      "down",
-      0,
-      AbstractImage.black,
-      false
-    ),
-  ];
-  const image = AbstractImage.createAbstractImage(
-    AbstractImage.createPoint(0, 0),
-    AbstractImage.createSize(400, 400),
-    AbstractImage.white,
-    components
-  );
-  const svg = AbstractImage.createReactSvg(image);
-  return (
-    <div>
-      <h1>React Svg</h1>
-      <pre>{svg}</pre>
-    </div>
-  );
-}
-
-// eslint-disable-next-line import/no-default-export
-export default {
-  component: ReactSvgExportExample1,
-  title: "ReactSvgExportExample1",
-} as Meta;
+import * as React from "react";
+import { Meta } from "@storybook/react";
+import * as AbstractImage from "../..";
+
+export function ReactSvgExportExample1(): React.ReactElement<{}> {
+  const components = [
+    AbstractImage.createLine(
+      AbstractImage.createPoint(0, 200),
+      AbstractImage.createPoint(400, 200),
+      AbstractImage.black,
+      1
+    ),
+    AbstractImage.createLine(
+      AbstractImage.createPoint(200, 0),
+      AbstractImage.createPoint(200, 400),
+      AbstractImage.black,
+      1
+    ),
+    AbstractImage.createText(
+      AbstractImage.createPoint(200, 200),
+      "Testing texting",
+      "Arial",
+      20,
+      AbstractImage.black,
+      "normal",
+      0,
+      "center",
+      "uniform",
+      "down",
+      0,
+      AbstractImage.black,
+      false
+    ),
+  ];
+  const image = AbstractImage.createAbstractImage(
+    AbstractImage.createPoint(0, 0),
+    AbstractImage.createSize(400, 400),
+    AbstractImage.white,
+    components
+  );
+  const svg = AbstractImage.createReactSvg(image);
+  return (
+    <div>
+      <h1>React Svg</h1>
+      <pre>{svg}</pre>
+    </div>
+  );
+}
+
+// eslint-disable-next-line import/no-default-export
+export default {
+  component: ReactSvgExportExample1,
+  title: "ReactSvgExportExample1",
+} as Meta;

package/src/__stories__/svg-export/example-1.stories.tsx

@@ -1,42 +1,42 @@
-import * as React from "react";
-import { Meta } from "@storybook/react";
-import * as AbstractImage from "../..";
-
-export function SvgExportExample1(): React.ReactElement<{}> {
-  const components = [
-    AbstractImage.createLine(
-      AbstractImage.createPoint(25, 25),
-      AbstractImage.createPoint(80, 60),
-      AbstractImage.black,
-      2
-    ),
-    AbstractImage.createRectangle(
-      AbstractImage.createPoint(10, 50),
-      AbstractImage.createPoint(40, 80),
-      AbstractImage.blue,
-      2,
-      AbstractImage.red
-    ),
-  ];
-  const image = AbstractImage.createAbstractImage(
-    AbstractImage.createPoint(0, 0),
-    AbstractImage.createSize(400, 400),
-    AbstractImage.white,
-    components
-  );
-  const svg = AbstractImage.createSVG(image);
-  const base64 = btoa(svg);
-  return (
-    <div>
-      <h1>Svg</h1>
-      <pre>{svg}</pre>
-      <img src={`data:image/svg+xml;base64,${base64}`} />
-    </div>
-  );
-}
-
-// eslint-disable-next-line import/no-default-export
-export default {
-  component: SvgExportExample1,
-  title: "SvgExportExample1",
-} as Meta;
+import * as React from "react";
+import { Meta } from "@storybook/react";
+import * as AbstractImage from "../..";
+
+export function SvgExportExample1(): React.ReactElement<{}> {
+  const components = [
+    AbstractImage.createLine(
+      AbstractImage.createPoint(25, 25),
+      AbstractImage.createPoint(80, 60),
+      AbstractImage.black,
+      2
+    ),
+    AbstractImage.createRectangle(
+      AbstractImage.createPoint(10, 50),
+      AbstractImage.createPoint(40, 80),
+      AbstractImage.blue,
+      2,
+      AbstractImage.red
+    ),
+  ];
+  const image = AbstractImage.createAbstractImage(
+    AbstractImage.createPoint(0, 0),
+    AbstractImage.createSize(400, 400),
+    AbstractImage.white,
+    components
+  );
+  const svg = AbstractImage.createSVG(image);
+  const base64 = btoa(svg);
+  return (
+    <div>
+      <h1>Svg</h1>
+      <pre>{svg}</pre>
+      <img src={`data:image/svg+xml;base64,${base64}`} />
+    </div>
+  );
+}
+
+// eslint-disable-next-line import/no-default-export
+export default {
+  component: SvgExportExample1,
+  title: "SvgExportExample1",
+} as Meta;

package/src/exporters/__tests__/dxf2d-export-image/export-test-def.ts

@@ -1,11 +1,11 @@
-/**
- * Defines a data-type that represents a single test for the Docx render function
- */
-
-export type ExportTestDef = {
-  readonly name: string;
-  readonly only?: boolean;
-  readonly skip?: boolean;
-  readonly abstractImage: string;
-  readonly expectedImage: string;
-};
+/**
+ * Defines a data-type that represents a single test for the Docx render function
+ */
+
+export type ExportTestDef = {
+  readonly name: string;
+  readonly only?: boolean;
+  readonly skip?: boolean;
+  readonly abstractImage: string;
+  readonly expectedImage: string;
+};

package/src/exporters/__tests__/dxf2d-export-image/export.test.tsx

@@ -1,13 +1,13 @@
-import path from "path";
-import { loadTests, onlySkip } from "@abstract-visuals/test-utils";
-import { ExportTestDef } from "./export-test-def";
-
-export const tests = loadTests<ExportTestDef>(path.join(__dirname, "test-defs/"));
-
-describe("dxf2d-export-image", () => {
-  onlySkip(tests).forEach((item) => {
-    test(item.name, async () => {
-      expect(item.abstractImage).toEqual(item.expectedImage);
-    });
-  });
-});
+import path from "path";
+import { loadTests, onlySkip } from "@abstract-visuals/test-utils";
+import { ExportTestDef } from "./export-test-def";
+
+export const tests = loadTests<ExportTestDef>(path.join(__dirname, "test-defs/"));
+
+describe("dxf2d-export-image", () => {
+  onlySkip(tests).forEach((item) => {
+    test(item.name, async () => {
+      expect(item.abstractImage).toEqual(item.expectedImage);
+    });
+  });
+});