abstract-document 11.0.2 → 11.0.4

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun.pdf

@@ -53,7 +53,7 @@ endobj
 (PDFKit)
 endobj
 13 0 obj
-(D:20240519112124Z)
+(D:20240520132202Z)
 endobj
 10 0 obj
 <<
@@ -117,7 +117,7 @@ trailer
 /Size 14
 /Root 3 0 R
 /Info 10 0 R
-/ID [<285d50a1322d087f5a69b574222d17cc> <285d50a1322d087f5a69b574222d17cc>]
+/ID [<1d84e5eff3bd2c3cd559a231172373a3> <1d84e5eff3bd2c3cd559a231172373a3>]
 >>
 startxref
 905

package/src/abstract-document-exporters/__tests__/pdf/tmp/Table of content separator.pdf

@@ -71,7 +71,7 @@ endobj
 (PDFKit)
 endobj
 14 0 obj
-(D:20240519112124Z)
+(D:20240520132202Z)
 endobj
 11 0 obj
 <<
@@ -136,7 +136,7 @@ trailer
 /Size 15
 /Root 3 0 R
 /Info 11 0 R
-/ID [<4206bedf274b4cc373abff2c8767d3c0> <4206bedf274b4cc373abff2c8767d3c0>]
+/ID [<3f8a32f88000129c402373a1ccae1590> <3f8a32f88000129c402373a1ccae1590>]
 >>
 startxref
 1232

package/src/abstract-document-exporters/__tests__/pdf/tmp/hello with roman font.pdf

@@ -53,7 +53,7 @@ endobj
 (PDFKit)
 endobj
 13 0 obj
-(D:20240519112123Z)
+(D:20240520132201Z)
 endobj
 10 0 obj
 <<
@@ -117,7 +117,7 @@ trailer
 /Size 14
 /Root 3 0 R
 /Info 10 0 R
-/ID [<60f952469de62f07c4c52b8ecc59d8ec> <60f952469de62f07c4c52b8ecc59d8ec>]
+/ID [<07e8220c75f11b4ecb53ac0da2a07d65> <07e8220c75f11b4ecb53ac0da2a07d65>]
 >>
 startxref
 975

package/src/abstract-document-exporters/__tests__/pdf/tmp/hello.pdf

@@ -93,7 +93,7 @@ endobj
 (PDFKit)
 endobj
 16 0 obj
-(D:20240519112124Z)
+(D:20240520132201Z)
 endobj
 13 0 obj
 <<
@@ -160,7 +160,7 @@ trailer
 /Size 17
 /Root 3 0 R
 /Info 13 0 R
-/ID [<bb63df93fd1f57f029fc6c6750a5faa6> <bb63df93fd1f57f029fc6c6750a5faa6>]
+/ID [<dd813f5d1a5aa456a8f31921d600112f> <dd813f5d1a5aa456a8f31921d600112f>]
 >>
 startxref
 1330

package/src/abstract-document-exporters/__tests__/pdf/tmp/pagebreak.pdf

@@ -53,7 +53,7 @@ endobj
 (PDFKit)
 endobj
 13 0 obj
-(D:20240519112123Z)
+(D:20240520132201Z)
 endobj
 10 0 obj
 <<
@@ -117,7 +117,7 @@ trailer
 /Size 14
 /Root 3 0 R
 /Info 10 0 R
-/ID [<17eae9ec2ac3aa77849fcfcbe75c0238> <17eae9ec2ac3aa77849fcfcbe75c0238>]
+/ID [<bcc4ee01987984fd63b5a61e8e9145e4> <bcc4ee01987984fd63b5a61e8e9145e4>]
 >>
 startxref
 905

package/src/abstract-document-exporters/__tests__/pdf/tmp/world.pdf

@@ -53,7 +53,7 @@ endobj
 (PDFKit)
 endobj
 13 0 obj
-(D:20240519112124Z)
+(D:20240520132202Z)
 endobj
 10 0 obj
 <<
@@ -117,7 +117,7 @@ trailer
 /Size 14
 /Root 3 0 R
 /Info 10 0 R
-/ID [<3c6270a4c4f7be56cb433c17ebc37b37> <3c6270a4c4f7be56cb433c17ebc37b37>]
+/ID [<84d2842ff6a682d7d29b96d755b3f311> <84d2842ff6a682d7d29b96d755b3f311>]
 >>
 startxref
 918

package/src/abstract-document-exporters/pdf/font.ts

