Merge branch 'master' into feat/refactor-bidi

# Conflicts:
#	demo/demo22.js
#	src/file/paragraph/run/run.ts
This commit is contained in:
Dolan
2018-08-08 20:20:22 +01:00
5 changed files with 56 additions and 5 deletions

View File

@ -1,7 +1,18 @@
// http://officeopenxml.com/WPtext.php
import { Break } from "./break";
import { Caps, SmallCaps } from "./caps";
import { Bold, Color, DoubleStrike, Italics, RightToLeft, Size, SizeComplexScript, Strike } from "./formatting";
import {
Bold,
BoldComplexScript,
Color,
DoubleStrike,
Italics,
ItalicsComplexScript,
RightToLeft,
Size,
SizeComplexScript,
Strike,
} from "./formatting";
import { Begin, End, Page, Separate } from "./page-number";
import { RunProperties } from "./properties";
import { RunFonts } from "./run-fonts";
@ -23,11 +34,13 @@ export class Run extends XmlComponent {
public bold(): Run {
this.properties.push(new Bold());
this.properties.push(new BoldComplexScript());
return this;
}
public italic(): Run {
this.properties.push(new Italics());
this.properties.push(new ItalicsComplexScript());
return this;
}