diff --git a/demo/14-page-numbers.ts b/demo/14-page-numbers.ts index 82f8c0a07b..00b77cfe31 100644 --- a/demo/14-page-numbers.ts +++ b/demo/14-page-numbers.ts @@ -1,8 +1,7 @@ // Page numbers // Import from 'docx' rather than '../build' if you install from npm import * as fs from "fs"; -import { AlignmentType, Document, Header, Packer, PageBreak, Paragraph, TextRun } from "../build"; -import { PageNumber } from "../build/file/paragraph"; +import { AlignmentType, Document, Header, Packer, PageBreak, PageNumber, Paragraph, TextRun } from "../build"; const doc = new Document(); diff --git a/demo/17-footnotes.ts b/demo/17-footnotes.ts index 51b5b66b05..3ed1f4ea91 100644 --- a/demo/17-footnotes.ts +++ b/demo/17-footnotes.ts @@ -1,7 +1,7 @@ // Footnotes // Import from 'docx' rather than '../build' if you install from npm import * as fs from "fs"; -import { Document, Packer, Paragraph, TextRun, FootnoteReferenceRun } from "../build"; +import { Document, FootnoteReferenceRun, Packer, Paragraph, TextRun } from "../build"; const doc = new Document(); @@ -17,7 +17,9 @@ doc.addSection({ }), ], }), - new Paragraph("Hello World").referenceFootnote(3), + new Paragraph({ + children: [new TextRun("Hello World"), new FootnoteReferenceRun(3)], + }), ], }); diff --git a/demo/47-number-of-total-pages-section.ts b/demo/47-number-of-total-pages-section.ts index a26dacf066..7e8cf91b2c 100644 --- a/demo/47-number-of-total-pages-section.ts +++ b/demo/47-number-of-total-pages-section.ts @@ -13,7 +13,9 @@ const header = new Header({ new TextRun({ children: ["Page number: ", PageNumber.CURRENT], }), - new TextRun(" to ").numberOfTotalPagesSection(), + new TextRun({ + children: [" to ", PageNumber.TOTAL_PAGES_IN_SECTION], + }), ], alignment: AlignmentType.CENTER, }), diff --git a/src/file/footnotes/footnote/index.ts b/src/file/footnotes/footnote/index.ts new file mode 100644 index 0000000000..11d8ba33a9 --- /dev/null +++ b/src/file/footnotes/footnote/index.ts @@ -0,0 +1 @@ +export * from "./run"; diff --git a/src/file/footnotes/footnote/run/index.ts b/src/file/footnotes/footnote/run/index.ts new file mode 100644 index 0000000000..548e717bbd --- /dev/null +++ b/src/file/footnotes/footnote/run/index.ts @@ -0,0 +1 @@ +export * from "./reference-run"; diff --git a/src/file/footnotes/index.ts b/src/file/footnotes/index.ts index 91f3a9948b..1e11cca76a 100644 --- a/src/file/footnotes/index.ts +++ b/src/file/footnotes/index.ts @@ -1 +1,2 @@ export * from "./footnotes"; +export * from "./footnote"; diff --git a/src/file/index.ts b/src/file/index.ts index d14d4d9b1a..c4ce99e345 100644 --- a/src/file/index.ts +++ b/src/file/index.ts @@ -12,3 +12,4 @@ export * from "./xml-components"; export * from "./header-wrapper"; export * from "./footer-wrapper"; export * from "./header"; +export * from "./footnotes"; diff --git a/src/file/paragraph/paragraph.ts b/src/file/paragraph/paragraph.ts index 1defd01779..7de245fab8 100644 --- a/src/file/paragraph/paragraph.ts +++ b/src/file/paragraph/paragraph.ts @@ -44,7 +44,9 @@ export interface IParagraphOptions { readonly level: number; readonly custom?: boolean; }; - readonly children?: Array; + readonly children?: Array< + TextRun | PictureRun | Hyperlink | SymbolRun | Bookmark | PageBreak | SequentialIdentifier | FootnoteReferenceRun + >; } export class Paragraph extends XmlComponent { @@ -157,11 +159,6 @@ export class Paragraph extends XmlComponent { } } - public referenceFootnote(id: number): Paragraph { - this.root.push(new FootnoteReferenceRun(id)); - return this; - } - public addRunToFront(run: Run): Paragraph { this.root.splice(1, 0, run); return this;