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

fix #1261 use numeric ids with bookmarkStart and bookmarkEnd to conform to schema

Browse Source
This commit is contained in:
Tom Hunkapiller
2021-10-26 20:09:38 -05:00
parent f34d4833a8
commit 54565e2228
4 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/file/paragraph/links/bookmark.ts
View File

@ -1,5 +1,5 @@
// http://officeopenxml.com/WPbookmark.php
import { uniqueId } from "convenience-functions";
import { uniqueNumericId } from "convenience-functions";
import { XmlComponent } from "file/xml-components";
import { ParagraphChild } from "../paragraph";
@ -11,7 +11,7 @@ export class Bookmark {
public readonly end: BookmarkEnd;
constructor(options: { readonly id: string; readonly children: ParagraphChild[] }) {
const linkId = uniqueId();
const linkId = uniqueNumericId();
this.start = new BookmarkStart(options.id, linkId);
this.children = options.children;
@ -19,8 +19,40 @@ export class Bookmark {
}
}
// <xsd:element name="bookmarkStart" type="CT_Bookmark"/>
// <xsd:element name="bookmarkEnd" type="CT_MarkupRange"/>
// <xsd:complexType name="CT_Bookmark">
// <xsd:complexContent>
// <xsd:extension base="CT_BookmarkRange">
// <xsd:attribute name="name" type="s:ST_String" use="required"/>
// </xsd:extension>
// </xsd:complexContent>
// </xsd:complexType>
// <xsd:complexType name="CT_BookmarkRange">
// <xsd:complexContent>
// <xsd:extension base="CT_MarkupRange">
// <xsd:attribute name="colFirst" type="ST_DecimalNumber" use="optional"/>
// <xsd:attribute name="colLast" type="ST_DecimalNumber" use="optional"/>
// </xsd:extension>
// </xsd:complexContent>
// </xsd:complexType>
// <xsd:complexType name="CT_MarkupRange">
// <xsd:complexContent>
// <xsd:extension base="CT_Markup">
// <xsd:attribute name="displacedByCustomXml" type="ST_DisplacedByCustomXml" use="optional"/>
// </xsd:extension>
// </xsd:complexContent>
// </xsd:complexType>
// <xsd:complexType name="CT_Markup">
// <xsd:attribute name="id" type="ST_DecimalNumber" use="required"/>
// </xsd:complexType>
export class BookmarkStart extends XmlComponent {
constructor(id: string, linkId: string) {
constructor(id: string, linkId: number) {
super("w:bookmarkStart");
const attributes = new BookmarkStartAttributes({
@ -32,7 +64,7 @@ export class BookmarkStart extends XmlComponent {
}
export class BookmarkEnd extends XmlComponent {
constructor(linkId: string) {
constructor(linkId: number) {
super("w:bookmarkEnd");
const attributes = new BookmarkEndAttributes({