@cobapen/markdown 0.5.2 → 0.5.3

package/lib/index.d.ts

@@ -13,5 +13,6 @@ export declare class CMarkdown {
     constructor(option?: Options);
     setup(md: markdownIt): void;
     render(text: string): string;
+    waitMathInit(): Promise<void>;
     mathcss(): string;
 }

package/lib/index.js

@@ -58,6 +58,9 @@ export class CMarkdown {
         const env = { ...this._config };
         return this._md.render(text, env);
     }
+    async waitMathInit() {
+        return this._mj.waitInit();
+    }
     mathcss() {
         return this._mj.stylesheet();
     }

package/lib/math/mathjax.d.ts

@@ -59,12 +59,15 @@ type FontName = typeof fontNames[number];
 interface AnyObject {
     [x: string]: any;
 }
-export interface Options {
+export interface Options extends DeepPartial<EngineOptions> {
     loader?: DeepPartial<LoaderOptions>;
     tex?: DeepPartial<TexInputOptions>;
     output?: DeepPartial<OutputOptions>;
     chtml?: DeepPartial<CHTMLOptions>;
 }
+interface EngineOptions {
+    noAsyncLoad: boolean;
+}
 interface LoaderOptions {
     load: string[];
     paths: {
@@ -133,13 +136,16 @@ export interface ConvertOptions {
     width: number;
 }
 export declare class MathjaxEngine {
+    private _initStatus;
     option: Options;
     adaptor: LiteAdaptor;
     tex: TeX<N, T, D>;
     chtml: CHTML<N, T, D>;
     html: MathDocument<N, T, D>;
     constructor(option?: Partial<Options>);
-    convert(tex: string, override?: Partial<ConvertOptions>): string;
+    private asyncInit;
+    waitInit(): Promise<void>;
+    convert(tex: string, option?: Partial<ConvertOptions>): string;
     stylesheet(): string;
 }
 export {};

package/lib/math/mathjax.js

@@ -57,6 +57,7 @@ const fontNames = [
     "mathjax-newcm",
     "mathjax-stix2"
 ];
+const defaultFontName = fontNames[0];
 function isFontName(name) {
     return fontNames.includes(name);
 }
@@ -76,13 +77,14 @@ const packageList = [
 ].concat(texExtensions);
 const MATHJAX_DEFAULT_FONT_URL = (name) => `https://cdn.jsdelivr.net/npm/@mathjax/${name}-font@4/chtml/woff2`;
 const defaultMathOption = {
+    noAsyncLoad: true,
     tex: {
         packages: packageList,
     },
     output: {
         scale: 1.21,
         exFactor: 5,
-        font: "mathjax-newcm",
+        font: defaultFontName,
     },
     chtml: {
         adaptiveCSS: true,
@@ -95,6 +97,7 @@ const defaultConvertOption = {
     width: 80 * 16,
 };
 export class MathjaxEngine {
+    _initStatus = null;
     option;
     adaptor;
     tex;
@@ -109,6 +112,9 @@ export class MathjaxEngine {
             ...this.option.output,
             ...this.option.chtml,
         });
+        if (this.option.noAsyncLoad !== true) {
+            this._initStatus = this.asyncInit(chtml);
+        }
         const html = mathjax.document("", {
             InputJax: tex,
             OutputJax: chtml,
@@ -130,14 +136,19 @@ export class MathjaxEngine {
             adaptor.append(math.typesetRoot, text);
         }
     }
-    convert(tex, override) {
-        const node = this.html.convert(tex, {
-            display: !(override?.inline ?? defaultConvertOption.inline),
-            em: override?.em ?? defaultConvertOption.em,
-            ex: override?.ex ?? defaultConvertOption.ex,
-            containerWidth: override?.width ?? defaultConvertOption.width,
-            scale: 1.0,
-        });
+    async asyncInit(chtml) {
+        await import("@mathjax/src/js/util/asyncLoad/esm.js");
+        await chtml.font.loadDynamicFiles();
+    }
+    ;
+    async waitInit() {
+        if (this._initStatus) {
+            await this._initStatus;
+            this._initStatus = null;
+        }
+    }
+    convert(tex, option) {
+        const node = this.html.convert(tex, convOption(option));
         if (node instanceof LiteElement) {
             return this.adaptor.outerHTML(node);
         }
@@ -159,7 +170,7 @@ function initOption(opt) {
     if (option.output?.font !== undefined && typeof option.output.font === "string") {
         let name = option.output.font.trim();
         if (name === "default") {
-            name = "mathjax-newcm";
+            name = defaultFontName;
         }
         if (isFontName(name)) {
             if (option.output.fontData === undefined) {
@@ -171,5 +182,20 @@ function initOption(opt) {
             }
         }
     }
+    if (option.chtml?.adaptiveCSS !== true) {
+        if (option.noAsyncLoad) {
+            console.warn("[MathjaxEngine] adaptiveCSS is disabled, so noAsyncLoad is forced to false.");
+        }
+        option.noAsyncLoad = false;
+    }
     return option;
 }
+function convOption(option) {
+    return {
+        display: !(option?.inline ?? defaultConvertOption.inline),
+        em: option?.em ?? defaultConvertOption.em,
+        ex: option?.ex ?? defaultConvertOption.ex,
+        containerWidth: option?.width ?? defaultConvertOption.width,
+        scale: 1.0,
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cobapen/markdown",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "A markdown converter for cobapen website",
   "keywords": [
     "markdown"