smartyellow/docx-js
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify run format properties, removing duplicate classes. Add values functions, which check and clean up values for specific defined types from the schema

Browse Source
This commit is contained in:
Tom Hunkapiller
2021-05-24 08:20:08 +03:00
parent 449e1ed963
commit ee105cdb83
13 changed files with 274 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/file/paragraph/run/properties.ts
View File

@ -1,25 +1,7 @@
import { IShadingAttributesProperties, Shading } from "file/shading";
import { IgnoreIfEmptyXmlComponent, XmlComponent } from "file/xml-components";
import { HpsMeasureElement, IgnoreIfEmptyXmlComponent, OnOffElement, XmlComponent } from "file/xml-components";
import { EmphasisMark, EmphasisMarkType } from "./emphasis-mark";
import {
Bold,
BoldComplexScript,
Caps,
CharacterSpacing,
Color,
DoubleStrike,
Emboss,
Highlight,
HighlightComplexScript,
Imprint,
Italics,
ItalicsComplexScript,
RightToLeft,
Size,
SizeComplexScript,
SmallCaps,
Strike,
} from "./formatting";
import { CharacterSpacing, Color, Highlight, HighlightComplexScript } from "./formatting";
import { IFontAttributesProperties, RunFonts } from "./run-fonts";
import { SubScript, SuperScript } from "./script";
import { Style } from "./style";
@ -43,8 +25,8 @@ export interface IRunStylePropertiesOptions {
readonly type?: EmphasisMarkType;
};
readonly color?: string;
readonly size?: number;
readonly sizeComplexScript?: boolean | number;
readonly size?: number | string;
readonly sizeComplexScript?: boolean | number | string;
readonly rightToLeft?: boolean;
readonly smallCaps?: boolean;
readonly allCaps?: boolean;
@ -65,6 +47,49 @@ export interface IRunPropertiesOptions extends IRunStylePropertiesOptions {
readonly style?: string;
}
// <xsd:group name="EG_RPrBase">
// <xsd:choice>
// <xsd:element name="rStyle" type="CT_String"/>
// <xsd:element name="rFonts" type="CT_Fonts"/>
// <xsd:element name="b" type="CT_OnOff"/>
// <xsd:element name="bCs" type="CT_OnOff"/>
// <xsd:element name="i" type="CT_OnOff"/>
// <xsd:element name="iCs" type="CT_OnOff"/>
// <xsd:element name="caps" type="CT_OnOff"/>
// <xsd:element name="smallCaps" type="CT_OnOff"/>
// <xsd:element name="strike" type="CT_OnOff"/>
// <xsd:element name="dstrike" type="CT_OnOff"/>
// <xsd:element name="outline" type="CT_OnOff"/>
// <xsd:element name="shadow" type="CT_OnOff"/>
// <xsd:element name="emboss" type="CT_OnOff"/>
// <xsd:element name="imprint" type="CT_OnOff"/>
// <xsd:element name="noProof" type="CT_OnOff"/>
// <xsd:element name="snapToGrid" type="CT_OnOff"/>
// <xsd:element name="vanish" type="CT_OnOff"/>
// <xsd:element name="webHidden" type="CT_OnOff"/>
// <xsd:element name="color" type="CT_Color"/>
// <xsd:element name="spacing" type="CT_SignedTwipsMeasure"/>
// <xsd:element name="w" type="CT_TextScale"/>
// <xsd:element name="kern" type="CT_HpsMeasure"/>
// <xsd:element name="position" type="CT_SignedHpsMeasure"/>
// <xsd:element name="sz" type="CT_HpsMeasure"/>
// <xsd:element name="szCs" type="CT_HpsMeasure"/>
// <xsd:element name="highlight" type="CT_Highlight"/>
// <xsd:element name="u" type="CT_Underline"/>
// <xsd:element name="effect" type="CT_TextEffect"/>
// <xsd:element name="bdr" type="CT_Border"/>
// <xsd:element name="shd" type="CT_Shd"/>
// <xsd:element name="fitText" type="CT_FitText"/>
// <xsd:element name="vertAlign" type="CT_VerticalAlignRun"/>
// <xsd:element name="rtl" type="CT_OnOff"/>
// <xsd:element name="cs" type="CT_OnOff"/>
// <xsd:element name="em" type="CT_Em"/>
// <xsd:element name="lang" type="CT_Language"/>
// <xsd:element name="eastAsianLayout" type="CT_EastAsianLayout"/>
// <xsd:element name="specVanish" type="CT_OnOff"/>
// <xsd:element name="oMath" type="CT_OnOff"/>
// </xsd:choice>
// </xsd:group>
export class RunProperties extends IgnoreIfEmptyXmlComponent {
constructor(options?: IRunPropertiesOptions) {
super("w:rPr");
@ -74,17 +99,17 @@ export class RunProperties extends IgnoreIfEmptyXmlComponent {
}
if (options.bold) {
this.push(new Bold());
this.push(new OnOffElement("w:b"));
}
if ((options.boldComplexScript === undefined && options.bold) || options.boldComplexScript) {
this.push(new BoldComplexScript());
this.push(new OnOffElement("w:bCs"));
}
if (options.italics) {
this.push(new Italics());
this.push(new OnOffElement("w:i"));
}
if ((options.italicsComplexScript === undefined && options.italics) || options.italicsComplexScript) {
this.push(new ItalicsComplexScript());
this.push(new OnOffElement("w:iCs"));
}
if (options.underline) {
@ -100,32 +125,31 @@ export class RunProperties extends IgnoreIfEmptyXmlComponent {
}
if (options.size) {
this.push(new Size(options.size));
this.push(new HpsMeasureElement("w:sz", options.size));
}
const szCs =
options.sizeComplexScript === undefined || options.sizeComplexScript === true ? options.size : options.sizeComplexScript;
if (szCs) {
this.push(new SizeComplexScript(szCs));
this.push(new HpsMeasureElement("w:szCs", szCs));
}
if (options.rightToLeft) {
this.push(new RightToLeft());
this.push(new OnOffElement("w:rtl"));
}
// These two are mutually exclusive
if (options.smallCaps) {
this.push(new SmallCaps());
}
if (options.allCaps) {
this.push(new Caps());
this.push(new OnOffElement("w:smallCaps"));
} else if (options.allCaps) {
this.push(new OnOffElement("w:caps"));
}
if (options.strike) {
this.push(new Strike());
this.push(new OnOffElement("w:strike"));
}
if (options.doubleStrike) {
this.push(new DoubleStrike());
this.push(new OnOffElement("w:dstrike"));
}
if (options.subScript) {
@ -166,11 +190,11 @@ export class RunProperties extends IgnoreIfEmptyXmlComponent {
}
if (options.emboss) {
this.push(new Emboss());
this.push(new OnOffElement("w:emboss"));
}
if (options.imprint) {
this.push(new Imprint());
this.push(new OnOffElement("w:imprint"));
}
if (options.shading) {