KonghaYao · KonghaYao · Jan 22, 2024 · Nov 6, 2023 · Nov 6, 2023 · Nov 6, 2023
diff --git a/README.md b/README.md
@@ -1,16 +1,14 @@
 # 中文 Web Font 切割工具
 
-![updateTime](https://img.shields.io/badge/更新时间-2023/11/4-green)
+![updateTime](https://img.shields.io/badge/更新时间-2023/12/18-green)
 ![author](https://img.shields.io/badge/author-江夏尧-green)
-![npmVersion](https://img.shields.io/badge/LTS_version-4.10.5-green)
+![npmVersion](https://img.shields.io/badge/LTS_version-4.11.0-green)
 [![](https://data.jsdelivr.com/v1/package/npm/@konghayao/cn-font-split/badge)](https://www.jsdelivr.com/package/npm/@konghayao/cn-font-split)
 
 ![CodeFactor](https://www.codefactor.io/repository/github/konghayao/cn-font-split/badge)
 ![NPM License](https://img.shields.io/npm/l/%40konghayao%2Fcn-font-split)
-![downloadCount](https://img.shields.io/npm/dw/%40konghayao%2Fcn-font-split)
-
-| [中文网字计划](https://chinese-font.netlify.app/) | [Github](https://github.com/KonghaYao/cn-font-split) |
-| ------------------------------------------------- | ---------------------------------------------------- |
+| [中文网字计划](https://chinese-font.netlify.app/) | [Github](https://github.com/KonghaYao/cn-font-split) | [在线使用](https://chinese-font.netlify.app/online-split/)|
+| ------------------------------------------------- | ---------------------------------------------------- |---------------------------------------------------- |
 
 ## 简介
 
@@ -24,7 +22,7 @@
 
 > 我们正在对 cn-font-split 的实战效果进行测试，并积极提升分包效果！
 >
-> [Opentype Feature 测试情况](/packages/test/SUPPORT_FEATURE.md) 支持 100 ｜ 部分支持 4｜ 等待测试 39
+> [Opentype Feature 测试情况](/packages/test/SUPPORT_FEATURE.md) 支持 95 ｜ 部分支持 9｜ 等待测试 20
 
 [详见兼容性章节](#兼容性提醒)。
 | [Nodejs](#nodejs) | [Deno](#deno) | [Chrome](#browser) | [FireFox](#browser) | [Safari](#browser) | [Bun](#bun) |

diff --git a/packages/font-analyze/package.json b/packages/font-analyze/package.json
@@ -1,6 +1,6 @@
 {
     "name": "font-analyze",
-    "version": "1.3.1",
+    "version": "1.3.4",
     "description": "",
     "main": "dist/index.js",
     "type": "module",
@@ -17,7 +17,7 @@
     "license": "ISC",
     "dependencies": {
         "@types/opentype.js": "^1.3.4",
-        "@konghayao/opentype.js": "^2023.10.5"
+        "@konghayao/opentype.js": "^2023.11.20"
     },
     "devDependencies": {
         "compressing": "^1.9.0",

diff --git a/packages/font-analyze/src/Charset/FontSetMatch.ts b/packages/font-analyze/src/Charset/FontSetMatch.ts
@@ -12,12 +12,12 @@ export const calcCharset = (charset: Charset) => {
     }, 0);
 };
 
-/** 字符集判断 */
+/** 判断字体中是否包含 json 文件的 unicode 字符 */
 export const FontSetMatch = (
     font: Font,
     items: Set<number>,
     charset: Charset,
-    name: string
+    name: string,
 ): CharsetReporter => {
     let support_count = 0;
     let area_count = 0;

diff --git a/packages/font-analyze/src/Charset/defaultCharsetLoader.ts b/packages/font-analyze/src/Charset/defaultCharsetLoader.ts
@@ -1,6 +1,7 @@
 import { Charset } from './FontSetMatch.js';
 import { UnicodeCharset } from './UnicodeMatch.js';
 
+/** 字符集支持报告的表格 */
 export interface CharsetReporter {
     name: string;
     cn?: string;
@@ -11,6 +12,8 @@ export interface CharsetReporter {
     coverage: string;
     in_set_rate: string;
 }
+
+/** 从远程加载数据 json 文件 */
 export type CharsetLoader = (path: string) => Promise<Charset | UnicodeCharset>;
 export const defaultCharsetLoader: CharsetLoader = async (path) => {
     const { default: D } = await import('../data/' + path);

diff --git a/packages/font-analyze/src/Charset/getCharsetReport.ts b/packages/font-analyze/src/Charset/getCharsetReport.ts
@@ -1,28 +1,29 @@
+import { Font } from '@konghayao/opentype.js';
 import { Charset, FontSetMatch } from './FontSetMatch.js';
 import { UnicodeCharset, UnicodeMatch } from './UnicodeMatch.js';
 import { CharsetLoader } from './defaultCharsetLoader.js';
 
 /** 获取 unicode 字符集检测报告 */
 export async function getCharsetReport(
     charsetLoader: CharsetLoader,
-    font: any,
-    unicodeSet: Set<number>
+    font: Font,
+    unicodeSet: Set<number>,
 ) {
     const standard = await getCharsetStandard(charsetLoader, font, unicodeSet);
     // console.table(standard);
     const Unicode = await charsetLoader('unicodes.json');
     const unicodeReport = UnicodeMatch(
         font,
         unicodeSet,
-        Unicode as UnicodeCharset
+        Unicode as UnicodeCharset,
     );
     return { unicodeReport, standard };
 }
 /** 获取标准字符集数据 */
 async function getCharsetStandard(
     charsetLoader: CharsetLoader,
-    font: any,
-    unicodeSet: Set<number>
+    font: Font,
+    unicodeSet: Set<number>,
 ) {
     return await Promise.all(
         [
@@ -45,6 +46,6 @@ async function getCharsetStandard(
         ].map(async ([_path, name]) => {
             const set = await charsetLoader(_path);
             return FontSetMatch(font, unicodeSet, set as Charset, name);
-        })
+        }),
     );
 }
diff --git a/packages/font-analyze/src/Feature/FeatureList.ts b/packages/font-analyze/src/Feature/FeatureList.ts
@@ -0,0 +1,147 @@
+export const FeatureList = [
+    'aalt',
+    'abvf',
+    'abvm',
+    'abvs',
+    'afrc',
+    'akhn',
+    'blwf',
+    'blwm',
+    'blws',
+    'calt',
+    'case',
+    'ccmp',
+    'cfar',
+    'chws',
+    'cjct',
+    'clig',
+    'cpct',
+    'cpsp',
+    'cswh',
+    'curs',
+    ...[...Array(99).keys()].map(
+        (i) => 'cv' + (i + 1).toString().padStart(2, '0'),
+    ),
+    'c2pc',
+    'c2sc',
+    'dist',
+    'dlig',
+    'dnom',
+    'dtls',
+    'expt',
+    'falt',
+    'fin2',
+    'fin3',
+    'fina',
+    'flac',
+    'frac',
+    'fwid',
+    'half',
+    'haln',
+    'halt',
+    'hist',
+    'hkna',
+    'hlig',
+    'hngl',
+    'hojo',
+    'hwid',
+    'init',
+    'isol',
+    'ital',
+    'jalt',
+    'jp78',
+    'jp83',
+    'jp90',
+    'jp04',
+    'kern',
+    'lfbd',
+    'liga',
+    'ljmo',
+    'lnum',
+    'locl',
+    'ltra',
+    'ltrm',
+    'mark',
+    'med2',
+    'medi',
+    'mgrk',
+    'mkmk',
+    'mset',
+    'nalt',
+    'nlck',
+    'nukt',
+    'numr',
+    'onum',
+    'opbd',
+    'ordn',
+    'ornm',
+    'palt',
+    'pcap',
+    'pkna',
+    'pnum',
+    'pref',
+    'pres',
+    'pstf',
+    'psts',
+    'pwid',
+    'qwid',
+    'rand',
+    'rclt',
+    'rkrf',
+    'rlig',
+    'rphf',
+    'rtbd',
+    'rtla',
+    'rtlm',
+    'ruby',
+    'rvrn',
+    'salt',
+    'sinf',
+    'size',
+    'smcp',
+    'smpl',
+    'ss01',
+    'ss02',
+    'ss03',
+    'ss04',
+    'ss05',
+    'ss06',
+    'ss07',
+    'ss08',
+    'ss09',
+    'ss10',
+    'ss11',
+    'ss12',
+    'ss13',
+    'ss14',
+    'ss15',
+    'ss16',
+    'ss17',
+    'ss18',
+    'ss19',
+    'ss20',
+    'ssty',
+    'stch',
+    'subs',
+    'sups',
+    'swsh',
+    'titl',
+    'tjmo',
+    'tnam',
+    'tnum',
+    'trad',
+    'twid',
+    'unic',
+    'valt',
+    'vatu',
+    'vchw',
+    'vert',
+    'vhal',
+    'vjmo',
+    'vkna',
+    'vkrn',
+    'vpal',
+    'vrt2',
+    'vrtr',
+    'zero',
+];
diff --git a/packages/font-analyze/src/Feature/index.ts b/packages/font-analyze/src/Feature/index.ts
@@ -0,0 +1,27 @@
+import { Font } from '@konghayao/opentype.js';
+import { FeatureList } from './FeatureList';
+
+/** Opentype 的 feature 报告 */
+export const getFeatureReport = (font: Font, unicodeSet: Set<number>) => {
+    return FeatureList.reduce(
+        (col, i) => {
+            const arr: { sub: number | number[]; by: number | number[] }[] = (
+                font.substitution as any
+            ).getFeature(i);
+            const idToUnicode = (id: number) => font.glyphs.get(id).unicodes;
+            if (arr && arr.length)
+                col[i] = arr.map((i) => {
+                    return {
+                        sub: (typeof i.sub === 'number' ? [i.sub] : i.sub).map(
+                            (i) => idToUnicode(i),
+                        ),
+                        by: (typeof i.by === 'number' ? [i.by] : i.by).map(
+                            (i) => idToUnicode(i),
+                        ),
+                    };
+                });
+            return col;
+        },
+        {} as Record<string, { sub: number[][]; by: number[][] }[]>,
+    );
+};
diff --git a/packages/font-analyze/src/index.ts b/packages/font-analyze/src/index.ts
@@ -1,14 +1,17 @@
-import { parse, type Font } from '@konghayao/opentype.js';
+import { RenderOptions, parse } from '@konghayao/opentype.js';
 import { getCharsetReport } from './Charset/getCharsetReport.js';
 import {
     defaultCharsetLoader,
     CharsetLoader,
 } from './Charset/defaultCharsetLoader.js';
+import { getFeatureReport } from './Feature/index.js';
+
+export * from './Charset/defaultCharsetLoader.js';
 
 /** 分析字体中的字符集和字型相关信息 */
 export const FontAnalyze = async (
     input: Buffer | ArrayBuffer,
-    { charsetLoader = defaultCharsetLoader }: { charsetLoader: CharsetLoader }
+    { charsetLoader = defaultCharsetLoader }: { charsetLoader: CharsetLoader },
 ) => {
     const font = parse(input);
 
@@ -22,8 +25,9 @@ export const FontAnalyze = async (
     const { unicodeReport, standard } = await getCharsetReport(
         charsetLoader,
         font,
-        unicodeSet
+        unicodeSet,
     );
+    const features = getFeatureReport(font, unicodeSet);
     return {
         file: {
             size: input.byteLength,
@@ -35,5 +39,19 @@ export const FontAnalyze = async (
         unicode: unicodeReport,
         /** 各大标准字符集检测 */
         standard,
+        /** opentype feature 的替换表 */
+        features,
+        /** 将文本绘制成图片 */
+        drawTextToSVG(
+            text: string,
+            x: number,
+            y: number,
+            fontSize: number,
+            options?: RenderOptions,
+        ) {
+            return font
+                .getPaths(text, x, y, fontSize, options)
+                .map((i) => i.toSVG(1));
+        },
     };
 };
diff --git a/packages/subsets/README.md b/packages/subsets/README.md
@@ -1,16 +1,14 @@
 # 中文 Web Font 切割工具
 
-![updateTime](https://img.shields.io/badge/更新时间-2023/11/4-green)
+![updateTime](https://img.shields.io/badge/更新时间-2023/12/18-green)
 ![author](https://img.shields.io/badge/author-江夏尧-green)
-![npmVersion](https://img.shields.io/badge/LTS_version-4.10.5-green)
+![npmVersion](https://img.shields.io/badge/LTS_version-4.11.0-green)
 [![](https://data.jsdelivr.com/v1/package/npm/@konghayao/cn-font-split/badge)](https://www.jsdelivr.com/package/npm/@konghayao/cn-font-split)
 
 ![CodeFactor](https://www.codefactor.io/repository/github/konghayao/cn-font-split/badge)
 ![NPM License](https://img.shields.io/npm/l/%40konghayao%2Fcn-font-split)
-![downloadCount](https://img.shields.io/npm/dw/%40konghayao%2Fcn-font-split)
-
-| [中文网字计划](https://chinese-font.netlify.app/) | [Github](https://github.com/KonghaYao/cn-font-split) |
-| ------------------------------------------------- | ---------------------------------------------------- |
+| [中文网字计划](https://chinese-font.netlify.app/) | [Github](https://github.com/KonghaYao/cn-font-split) | [在线使用](https://chinese-font.netlify.app/online-split/)|
+| ------------------------------------------------- | ---------------------------------------------------- |---------------------------------------------------- |
 
 ## 简介
 
@@ -24,7 +22,7 @@
 
 > 我们正在对 cn-font-split 的实战效果进行测试，并积极提升分包效果！
 >
-> [Opentype Feature 测试情况](/packages/test/SUPPORT_FEATURE.md) 支持 100 ｜ 部分支持 4｜ 等待测试 39
+> [Opentype Feature 测试情况](/packages/test/SUPPORT_FEATURE.md) 支持 95 ｜ 部分支持 9｜ 等待测试 20
 
 [详见兼容性章节](#兼容性提醒)。
 | [Nodejs](#nodejs) | [Deno](#deno) | [Chrome](#browser) | [FireFox](#browser) | [Safari](#browser) | [Bun](#bun) |