diff --git a/ts/docx/paragraph/formatting.ts b/ts/docx/paragraph/formatting.ts deleted file mode 100644 index 204afb528d..0000000000 --- a/ts/docx/paragraph/formatting.ts +++ /dev/null @@ -1,10 +0,0 @@ -export { Alignment } from "./alignment"; -export { ThematicBreak } from "./border"; -export { Indent } from "./indent"; -export { KeepLines, KeepNext } from "./keep"; -export { PageBreak } from "./page-break"; -export { ParagraphProperties } from "./properties"; -export { ISpacingProperties, Spacing } from "./spacing"; -export { Style } from "./style"; -export { LeftTabStop, MaxRightTabStop } from "./tab-stop"; -export { NumberProperties } from "./unordered-list"; diff --git a/ts/docx/paragraph/alignment.ts b/ts/docx/paragraph/formatting/alignment.ts similarity index 84% rename from ts/docx/paragraph/alignment.ts rename to ts/docx/paragraph/formatting/alignment.ts index 672ee41bac..5923f0d623 100644 --- a/ts/docx/paragraph/alignment.ts +++ b/ts/docx/paragraph/formatting/alignment.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPalignment.php -import { XmlAttributeComponent, XmlComponent } from "../xml-components"; +import { XmlAttributeComponent, XmlComponent } from "../../xml-components"; export type AlignmentOptions = "left" | "center" | "right" | "both"; diff --git a/ts/docx/paragraph/border.spec.ts b/ts/docx/paragraph/formatting/border.spec.ts similarity index 93% rename from ts/docx/paragraph/border.spec.ts rename to ts/docx/paragraph/formatting/border.spec.ts index 105f6732a2..4e369bd887 100644 --- a/ts/docx/paragraph/border.spec.ts +++ b/ts/docx/paragraph/formatting/border.spec.ts @@ -1,6 +1,6 @@ import { assert } from "chai"; -import { Utility } from "../../tests/utility"; +import { Utility } from "../../../tests/utility"; import { ThematicBreak } from "./border"; describe("Border", () => { diff --git a/ts/docx/paragraph/border.ts b/ts/docx/paragraph/formatting/border.ts similarity index 86% rename from ts/docx/paragraph/border.ts rename to ts/docx/paragraph/formatting/border.ts index 80f17504bc..11eb7c45aa 100644 --- a/ts/docx/paragraph/border.ts +++ b/ts/docx/paragraph/formatting/border.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPborders.php -import { Attributes, XmlComponent } from "../xml-components"; +import { Attributes, XmlComponent } from "../../xml-components"; class Border extends XmlComponent { diff --git a/ts/docx/paragraph/indent.ts b/ts/docx/paragraph/formatting/indent.ts similarity index 88% rename from ts/docx/paragraph/indent.ts rename to ts/docx/paragraph/formatting/indent.ts index cbde90418e..67ca37b905 100644 --- a/ts/docx/paragraph/indent.ts +++ b/ts/docx/paragraph/formatting/indent.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPindentation.php -import { XmlAttributeComponent, XmlComponent } from "../xml-components"; +import { XmlAttributeComponent, XmlComponent } from "../../xml-components"; interface IIndentAttributesProperties { left?: number; diff --git a/ts/docx/paragraph/formatting/index.ts b/ts/docx/paragraph/formatting/index.ts new file mode 100644 index 0000000000..2c8829ee9d --- /dev/null +++ b/ts/docx/paragraph/formatting/index.ts @@ -0,0 +1,9 @@ +export * from "./alignment"; +export * from "./border"; +export * from "./indent"; +export * from "./keep"; +export * from "./page-break"; +export * from "./spacing"; +export * from "./style"; +export * from "./tab-stop"; +export * from "./unordered-list"; diff --git a/ts/docx/paragraph/keep.ts b/ts/docx/paragraph/formatting/keep.ts similarity index 79% rename from ts/docx/paragraph/keep.ts rename to ts/docx/paragraph/formatting/keep.ts index 76f378faf0..1e3e27c422 100644 --- a/ts/docx/paragraph/keep.ts +++ b/ts/docx/paragraph/formatting/keep.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "../xml-components"; +import { XmlComponent } from "../../xml-components"; export class KeepLines extends XmlComponent { constructor() { diff --git a/ts/docx/paragraph/page-break.spec.ts b/ts/docx/paragraph/formatting/page-break.spec.ts similarity index 94% rename from ts/docx/paragraph/page-break.spec.ts rename to ts/docx/paragraph/formatting/page-break.spec.ts index e7b6a2f32c..675ac5d112 100644 --- a/ts/docx/paragraph/page-break.spec.ts +++ b/ts/docx/paragraph/formatting/page-break.spec.ts @@ -1,6 +1,6 @@ import { assert } from "chai"; -import { Utility } from "../../tests/utility"; +import { Utility } from "../../../tests/utility"; import { PageBreak } from "./page-break"; describe("PageBreak", () => { diff --git a/ts/docx/paragraph/page-break.ts b/ts/docx/paragraph/formatting/page-break.ts similarity index 77% rename from ts/docx/paragraph/page-break.ts rename to ts/docx/paragraph/formatting/page-break.ts index b64f0ecf9f..055b0a106c 100644 --- a/ts/docx/paragraph/page-break.ts +++ b/ts/docx/paragraph/formatting/page-break.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPtextSpecialContent-break.php -import { Run } from "../run"; -import { Attributes, XmlComponent } from "../xml-components"; +import { Run } from "../../run"; +import { Attributes, XmlComponent } from "../../xml-components"; class Break extends XmlComponent { diff --git a/ts/docx/paragraph/spacing.spec.ts b/ts/docx/paragraph/formatting/spacing.spec.ts similarity index 93% rename from ts/docx/paragraph/spacing.spec.ts rename to ts/docx/paragraph/formatting/spacing.spec.ts index b940adeff7..a011b5a6f5 100644 --- a/ts/docx/paragraph/spacing.spec.ts +++ b/ts/docx/paragraph/formatting/spacing.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "../../export/formatter"; +import { Formatter } from "../../../export/formatter"; import { Spacing } from "./spacing"; describe("Spacing", () => { diff --git a/ts/docx/paragraph/spacing.ts b/ts/docx/paragraph/formatting/spacing.ts similarity index 87% rename from ts/docx/paragraph/spacing.ts rename to ts/docx/paragraph/formatting/spacing.ts index e3d139e65d..23df8523ac 100644 --- a/ts/docx/paragraph/spacing.ts +++ b/ts/docx/paragraph/formatting/spacing.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPspacing.php -import { XmlAttributeComponent, XmlComponent } from "../xml-components"; +import { XmlAttributeComponent, XmlComponent } from "../../xml-components"; export interface ISpacingProperties { after?: number; diff --git a/ts/docx/paragraph/style.spec.ts b/ts/docx/paragraph/formatting/style.spec.ts similarity index 92% rename from ts/docx/paragraph/style.spec.ts rename to ts/docx/paragraph/formatting/style.spec.ts index 3ee3050828..118df1175c 100644 --- a/ts/docx/paragraph/style.spec.ts +++ b/ts/docx/paragraph/formatting/style.spec.ts @@ -1,6 +1,6 @@ import { assert } from "chai"; -import { Utility } from "../../tests/utility"; +import { Utility } from "../../../tests/utility"; import { Style } from "./style"; describe("ParagraphStyle", () => { diff --git a/ts/docx/paragraph/style.ts b/ts/docx/paragraph/formatting/style.ts similarity index 74% rename from ts/docx/paragraph/style.ts rename to ts/docx/paragraph/formatting/style.ts index 9ac9b66086..4f73e0f2b5 100644 --- a/ts/docx/paragraph/style.ts +++ b/ts/docx/paragraph/formatting/style.ts @@ -1,4 +1,4 @@ -import { Attributes, XmlComponent } from "../xml-components"; +import { Attributes, XmlComponent } from "../../xml-components"; export class Style extends XmlComponent { diff --git a/ts/docx/paragraph/tab-stop.spec.ts b/ts/docx/paragraph/formatting/tab-stop.spec.ts similarity index 96% rename from ts/docx/paragraph/tab-stop.spec.ts rename to ts/docx/paragraph/formatting/tab-stop.spec.ts index 892a1f1490..bb9fa80d96 100644 --- a/ts/docx/paragraph/tab-stop.spec.ts +++ b/ts/docx/paragraph/formatting/tab-stop.spec.ts @@ -1,6 +1,6 @@ import { assert } from "chai"; -import { Utility } from "../../tests/utility"; +import { Utility } from "../../../tests/utility"; import { LeftTabStop, MaxRightTabStop } from "./tab-stop"; describe("LeftTabStop", () => { diff --git a/ts/docx/paragraph/tab-stop.ts b/ts/docx/paragraph/formatting/tab-stop.ts similarity index 94% rename from ts/docx/paragraph/tab-stop.ts rename to ts/docx/paragraph/formatting/tab-stop.ts index bbae20a891..4042b7d47d 100644 --- a/ts/docx/paragraph/tab-stop.ts +++ b/ts/docx/paragraph/formatting/tab-stop.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPtab.php -import { XmlAttributeComponent, XmlComponent } from "../xml-components"; +import { XmlAttributeComponent, XmlComponent } from "../../xml-components"; export class TabStop extends XmlComponent { diff --git a/ts/docx/paragraph/unordered-list.spec.ts b/ts/docx/paragraph/formatting/unordered-list.spec.ts similarity index 95% rename from ts/docx/paragraph/unordered-list.spec.ts rename to ts/docx/paragraph/formatting/unordered-list.spec.ts index 31d26bafbd..c0fc274da0 100644 --- a/ts/docx/paragraph/unordered-list.spec.ts +++ b/ts/docx/paragraph/formatting/unordered-list.spec.ts @@ -1,6 +1,6 @@ import { assert } from "chai"; -import { Utility } from "../../tests/utility"; +import { Utility } from "../../../tests/utility"; import { NumberProperties } from "./unordered-list"; describe("NumberProperties", () => { diff --git a/ts/docx/paragraph/unordered-list.ts b/ts/docx/paragraph/formatting/unordered-list.ts similarity index 90% rename from ts/docx/paragraph/unordered-list.ts rename to ts/docx/paragraph/formatting/unordered-list.ts index a30c49a7e9..50af69c20d 100644 --- a/ts/docx/paragraph/unordered-list.ts +++ b/ts/docx/paragraph/formatting/unordered-list.ts @@ -1,4 +1,4 @@ -import { Attributes, XmlComponent } from "../xml-components"; +import { Attributes, XmlComponent } from "../../xml-components"; export class NumberProperties extends XmlComponent { diff --git a/ts/docx/paragraph/index.ts b/ts/docx/paragraph/index.ts index 94056e9532..653e1a8e97 100644 --- a/ts/docx/paragraph/index.ts +++ b/ts/docx/paragraph/index.ts @@ -1,2 +1,3 @@ export * from "./formatting"; export * from "./paragraph"; +export * from "./properties"; diff --git a/ts/docx/paragraph/paragraph.ts b/ts/docx/paragraph/paragraph.ts index 1a8d498658..fcba366b8f 100644 --- a/ts/docx/paragraph/paragraph.ts +++ b/ts/docx/paragraph/paragraph.ts @@ -6,16 +6,16 @@ import { PictureRun } from "../run/picture-run"; import { TextRun } from "../run/text-run"; import { XmlComponent } from "../xml-components"; -import { Alignment } from "./alignment"; -import { ThematicBreak } from "./border"; -import { Indent } from "./indent"; -import { KeepLines, KeepNext } from "./keep"; -import { PageBreak } from "./page-break"; +import { Alignment } from "./formatting/alignment"; +import { ThematicBreak } from "./formatting/border"; +import { Indent } from "./formatting/indent"; +import { KeepLines, KeepNext } from "./formatting/keep"; +import { PageBreak } from "./formatting/page-break"; +import { ISpacingProperties, Spacing } from "./formatting/spacing"; +import { Style } from "./formatting/style"; +import { CenterTabStop, LeftTabStop, MaxRightTabStop, RightTabStop } from "./formatting/tab-stop"; +import { NumberProperties } from "./formatting/unordered-list"; import { ParagraphProperties } from "./properties"; -import { ISpacingProperties, Spacing } from "./spacing"; -import { Style } from "./style"; -import { CenterTabStop, LeftTabStop, MaxRightTabStop, RightTabStop } from "./tab-stop"; -import { NumberProperties } from "./unordered-list"; export class Paragraph extends XmlComponent { private properties: ParagraphProperties; diff --git a/ts/numbering/numbering.ts b/ts/numbering/numbering.ts index e531f94f27..b8a601e96c 100644 --- a/ts/numbering/numbering.ts +++ b/ts/numbering/numbering.ts @@ -1,5 +1,5 @@ import { DocumentAttributes } from "../docx/document/document-attributes"; -import { Indent } from "../docx/paragraph/indent"; +import { Indent } from "../docx/paragraph/formatting"; import { RunFonts } from "../docx/run/run-fonts"; import { XmlComponent } from "../docx/xml-components"; import { AbstractNumbering } from "./abstract-numbering"; diff --git a/ts/styles/style/index.ts b/ts/styles/style/index.ts index 831b0eda7d..349565e0f6 100644 --- a/ts/styles/style/index.ts +++ b/ts/styles/style/index.ts @@ -1,4 +1,4 @@ -import * as paragraph from "../../docx/paragraph/formatting"; +import * as paragraph from "../../docx/paragraph"; import * as formatting from "../../docx/run/formatting"; import { RunProperties } from "../../docx/run/properties"; import { XmlAttributeComponent, XmlComponent } from "../../docx/xml-components";