From fdfce79e87b4c1973c70c9cf63b19427175e6137 Mon Sep 17 00:00:00 2001
From: wangfengming <wangfengming@hexin.im>
Date: Sun, 7 Jun 2020 12:38:03 +0800
Subject: [PATCH] :feat: Font for eastAsia

---
 src/file/paragraph/run/formatting.ts       |  2 +-
 src/file/paragraph/run/run-fonts.ts        | 42 +++++++++++++---------
 src/file/paragraph/run/run.ts              | 18 ++++++----
 src/file/styles/defaults/run-properties.ts |  6 ++--
 src/file/styles/style-options.ts           | 11 ++++--
 src/file/styles/style/character-style.ts   |  3 +-
 6 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/src/file/paragraph/run/formatting.ts b/src/file/paragraph/run/formatting.ts
index 3055ba44e7..51b14be5cf 100644
--- a/src/file/paragraph/run/formatting.ts
+++ b/src/file/paragraph/run/formatting.ts
@@ -3,7 +3,7 @@ import { Attributes, XmlComponent } from "file/xml-components";
 export { Underline } from "./underline";
 export { EmphasisMark } from "./emphasis-mark";
 export { SubScript, SuperScript } from "./script";
-export { RunFonts } from "./run-fonts";
+export { RunFonts, IFontAttributesProperties } from "./run-fonts";
 
 export class Bold extends XmlComponent {
     constructor() {
diff --git a/src/file/paragraph/run/run-fonts.ts b/src/file/paragraph/run/run-fonts.ts
index 10a441626c..c1eed32613 100644
--- a/src/file/paragraph/run/run-fonts.ts
+++ b/src/file/paragraph/run/run-fonts.ts
@@ -1,14 +1,14 @@
 import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 
-interface IRunFontAttributesProperties {
-    readonly ascii: string;
-    readonly cs: string;
-    readonly eastAsia: string;
-    readonly hAnsi: string;
+export interface IFontAttributesProperties {
+    readonly ascii?: string;
+    readonly cs?: string;
+    readonly eastAsia?: string;
+    readonly hAnsi?: string;
     readonly hint?: string;
 }
 
-class RunFontAttributes extends XmlAttributeComponent<IRunFontAttributesProperties> {
+class RunFontAttributes extends XmlAttributeComponent<IFontAttributesProperties> {
     protected readonly xmlKeys = {
         ascii: "w:ascii",
         cs: "w:cs",
@@ -19,16 +19,26 @@ class RunFontAttributes extends XmlAttributeComponent<IRunFontAttributesProperti
 }
 
 export class RunFonts extends XmlComponent {
-    constructor(ascii: string, hint?: string) {
+    constructor(name: string, hint?: string);
+    constructor(attrs: string | IFontAttributesProperties);
+    constructor(nameOrAttrs: string | IFontAttributesProperties, hint?: string) {
         super("w:rFonts");
-        this.root.push(
-            new RunFontAttributes({
-                ascii: ascii,
-                cs: ascii,
-                eastAsia: ascii,
-                hAnsi: ascii,
-                hint: hint,
-            }),
-        );
+        if (typeof nameOrAttrs === "string") {
+            // use constructor(name: string, hint?: string);
+            const name = nameOrAttrs;
+            this.root.push(
+                new RunFontAttributes({
+                    ascii: name,
+                    cs: name,
+                    eastAsia: name,
+                    hAnsi: name,
+                    hint: hint,
+                }),
+            );
+        } else {
+            // use constructor(attrs: IRunFontAttributesProperties);
+            const attrs = nameOrAttrs;
+            this.root.push(new RunFontAttributes(attrs));
+        }
     }
 }
diff --git a/src/file/paragraph/run/run.ts b/src/file/paragraph/run/run.ts
index 8225ebdc95..5a26f3352c 100644
--- a/src/file/paragraph/run/run.ts
+++ b/src/file/paragraph/run/run.ts
@@ -27,11 +27,16 @@ import {
 import { NumberOfPages, NumberOfPagesSection, Page } from "./page-number";
 import { RunProperties } from "./properties";
 import { Text } from "./run-components/text";
-import { RunFonts } from "./run-fonts";
+import { IFontAttributesProperties, RunFonts } from "./run-fonts";
 import { SubScript, SuperScript } from "./script";
 import { Style } from "./style";
 import { Underline, UnderlineType } from "./underline";
 
+interface IFontOptions {
+    readonly name: string;
+    readonly hint?: string;
+}
+
 export interface IRunOptions {
     readonly bold?: true;
     readonly italics?: true;
@@ -52,10 +57,7 @@ export interface IRunOptions {
     readonly subScript?: boolean;
     readonly superScript?: boolean;
     readonly style?: string;
-    readonly font?: {
-        readonly name: string;
-        readonly hint?: string;
-    };
+    readonly font?: IFontOptions | IFontAttributesProperties;
     readonly highlight?: string;
     readonly shading?: {
         readonly type: ShadingType;
@@ -140,7 +142,11 @@ export class Run extends XmlComponent {
         }
 
         if (options.font) {
-            this.properties.push(new RunFonts(options.font.name, options.font.hint));
+            if ("name" in options.font) {
+                this.properties.push(new RunFonts(options.font.name, options.font.hint));
+            } else {
+                this.properties.push(new RunFonts(options.font));
+            }
         }
 
         if (options.highlight) {
diff --git a/src/file/styles/defaults/run-properties.ts b/src/file/styles/defaults/run-properties.ts
index 1ab8f5752c..2228f84de6 100644
--- a/src/file/styles/defaults/run-properties.ts
+++ b/src/file/styles/defaults/run-properties.ts
@@ -1,6 +1,6 @@
 import { Size, SizeComplexScript } from "file/paragraph/run/formatting";
 import { RunProperties } from "file/paragraph/run/properties";
-import { RunFonts } from "file/paragraph/run/run-fonts";
+import { IFontAttributesProperties, RunFonts } from "file/paragraph/run/run-fonts";
 import { XmlComponent } from "file/xml-components";
 
 export class RunPropertiesDefaults extends XmlComponent {
@@ -18,8 +18,8 @@ export class RunPropertiesDefaults extends XmlComponent {
         return this;
     }
 
-    public font(fontName: string): RunPropertiesDefaults {
-        this.properties.push(new RunFonts(fontName));
+    public font(font: string | IFontAttributesProperties): RunPropertiesDefaults {
+        this.properties.push(new RunFonts(font));
         return this;
     }
 }
diff --git a/src/file/styles/style-options.ts b/src/file/styles/style-options.ts
index b748c42e79..8ce1e6460b 100644
--- a/src/file/styles/style-options.ts
+++ b/src/file/styles/style-options.ts
@@ -1,4 +1,11 @@
-import { AlignmentType, EmphasisMarkType, IIndentAttributesProperties, ISpacingProperties, UnderlineType } from "../paragraph";
+import {
+    AlignmentType,
+    EmphasisMarkType,
+    IFontAttributesProperties,
+    IIndentAttributesProperties,
+    ISpacingProperties,
+    UnderlineType,
+} from "../paragraph";
 import { ShadingType } from "../table";
 
 export interface IRunStyleOptions {
@@ -19,7 +26,7 @@ export interface IRunStyleOptions {
         readonly type?: EmphasisMarkType;
     };
     readonly color?: string;
-    readonly font?: string;
+    readonly font?: string | IFontAttributesProperties;
     readonly characterSpacing?: number;
     readonly highlight?: string;
     readonly shadow?: {
diff --git a/src/file/styles/style/character-style.ts b/src/file/styles/style/character-style.ts
index f92540dc16..f0d6c24639 100644
--- a/src/file/styles/style/character-style.ts
+++ b/src/file/styles/style/character-style.ts
@@ -1,6 +1,7 @@
 import { EmphasisMarkType } from "file/paragraph/run/emphasis-mark";
 import * as formatting from "file/paragraph/run/formatting";
 import { RunProperties } from "file/paragraph/run/properties";
+import { IFontAttributesProperties } from "file/paragraph/run/run-fonts";
 import { UnderlineType } from "file/paragraph/run/underline";
 
 import { BasedOn, Link, SemiHidden, UiPriority, UnhideWhenUsed } from "./components";
@@ -28,7 +29,7 @@ export interface IBaseCharacterStyleOptions {
             readonly type?: EmphasisMarkType;
         };
         readonly color?: string;
-        readonly font?: string;
+        readonly font?: string | IFontAttributesProperties;
         readonly characterSpacing?: number;
         readonly highlight?: string;
         readonly shadow?: {