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

Merge pull request #11 from felipeochoa/fonts

Browse Source 
Fonts cleanup
This commit is contained in:
Dolan
2017-03-08 20:16:17 +00:00
committed by GitHub
parent a454ff9643 727471b7e3
commit ca769cc849
5 changed files with 84 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
ts/docx/run/index.ts
View File

@ -1,75 +1,81 @@
import {XmlComponent, Attributes} from "../xml-components";
import {RunProperties} from "./properties";
import {Bold, Italics} from "./formatting";
import {Tab} from "./tab";
import {Break} from "./break";
import {SmallCaps, Caps} from "./caps";
import {Strike, DoubleStrike} from "./strike";
import {SubScript, SuperScript} from "./script";
import {Underline} from "./underline"
import { Break } from "./break";
import { Caps, SmallCaps } from "./caps";
import { Bold, Italics } from "./formatting";
import { RunProperties } from "./properties";
import { RunFonts } from "./run-fonts";
import { SubScript, SuperScript } from "./script";
import { DoubleStrike, Strike } from "./strike";
import { Tab } from "./tab";
import { Underline } from "./underline";
import { Attributes, XmlComponent } from "../xml-components";
export class Run extends XmlComponent {
private properties: RunProperties;
constructor() {
super("w:r");
this.properties = new RunProperties();
this.root.push(this.properties);
}
bold(): Run {
public bold(): Run {
this.properties.push(new Bold());
return this;
}
italic(): Run {
public italic(): Run {
this.properties.push(new Italics());
return this;
}
underline(): Run {
public underline(): Run {
this.properties.push(new Underline());
return this;
}
break(): Run {
public break(): Run {
this.root.splice(1, 0, new Break());
return this;
}
tab(): Run {
public tab(): Run {
this.root.splice(1, 0, new Tab());
return this;
}
smallCaps(): Run {
public smallCaps(): Run {
this.properties.push(new SmallCaps());
return this;
}
allCaps(): Run {
public allCaps(): Run {
this.properties.push(new Caps());
return this;
}
strike(): Run {
public strike(): Run {
this.properties.push(new Strike());
return this;
}
doubleStrike(): Run {
public doubleStrike(): Run {
this.properties.push(new DoubleStrike());
return this;
}
subScript(): Run {
public subScript(): Run {
this.properties.push(new SubScript());
return this;
}
superScript(): Run {
public superScript(): Run {
this.properties.push(new SuperScript());
return this;
}
}
public font(fontName: string): Run {
this.properties.push(new RunFonts(fontName));
return this;
}
}

6
ts/numbering/run-fonts.ts → ts/docx/run/run-fonts.ts
View File

@ -1,9 +1,9 @@
import {XmlAttributeComponent, XmlComponent} from "../docx/xml-components";
import {XmlAttributeComponent, XmlComponent} from "../xml-components";
interface IRunFontAttributesProperties {
ascii: string;
hAnsi: string;
hint: string;
hint?: string;
}
class RunFontAttributes extends XmlAttributeComponent {
@ -19,7 +19,7 @@ class RunFontAttributes extends XmlAttributeComponent {
export class RunFonts extends XmlComponent {
constructor(ascii: string, hint: string) {
constructor(ascii: string, hint?: string) {
super("w:rFonts");
this.root.push(new RunFontAttributes({
ascii: ascii,

2
ts/numbering/index.ts
View File

@ -1,11 +1,11 @@
import * as _ from "lodash";
import { DocumentAttributes } from "../docx/document/document-attributes";
import { RunFonts } from "../docx/run/run-fonts";
import { MultiPropertyXmlComponent } from "../docx/xml-components";
import { AbstractNumbering } from "./abstract-numbering";
import { Indent } from "./indent";
import { Level } from "./level";
import { Num } from "./num";
import { RunFonts } from "./run-fonts";
export class Numbering extends MultiPropertyXmlComponent {
private nextId: number;

22
ts/tests/docx/run/fontTests.ts Normal file
View File

@ -0,0 +1,22 @@
import { expect } from "chai";
import { RunFonts } from "../../../docx/run/run-fonts";
import { Formatter } from "../../../export/formatter";
describe("RunFonts", () => {
describe("#constructor()", () => {
it("uses the font name for both ascii and hAnsi", () => {
const tree = new Formatter().format(new RunFonts("Times"));
expect(tree).to.deep.equal({
"w:rFonts": [{_attr: {"w:ascii": "Times", "w:hAnsi": "Times"}}],
});
});
it("uses hint if given", () => {
const tree = new Formatter().format(new RunFonts("Times", "default"));
expect(tree).to.deep.equal({
"w:rFonts": [{_attr: {"w:ascii": "Times", "w:hAnsi": "Times", "w:hint": "default"}}],
});
});
});
});

46
ts/tests/docx/run/runTest.ts
View File

@ -1,10 +1,10 @@
import { assert, expect } from "chai";
import { Run } from "../../../docx/run";
import { TextRun } from "../../../docx/run/text-run";
import { assert } from "chai";
import { Formatter } from "../../../export/formatter";
function jsonify(obj: Object) {
let stringifiedJson = JSON.stringify(obj);
return JSON.parse(stringifiedJson);
function jsonify(obj: object) {
return JSON.parse(JSON.stringify(obj));
}
describe("Run", () => {
@ -17,7 +17,7 @@ describe("Run", () => {
describe("#bold()", () => {
it("it should add bold to the properties", () => {
run.bold();
let newJson = jsonify(run);
const newJson = jsonify(run);
assert.equal(newJson.root[0].root[0].rootKey, "w:b");
});
});
@ -25,7 +25,7 @@ describe("Run", () => {
describe("#italic()", () => {
it("it should add italics to the properties", () => {
run.italic();
let newJson = jsonify(run);
const newJson = jsonify(run);
assert.equal(newJson.root[0].root[0].rootKey, "w:i");
});
});
@ -33,7 +33,7 @@ describe("Run", () => {
describe("#underline()", () => {
it("it should add underline to the properties", () => {
run.underline();
let newJson = jsonify(run);
const newJson = jsonify(run);
assert.equal(newJson.root[0].root[0].rootKey, "w:u");
});
});
@ -41,7 +41,7 @@ describe("Run", () => {
describe("#smallCaps()", () => {
it("it should add smallCaps to the properties", () => {
run.smallCaps();
let newJson = jsonify(run);
const newJson = jsonify(run);
assert.equal(newJson.root[0].root[0].rootKey, "w:smallCaps");
});
});
@ -49,7 +49,7 @@ describe("Run", () => {
describe("#caps()", () => {
it("it should add caps to the properties", () => {
run.allCaps();
let newJson = jsonify(run);
const newJson = jsonify(run);
assert.equal(newJson.root[0].root[0].rootKey, "w:caps");
});
});
@ -57,7 +57,7 @@ describe("Run", () => {
describe("#strike()", () => {
it("it should add strike to the properties", () => {
run.strike();
let newJson = jsonify(run);
const newJson = jsonify(run);
assert.equal(newJson.root[0].root[0].rootKey, "w:strike");
});
});
@ -65,26 +65,40 @@ describe("Run", () => {
describe("#doubleStrike()", () => {
it("it should add caps to the properties", () => {
run.doubleStrike();
let newJson = jsonify(run);
const newJson = jsonify(run);
assert.equal(newJson.root[0].root[0].rootKey, "w:dstrike");
});
});
describe("#break()", () => {
it("it should add break to the run", () => {
let run = new Run();
run.break();
let newJson = jsonify(run);
const newJson = jsonify(run);
assert.equal(newJson.root[1].rootKey, "w:br");
});
});
describe("#tab()", () => {
it("it should add break to the run", () => {
let run = new Run();
run.tab();
let newJson = jsonify(run);
const newJson = jsonify(run);
assert.equal(newJson.root[1].rootKey, "w:tab");
});
});
});
describe("#font()", () => {
it("should allow chaining calls", () => {
expect(run.font("Times")).to.equal(run);
});
it("should set the font as named", () => {
run.font("Times");
const tree = new Formatter().format(run);
expect(tree).to.deep.equal({
"w:r": [
{"w:rPr": [{"w:rFonts": [{_attr: {"w:ascii": "Times", "w:hAnsi": "Times"}}]}]},
],
});
});
});
});