From fdfce79e87b4c1973c70c9cf63b19427175e6137 Mon Sep 17 00:00:00 2001 From: wangfengming 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 { +class RunFontAttributes extends XmlAttributeComponent { protected readonly xmlKeys = { ascii: "w:ascii", cs: "w:cs", @@ -19,16 +19,26 @@ class RunFontAttributes extends XmlAttributeComponent