fontconv 0.0.1 → 0.0.3

package/script/{fontconv/mod.js → mod.js}

@@ -26,16 +26,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convert = exports.filterGlyphs = exports.getFont = exports.otf2ttf = exports.isWOFF2 = exports.isWOFF = exports.isSVG = exports.isEOT = exports.isTTF = exports.isOTF = void 0;
-const dntShim = __importStar(require("../_dnt.shims.js"));
+exports.convert = exports.filterGlyphs = exports.getNameMap = exports.getFont = exports.otf2ttf = exports.isWOFF2 = exports.isWOFF = exports.isSVG = exports.isEOT = exports.isTTF = exports.isOTF = exports.getLigatureMap = void 0;
+const dntShim = __importStar(require("./_dnt.shims.js"));
+const ligature_js_1 = require("./ligature.js");
+Object.defineProperty(exports, "getLigatureMap", { enumerable: true, get: function () { return ligature_js_1.getLigatureMap; } });
 const wawoff2_1 = require("wawoff2");
 const opentype_js_1 = require("opentype.js");
-const mod_js_1 = require("../ttf2svg/mod.js");
+const ttf2svg_1 = require("@marmooo/ttf2svg");
 const svg2ttf_1 = __importDefault(require("svg2ttf"));
 const ttf2eot_1 = __importDefault(require("ttf2eot"));
 const ttf2woff_1 = __importDefault(require("ttf2woff"));
