✨ fix #132

Vanessa219 · Feb 12, 2020 · 87887e2 · 87887e2
1 parent ec8a18a
commit 87887e2
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -50,6 +50,7 @@
 * [136](https://github.com/Vanessa219/vditor/issues/136) ⌘ and Ctrl is different at MacOS `修复缺陷`
 * [135](https://github.com/Vanessa219/vditor/issues/135) can not delete the first char. at first field of links `改进功能`
 * [133](https://github.com/Vanessa219/vditor/issues/133) MathJax 渲染无法修改 `修复缺陷`
+* [132](https://github.com/Vanessa219/vditor/issues/132) 添加 md 配置项 `引入特性`
 
 ### v2.1.15 / 2020-02-09
 

diff --git a/demo/index-preview.js b/demo/index-preview.js
@@ -11,5 +11,5 @@ VditorPreview.preview(document.getElementById('preview'),
     speech: {
       enable: true,
     },
-    anchor: true
+    anchor: true,
   })
diff --git a/src/assets/index.d.min.ts b/src/assets/index.d.min.ts
@@ -68,6 +68,11 @@ interface IPreview {
     url?: string;
     hljs?: IHljs;
     math?: IMath;
+    markdown?: {
+        autoSpace?: boolean;
+        fixTermTypo?: boolean;
+        chinesePunct?: boolean;
+    };
 
     parse?(element: HTMLElement): void;
 
@@ -86,6 +91,11 @@ interface IPreviewOptions {
     anchor?: boolean;
     math?: IMath;
     cdn?: string;
+    markdown?: {
+        autoSpace?: boolean;
+        fixTermTypo?: boolean;
+        chinesePunct?: boolean;
+    };
 
     transform?(html: string): string;
 }

diff --git a/src/js/lute/lute.min.js b/src/js/lute/lute.min.js
diff --git a/src/ts/markdown/md2html.ts b/src/ts/markdown/md2html.ts
@@ -5,14 +5,14 @@ import {log} from "../util/log";
 declare const Lute: ILute;
 
 export const loadLuteJs = async (vditor: IVditor | string) => {
-    let cdn = `https://cdn.jsdelivr.net/npm/vditor@${VDITOR_VERSION}`;
-    if (typeof vditor === "string" && vditor) {
-        cdn = vditor;
-    } else if (typeof vditor === "object" && vditor.options.cdn) {
-        cdn = vditor.options.cdn;
-    }
-    addScript(`${cdn}/dist/js/lute/lute.min.js`, "vditorLuteScript");
-    // addScript(`/src/js/lute/lute.min.js`, "vditorLuteScript");
+    // let cdn = `https://cdn.jsdelivr.net/npm/vditor@${VDITOR_VERSION}`;
+    // if (typeof vditor === "string" && vditor) {
+    //     cdn = vditor;
+    // } else if (typeof vditor === "object" && vditor.options.cdn) {
+    //     cdn = vditor.options.cdn;
+    // }
+    // addScript(`${cdn}/dist/js/lute/lute.min.js`, "vditorLuteScript");
+    addScript(`/src/js/lute/lute.min.js`, "vditorLuteScript");
     // addScript(`http://192.168.80.35:9090/lute.min.js?${new Date().getTime()}`, "vditorLuteScript");
 
     if (vditor && typeof vditor === "object" && !vditor.lute) {
@@ -21,6 +21,9 @@ export const loadLuteJs = async (vditor: IVditor | string) => {
         vditor.lute.SetEmojiSite(vditor.options.hint.emojiPath);
         vditor.lute.SetParallelParsing(false);
         vditor.lute.SetInlineMathAllowDigitAfterOpenMarker(vditor.options.preview.math.inlineDigit);
+        vditor.lute.SetAutoSpace(vditor.options.preview.markdown.autoSpace);
+        vditor.lute.SetChinesePunct(vditor.options.preview.markdown.chinesePunct);
+        vditor.lute.SetFixTermTypo(vditor.options.preview.markdown.fixTermTypo);
     }
 };
 
@@ -40,6 +43,9 @@ export const md2htmlByPreview = async (mdText: string, options?: IPreviewOptions
     lute.SetHeadingAnchor(options.anchor);
     lute.SetParallelParsing(false);
     lute.SetInlineMathAllowDigitAfterOpenMarker(options.math.inlineDigit);
+    lute.SetAutoSpace(options.markdown.autoSpace);
+    lute.SetChinesePunct(options.markdown.chinesePunct);
+    lute.SetFixTermTypo(options.markdown.fixTermTypo);
     return lute.Md2HTML(mdText);
 };
 

diff --git a/src/ts/markdown/previewRender.ts b/src/ts/markdown/previewRender.ts
@@ -24,6 +24,11 @@ export const previewRender = async (previewElement: HTMLDivElement, markdown: st
             style: "github",
         },
         lang: "zh_CN",
+        markdown: {
+            autoSpace: true,
+            chinesePunct: true,
+            fixTermTypo: true,
+        },
         math: {
             engine: "KaTeX",
             inlineDigit: false,
@@ -43,6 +48,9 @@ export const previewRender = async (previewElement: HTMLDivElement, markdown: st
     if (options.math) {
         options.math = Object.assign({}, defaultOption.math, options.math);
     }
+    if (options.markdown) {
+        options.markdown = Object.assign({}, defaultOption.markdown, options.markdown);
+    }
 
     let html =
         await md2htmlByPreview(markdown, options);

diff --git a/src/ts/types/index.d.ts b/src/ts/types/index.d.ts
@@ -25,6 +25,12 @@ interface ILute {
 
     SetInlineMathAllowDigitAfterOpenMarker(enable: boolean): void;
 
+    SetAutoSpace(enable: boolean): void;
+
+    SetChinesePunct(enable: boolean): void;
+
+    SetFixTermTypo(enable: boolean): void;
+
     SetEmojiSite(emojiSite: string): void;
 
     PutEmojis(emojis: { [key: string]: string }): void;
@@ -150,6 +156,11 @@ interface IPreview {
     url?: string;
     hljs?: IHljs;
     math?: IMath;
+    markdown?: {
+        autoSpace?: boolean;
+        fixTermTypo?: boolean;
+        chinesePunct?: boolean;
+    };
 
     parse?(element: HTMLElement): void;
 
@@ -168,6 +179,11 @@ interface IPreviewOptions {
     anchor?: boolean;
     math?: IMath;
     cdn?: string;
+    markdown?: {
+        autoSpace?: boolean;
+        fixTermTypo?: boolean;
+        chinesePunct?: boolean;
+    };
 
     transform?(html: string): string;
 }

diff --git a/src/ts/util/Options.ts b/src/ts/util/Options.ts
@@ -36,6 +36,11 @@ export class Options {
                 lineNumber: false,
                 style: "github",
             },
+            markdown: {
+                autoSpace: true,
+                chinesePunct: true,
+                fixTermTypo: true,
+            },
             math: {
                 engine: "KaTeX",
                 inlineDigit: false,
@@ -238,6 +243,10 @@ export class Options {
                     this.options.preview.math =
                         Object.assign({}, this.defaultOptions.preview.math, this.options.preview.math);
                 }
+                if (this.options.preview.markdown) {
+                    this.options.preview.markdown =
+                        Object.assign({}, this.defaultOptions.preview.markdown, this.options.preview.markdown);
+                }
             }
 
             if (this.options.hint) {