@@ -3,7 +3,7 @@ import { TextFontWeight } from "../../abstract-document/styles/text-style";
 import { getResources } from "../shared/get_resources";
 
 export function registerFonts(
-  registerFont: (fontName: string, fontSource: AD.Font.FontSource, fontFamily?: string) => void,
+  registerFont: (fontName: string, fontSource: AD.Font.FontSource) => void,
   document: AD.AbstractDoc.AbstractDoc
 ): void {
   const resources = getResources(document);

package/src/abstract-document-exporters/pdf/measure.ts

@@ -16,12 +16,8 @@ export function measurePages(
   document: AD.AbstractDoc.AbstractDoc,
   pages: ReadonlyArray<Page>
 ): Map<any, AD.Size.Size> {
-  let pdf = new pdfKit();
-  registerFonts(
-    (fontName: string, fontSource: AD.Font.FontSource, fontFamily: string) =>
-      pdf.registerFont(fontName, fontSource, fontFamily),
-    document
-  );
+  const pdf = new pdfKit();
+  registerFonts((fontName: string, fontSource: AD.Font.FontSource) => pdf.registerFont(fontName, fontSource), document);
   return mergeMaps(
     pages.map((page) => measureSection(pdf, document, page.section, page.header, page.footer, page.elements))
   );

package/src/abstract-document-exporters/pdf/paginate.ts

@@ -20,14 +20,10 @@ export function paginate(
   desiredSizes: Map<any, AD.Size.Size>
 ): ReadonlyArray<Page> {
   const resources = getResources(document);
-  let pdf = new pdfKit({ compress: false, autoFirstPage: false, bufferPages: true });
+  const pdf = new pdfKit({ compress: false, autoFirstPage: false, bufferPages: true });
 
-  registerFonts(
-    (fontName: string, fontSource: AD.Font.FontSource, fontFamily: string) =>
-      pdf.registerFont(fontName, fontSource, fontFamily),
-    document
-  );
-  let pages = new Array<Page>();
+  registerFonts((fontName: string, fontSource: AD.Font.FontSource) => pdf.registerFont(fontName, fontSource), document);
+  const pages = new Array<Page>();
   for (let section of document.children) {
     const previousPage = pages.length > 0 ? pages[pages.length - 1] : undefined;
     pages.push(...splitSection(pdfKit, document, resources, desiredSizes, previousPage, section));
@@ -417,11 +413,7 @@ function splitTableAt(
 
   const availableSize = getDesiredSize(table, desiredSizes);
   let pdf = new pdfKit();
-  registerFonts(
-    (fontName: string, fontSource: AD.Font.FontSource, fontFamily: string) =>
-      pdf.registerFont(fontName, fontSource, fontFamily),
-    document
-  );
+  registerFonts((fontName: string, fontSource: AD.Font.FontSource) => pdf.registerFont(fontName, fontSource), document);
   const headSizes = measureTable(pdf, resources, availableSize, tableHead);
   const tailSizes = measureTable(pdf, resources, availableSize, tableTail);
 

package/src/abstract-document-exporters/pdf/render.ts

@@ -46,14 +46,10 @@ function createDocument(
   options: PdfExportOptions,
   ad: AD.AbstractDoc.AbstractDoc
 ): PDFKit.PDFDocument {
-  let pdf = new pdfKit({ ...options, autoFirstPage: false, bufferPages: true });
+  const pdf = new pdfKit({ ...options, autoFirstPage: false, bufferPages: true });
 
   const document = preProcess(ad);
-  registerFonts(
-    (fontName: string, fontSource: AD.Font.FontSource, fontFamily: string) =>
-      pdf.registerFont(fontName, fontSource, fontFamily),
-    document
-  );
+  registerFonts((fontName: string, fontSource: AD.Font.FontSource) => pdf.registerFont(fontName, fontSource), document);
   const desiredSizes = measure(pdfKit, document);
   const pages = paginate(pdfKit, document, desiredSizes);
   const updatedPages = updatePageRefs(pages);

package/src/abstract-document-xml/abstract-doc-of-xml/abstract-doc-of-xml.ts

@@ -102,6 +102,9 @@ export function extractImageFontsStyleNames(
       images.push(item.attributes.src as string);
     } else if (item.attributes?.fontFamily) {
       fonts.push(item.attributes.fontFamily as string);
+      if (item.tagName === "StyleName" && item.attributes.name && item.attributes.type) {
+        styleNames[item.attributes.name as string] = item.attributes.type;
+      }
     } else if (item.tagName === "StyleName" && item.attributes.name && item.attributes.type) {
       styleNames[item.attributes.name as string] = item.attributes.type;
     } else {