-// import ttf2woff2 from "npm:ttf2woff2@5.0.0";
-// import * as fonteditor from "npm:fonteditor-core@2.3.3"; // glyph names are lost
 function isOTF(uint8Array) {
     return uint8Array[0] === 0x4F &&
         uint8Array[1] === 0x54 &&
@@ -81,7 +81,7 @@ exports.isWOFF2 = isWOFF2;
 //   return new Uint8Array(ttfBuffer);
 // }
 function otf2ttf(otf) {
-    const svg = (0, mod_js_1.ttf2svgFont)(new Uint8Array(otf));
+    const svg = (0, ttf2svg_1.ttf2svgFont)(new Uint8Array(otf));
     return (0, svg2ttf_1.default)(svg).buffer;
 }
 exports.otf2ttf = otf2ttf;
@@ -91,27 +91,6 @@ exports.otf2ttf = otf2ttf;
 //   const ttfBuffer = new fonteditor.default.TTFWriter().write(ttfObj);
 //   return new Uint8Array(ttfBuffer);
 // }
-function getGlyphString(options) {
-    if (options.textFile) {
-        const text = dntShim.Deno.readTextFileSync(options.textFile);
-        return text.trimEnd().replace(/\n/g, "");
-    }
-    else if (options.codeFile) {
-        const text = dntShim.Deno.readTextFileSync(options.codeFile);
-        return text.trimEnd().split("\n")
-            .map((line) => String.fromCodePoint(Number(line))).join("");
-    }
-    else if (options.text) {
-        return options.text;
-    }
-    else if (options.code) {
-        return options.code.split(",")
-            .map((code) => String.fromCodePoint(Number(code))).join("");
-    }
-    else {
-        return undefined;
-    }
-}
 async function getFont(fontContent) {
     if (isSVG(fontContent)) {
         const ttf = (0, svg2ttf_1.default)(fontContent);
@@ -132,7 +111,7 @@ async function getFont(fontContent) {
 }
 exports.getFont = getFont;
 async function convertFormat(font, format) {
-    const svg = (0, mod_js_1.font2svgFont)(font);
+    const svg = (0, ttf2svg_1.font2svgFont)(font);
     if (format === ".svg")
         return svg;
     const ttf = (0, svg2ttf_1.default)(svg).buffer;
@@ -154,11 +133,56 @@ async function convertFormat(font, format) {
             throw new Error(`${format} is not a supported format.`);
     }
 }
+function getNameMap(font) {
+    const map = {};
+    for (const glyph of Object.values(font.glyphs.glyphs)) {
+        map[glyph.name] = glyph.index;
+    }
+    return map;
+}
+exports.getNameMap = getNameMap;
 function filterGlyphs(font, options) {
-    const glyphString = getGlyphString(options);
-    if (glyphString) {
+    if (options.textFile) {
+        const text = dntShim.Deno.readTextFileSync(options.textFile);
+        const glyphString = text.trimEnd().replace(/\n/g, "");
         return font.stringToGlyphs(glyphString);
     }
+    else if (options.codeFile) {
+        const text = dntShim.Deno.readTextFileSync(options.codeFile);
+        const glyphString = text.trimEnd().split("\n")
+            .map((line) => String.fromCodePoint(Number(line))).join("");
+        return font.stringToGlyphs(glyphString);
+    }
+    else if (options.nameFile) {
+        const nameMap = getNameMap(font);
+        const text = dntShim.Deno.readTextFileSync(options.nameFile);
+        return text.trimEnd().split("\n")
+            .map((line) => font.glyphs.get(nameMap[line]));
+    }
+    else if (options.ligatureFile) {
+        const ligatureMap = (0, ligature_js_1.getLigatureMap)(font, "name");
+        const text = dntShim.Deno.readTextFileSync(options.ligatureFile);
+        return text.trimEnd().split("\n")
+            .map((line) => font.glyphs.get(ligatureMap[line].by));
+    }
+    else if (options.text) {
+        return font.stringToGlyphs(options.text);
+    }
+    else if (options.code) {
+        const glyphString = options.code.split(",")
+            .map((code) => String.fromCodePoint(Number(code))).join("");
+        return font.stringToGlyphs(glyphString);
+    }
+    else if (options.name) {
+        const nameMap = getNameMap(font);
+        return options.name.split(",")
+            .map((line) => font.glyphs.get(nameMap[line]));
+    }
+    else if (options.ligature) {
+        const ligatureMap = (0, ligature_js_1.getLigatureMap)(font, "name");
+        return options.ligature.split(",")
+            .map((line) => font.glyphs.get(ligatureMap[line].by));
+    }
     else {
         return Object.values(font.glyphs.glyphs);
     }
@@ -166,7 +190,15 @@ function filterGlyphs(font, options) {
 exports.filterGlyphs = filterGlyphs;
 function createTemporaryFont(font, glyphs) {
     const notdefGlyph = font.glyphs.get(0);
-    const tempFont = new opentype_js_1.Font({
+    notdefGlyph.name = ".notdef";
+    // avoid the warning caused by opentype.js below
+    // Undefined CHARARRAY encountered and treated as an empty string.
+    glyphs.forEach((glyph) => {
+        if (!glyph.name) {
+            glyph.name = String.fromCharCode(glyph.unicode);
+        }
+    });
+    const tmpFont = new opentype_js_1.Font({
         familyName: font.names.fontFamily.en,
         styleName: font.names.fontSubfamily.en,
         unitsPerEm: font.unitsPerEm,
@@ -174,13 +206,64 @@ function createTemporaryFont(font, glyphs) {
         descender: font.descender,
         glyphs: [notdefGlyph, ...glyphs],
     });
-    tempFont.names = font.names;
-    return tempFont;
+    tmpFont.names = font.names;
+    return tmpFont;
+}
+function createLigaturesFont(font, glyphs) {
+    const ligatureMap = (0, ligature_js_1.getLigatureMap)(font, "by");
+    const charSet = new Set();
+    for (const glyph of glyphs) {
+        const ligature = ligatureMap[glyph.index];
+        if (ligature) {
+            Array.from(ligature.name).forEach((char) => {
+                charSet.add(char);
+            });
+        }
+    }
+    glyphs.forEach((glyph) => {
+        const char = String.fromCharCode(glyph.unicode);
+        if (charSet.has(char))
+            charSet.delete(char);
+    });
+    const ligatureGlyphs = [];
+    charSet.forEach((char) => {
+        const unicode = char.codePointAt(0);
+        const glyphIndex = font.encoding.cmap.glyphIndexMap[unicode];
+        const glyph = font.glyphs.get(glyphIndex);
+        ligatureGlyphs.push(glyph);
+    });
+    const newGlyphs = [...ligatureGlyphs, ...glyphs];
+    const tmpFont = createTemporaryFont(font, newGlyphs);
+    const charMap = {};
+    newGlyphs.forEach((glyph, index) => {
+        const char = String.fromCharCode(glyph.unicode);
+        charMap[char] = index + 1;
+    });
+    glyphs.forEach((glyph, i) => {
+        const ligature = ligatureMap[glyph.index];
+        if (ligature) {
+            const sub = Array.from(ligature.name)
+                .map((char) => charMap[char]);
+            const by = ligatureGlyphs.length + i + 1;
+            tmpFont.substitution.addLigature("liga", { sub, by });
+        }
+    });
+    const otf = tmpFont.toArrayBuffer();
+    const newFont = (0, opentype_js_1.parse)(otf);
+    return newFont;
+}
+function createFont(font, glyphs, options) {
+    if (options.removeLigatures) {
+        return createTemporaryFont(font, glyphs);
+    }
+    else {
+        return createLigaturesFont(font, glyphs);
+    }
 }
 async function convert(fontContent, format, options) {
     const font = await getFont(fontContent);
     const glyphs = filterGlyphs(font, options);
-    const tempFont = createTemporaryFont(font, glyphs);
+    const tempFont = createFont(font, glyphs, options);
     return await convertFormat(tempFont, format);
 }
 exports.convert = convert;

package/esm/ttf2svg/mod.d.ts

@@ -1,9 +0,0 @@
-export function toSVG(font: any, glyph: any, options?: {}): string | undefined;
-export function toSVGFont(font: any, glyphs: any, options: any): string;
-export function toGlyphTag(font: any, glyphs: any, options: any): any;
-export function filterGlyphs(font: any, options?: {}): any;
-export function font2svg(font: any, options: any): any;
-export function ttf2svg(uint8array: any, options?: {}): any;
-export function ttf2svgFont(uint8array: any, options?: {}): string;
-export function font2svgFont(font: any, options?: {}): string;
-export { parse };

package/esm/ttf2svg/mod.js

@@ -1,167 +0,0 @@
-import * as dntShim from "../_dnt.shims.js";
-import { parse } from "opentype.js";
-import svgpath from "svgpath";
-export { parse };
-function calcLineSpace(font) {
-    const lineGap = font.tables.hhea?.lineGap ?? 0;
-    return font.ascender - font.descender + lineGap;
-}
-function svgHeader(font, glyph, options = {}) {
-    const widthAttribute = (options.width) ? `width="${options.width}"` : "";
-    const heightAttribute = (options.height) ? `height="${options.height}"` : "";
-    const glyphWidth = glyph.advanceWidth;
-    const glyphHeight = options.glyphHeight ?? calcLineSpace(font);
-    const copyright = fontToCopyright(font);
-    let svg = `<svg xmlns="http://www.w3.org/2000/svg"
-  ${widthAttribute} ${heightAttribute} viewBox="0 0 ${glyphWidth} ${glyphHeight}">
-`;
-    if (copyright != "") {
-        svg += `  <!--
-${copyright}
-  -->
-`;
-    }
-    return svg;
-}
-export function toSVG(font, glyph, options = {}) {
-    const translateY = options.translateY ?? font.ascender;
-    const d = svgpath(glyph.path.toPathData())
-        .scale(1, -1)
-        .translate(0, Number(translateY))
-        .toString();
-    if (d == "")
-        return undefined;
-    const path = `<path d="${d}"/>`;
-    return svgHeader(font, glyph, options) + path + "\n</svg>";
-}
-function getInfo(hash) {
-    if (!hash)
-        return "";
-    const arr = Object.values(hash);
-    if (arr.length > 0) {
-        return arr[0];
-    }
-    else {
-        return "";
-    }
-}
-function fontToCopyright(font) {
-    const copyrights = font.names.copyright
-        ? Object.values(font.names.copyright).join("\n")
-        : "";
-    const trademarks = font.names.trademark
-        ? Object.values(font.names.trademark).join("\n")
-        : "";
-    const licenses = font.names.license
-        ? Object.values(font.names.license).join("\n")
-        : "";
-    const licenseURLs = font.names.licenseURL
-        ? Object.values(font.names.licenseURL).join("\n")
-        : "";
-    const infos = [copyrights, trademarks, licenses, licenseURLs];
-    return infos.filter((info) => info).join("\n");
-}
-function glyphHeader(font) {
-    let header = `<svg xmlns="http://www.w3.org/2000/svg">
-`;
-    const copyright = fontToCopyright(font);
-    if (copyright != "") {
-        header += `<!--
-${copyright}
-  -->
-`;
-    }
-    header += `
-  <defs>
-    <font name="${getInfo(font.names.fullName)}"
-      horiz-adv-x="${font.unitsPerEm}" vert-adv-y="${font.unitsPerEm}" >
-    <font-face font-family="${getInfo(font.names.fontFamily)}" font-weight="400"
-      font-stretch="normal"
-      units-per-em="${font.unitsPerEm}"
-      ascent="${font.ascender}"
-      descent="${font.descender}"/>
-`;
-    return header;
-}
-function glyphFooter() {
-    return `
-    </font>
-  </defs>
-</svg>`;
-}
-export function toSVGFont(font, glyphs, options) {
-    return glyphHeader(font) + toGlyphTag(font, glyphs, options) +
-        glyphFooter();
-}
-export function toGlyphTag(font, glyphs, options) {
-    const lineGap = font.tables.hhea?.lineGap ?? 0;
-    const height = font.ascender - font.descender + lineGap;
-    const existed = glyphs.filter((glyph) => glyph.unicode).map((glyph) => {
-        const d = glyph.path.toPathData();
-        if (d == "")
-            return undefined;
-        const glyphName = (glyph.name) ? `glyph-name="${glyph.name}"` : "";
-        return `<glyph ${glyphName} unicode="&#${glyph.unicode};"
-      horiz-adv-x="${glyph.advanceWidth}" vert-adv-y="${height}"
-      d="${d}"/>`;
-    }).filter((glyphTag) => glyphTag).join("\n");
-    if (options.removeNotdef) {
-        return existed;
-    }
-    else {
-        const notdefGlyph = font.glyphs.get(0);
-        const d = notdefGlyph.path.toPathData();
-        const notDef = `<missing-glyph glyph-name=".notdef"
-      horiz-adv-x="${notdefGlyph.advanceWidth}" vert-adv-y="${height}"
-      d="${d}"/>`;
-        return existed + "\n" + notDef;
-    }
-}
-function getGlyphString(options = {}) {
-    if (options.textFile) {
-        const text = dntShim.Deno.readTextFileSync(options.textFile);
-        return text.trimEnd().replace(/\n/g, "");
-    }
-    else if (options.codeFile) {
-        const text = dntShim.Deno.readTextFileSync(options.codeFile);
-        return text.trimEnd().split("\n")
-            .map((line) => String.fromCodePoint(Number(line))).join("");
-    }
-    else if (options.text) {
-        return options.text;
-    }
-    else if (options.code) {
-        return options.code.split(",")
-            .map((code) => String.fromCodePoint(Number(code))).join("");
-    }
-    else {
-        return undefined;
-    }
-}
-export function filterGlyphs(font, options = {}) {
-    const glyphString = getGlyphString(options);
-    if (glyphString) {
-        return font.stringToGlyphs(glyphString);
-    }
-    else {
-        return Object.values(font.glyphs.glyphs);
-    }
-}
-export function font2svg(font, options) {
-    const glyphs = filterGlyphs(font, options);
-    return glyphs.map((glyph) => {
-        return toSVG(font, glyph, options);
-    });
-}
-export function ttf2svg(uint8array, options = {}) {
-    const font = parse(uint8array.buffer);
-    return font2svg(font, options);
-}
-export function ttf2svgFont(uint8array, options = {}) {
-    const font = parse(uint8array.buffer);
-    return font2svgFont(font, options);
-}
-export function font2svgFont(font, options = {}) {
-    const glyphs = filterGlyphs(font, options);
-    return toSVGFont(font, glyphs, options);
-}

package/script/ttf2svg/mod.d.ts

@@ -1,9 +0,0 @@
-export function toSVG(font: any, glyph: any, options?: {}): string | undefined;
-export function toSVGFont(font: any, glyphs: any, options: any): string;
-export function toGlyphTag(font: any, glyphs: any, options: any): any;
-export function filterGlyphs(font: any, options?: {}): any;
-export function font2svg(font: any, options: any): any;
-export function ttf2svg(uint8array: any, options?: {}): any;
-export function ttf2svgFont(uint8array: any, options?: {}): string;
-export function font2svgFont(font: any, options?: {}): string;
-export { parse };

package/script/ttf2svg/mod.js

@@ -1,204 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.font2svgFont = exports.ttf2svgFont = exports.ttf2svg = exports.font2svg = exports.filterGlyphs = exports.toGlyphTag = exports.toSVGFont = exports.toSVG = exports.parse = void 0;
-const dntShim = __importStar(require("../_dnt.shims.js"));
-const opentype_js_1 = require("opentype.js");
-Object.defineProperty(exports, "parse", { enumerable: true, get: function () { return opentype_js_1.parse; } });
-const svgpath_1 = __importDefault(require("svgpath"));
-function calcLineSpace(font) {
-    const lineGap = font.tables.hhea?.lineGap ?? 0;
-    return font.ascender - font.descender + lineGap;
-}
-function svgHeader(font, glyph, options = {}) {
-    const widthAttribute = (options.width) ? `width="${options.width}"` : "";
-    const heightAttribute = (options.height) ? `height="${options.height}"` : "";
-    const glyphWidth = glyph.advanceWidth;
-    const glyphHeight = options.glyphHeight ?? calcLineSpace(font);
-    const copyright = fontToCopyright(font);
-    let svg = `<svg xmlns="http://www.w3.org/2000/svg"
-  ${widthAttribute} ${heightAttribute} viewBox="0 0 ${glyphWidth} ${glyphHeight}">
-`;
-    if (copyright != "") {
-        svg += `  <!--
-${copyright}
-  -->
-`;
-    }
-    return svg;
-}
-function toSVG(font, glyph, options = {}) {
-    const translateY = options.translateY ?? font.ascender;
-    const d = (0, svgpath_1.default)(glyph.path.toPathData())
-        .scale(1, -1)
-        .translate(0, Number(translateY))
-        .toString();
-    if (d == "")
-        return undefined;
-    const path = `<path d="${d}"/>`;
-    return svgHeader(font, glyph, options) + path + "\n</svg>";
-}
-exports.toSVG = toSVG;
-function getInfo(hash) {
-    if (!hash)
-        return "";
-    const arr = Object.values(hash);
-    if (arr.length > 0) {
-        return arr[0];
-    }
-    else {
-        return "";
-    }
-}
-function fontToCopyright(font) {
-    const copyrights = font.names.copyright
-        ? Object.values(font.names.copyright).join("\n")
-        : "";
-    const trademarks = font.names.trademark
-        ? Object.values(font.names.trademark).join("\n")
-        : "";
-    const licenses = font.names.license
-        ? Object.values(font.names.license).join("\n")
-        : "";
-    const licenseURLs = font.names.licenseURL
-        ? Object.values(font.names.licenseURL).join("\n")
-        : "";
-    const infos = [copyrights, trademarks, licenses, licenseURLs];
-    return infos.filter((info) => info).join("\n");
-}
-function glyphHeader(font) {
-    let header = `<svg xmlns="http://www.w3.org/2000/svg">
-`;
-    const copyright = fontToCopyright(font);
-    if (copyright != "") {
-        header += `<!--
-${copyright}
-  -->
-`;
-    }
-    header += `
-  <defs>
-    <font name="${getInfo(font.names.fullName)}"
-      horiz-adv-x="${font.unitsPerEm}" vert-adv-y="${font.unitsPerEm}" >
-    <font-face font-family="${getInfo(font.names.fontFamily)}" font-weight="400"
-      font-stretch="normal"
-      units-per-em="${font.unitsPerEm}"
-      ascent="${font.ascender}"
-      descent="${font.descender}"/>
-`;
-    return header;
-}
-function glyphFooter() {
-    return `
-    </font>
-  </defs>
-</svg>`;
-}
-function toSVGFont(font, glyphs, options) {
-    return glyphHeader(font) + toGlyphTag(font, glyphs, options) +
-        glyphFooter();
-}
-exports.toSVGFont = toSVGFont;
-function toGlyphTag(font, glyphs, options) {
-    const lineGap = font.tables.hhea?.lineGap ?? 0;
-    const height = font.ascender - font.descender + lineGap;
-    const existed = glyphs.filter((glyph) => glyph.unicode).map((glyph) => {
-        const d = glyph.path.toPathData();
-        if (d == "")
-            return undefined;
-        const glyphName = (glyph.name) ? `glyph-name="${glyph.name}"` : "";
-        return `<glyph ${glyphName} unicode="&#${glyph.unicode};"
-      horiz-adv-x="${glyph.advanceWidth}" vert-adv-y="${height}"
-      d="${d}"/>`;
-    }).filter((glyphTag) => glyphTag).join("\n");
-    if (options.removeNotdef) {
-        return existed;
-    }
-    else {
-        const notdefGlyph = font.glyphs.get(0);
-        const d = notdefGlyph.path.toPathData();
-        const notDef = `<missing-glyph glyph-name=".notdef"
-      horiz-adv-x="${notdefGlyph.advanceWidth}" vert-adv-y="${height}"
-      d="${d}"/>`;
-        return existed + "\n" + notDef;
-    }
-}
-exports.toGlyphTag = toGlyphTag;
-function getGlyphString(options = {}) {
-    if (options.textFile) {
-        const text = dntShim.Deno.readTextFileSync(options.textFile);
-        return text.trimEnd().replace(/\n/g, "");
-    }
-    else if (options.codeFile) {
-        const text = dntShim.Deno.readTextFileSync(options.codeFile);
-        return text.trimEnd().split("\n")
-            .map((line) => String.fromCodePoint(Number(line))).join("");
-    }
-    else if (options.text) {
-        return options.text;
-    }
-    else if (options.code) {
-        return options.code.split(",")
-            .map((code) => String.fromCodePoint(Number(code))).join("");
-    }
-    else {
-        return undefined;
-    }
-}
-function filterGlyphs(font, options = {}) {
-    const glyphString = getGlyphString(options);
-    if (glyphString) {
-        return font.stringToGlyphs(glyphString);
-    }
-    else {
-        return Object.values(font.glyphs.glyphs);
-    }
-}
-exports.filterGlyphs = filterGlyphs;
-function font2svg(font, options) {
-    const glyphs = filterGlyphs(font, options);
-    return glyphs.map((glyph) => {
-        return toSVG(font, glyph, options);
-    });
-}
-exports.font2svg = font2svg;
-function ttf2svg(uint8array, options = {}) {
-    const font = (0, opentype_js_1.parse)(uint8array.buffer);
-    return font2svg(font, options);
-}
-exports.ttf2svg = ttf2svg;
-function ttf2svgFont(uint8array, options = {}) {
-    const font = (0, opentype_js_1.parse)(uint8array.buffer);
-    return font2svgFont(font, options);
-}
-exports.ttf2svgFont = ttf2svgFont;
-function font2svgFont(font, options = {}) {
-    const glyphs = filterGlyphs(font, options);
-    return toSVGFont(font, glyphs, options);
-}
-exports.font2svgFont = font2svgFont;