@windoc/core 0.3.27 → 0.3.28

package/dist/index.d.mts

@@ -2234,7 +2234,7 @@ declare class ListParticle {
     indent(): void;
     outdent(): void;
     unsetList(): void;
-    getListIndentWidth(element: IElement): number;
+    getListIndentWidth(element: IElement, markerWidth: number): number;
     private _getListMarkerStyleElement;
     private _getListMarkerText;
     computeListStyle(ctx: CanvasRenderingContext2D, elementList: IElement[]): Map<string, number>;

package/dist/index.d.ts

@@ -2234,7 +2234,7 @@ declare class ListParticle {
     indent(): void;
     outdent(): void;
     unsetList(): void;
-    getListIndentWidth(element: IElement): number;
+    getListIndentWidth(element: IElement, markerWidth: number): number;
     private _getListMarkerStyleElement;
     private _getListMarkerText;
     computeListStyle(ctx: CanvasRenderingContext2D, elementList: IElement[]): Map<string, number>;

package/dist/index.js

@@ -78,7 +78,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/version.ts
-var version = "0.3.27";
+var version = "0.3.28";
 
 // src/dataset/enum/Common.ts
 var MaxHeightRatio = /* @__PURE__ */ ((MaxHeightRatio2) => {
@@ -19074,10 +19074,11 @@ var ListParticle = class {
     const curIndex = isSetCursor ? endIndex : startIndex;
     this.draw.render({ curIndex, isSetCursor });
   }
-  getListIndentWidth(element) {
-    const { scale } = this.options;
+  // Each level indents by the list's marker column, so a nested marker starts
+  // exactly where its parent's text starts
+  getListIndentWidth(element, markerWidth) {
     const level = element.listLevel ?? 0;
-    return level * INDENT_PER_LEVEL * scale;
+    return level * markerWidth;
   }
   _getListMarkerStyleElement(elementList, startIndex = 0) {
     const startElement = elementList[startIndex];
@@ -19207,8 +19208,9 @@ var ListParticle = class {
         leftTop: [startX]
       }
     } = position;
-    const indentWidth = this.getListIndentWidth(startElement);
-    return startX - offsetX + tabWidth + indentWidth;
+    const level = startElement.listLevel ?? 0;
+    const markerWidth = offsetX / (level + 1);
+    return startX - markerWidth + tabWidth;
   }
   getListMarker(row) {
     const startElement = row.elementList[0];
@@ -22491,8 +22493,9 @@ var Draw = class {
         boundingBoxAscent: 0,
         boundingBoxDescent: 0
       };
-      const listIndentWidth = element.listId ? this.listParticle.getListIndentWidth(element) : 0;
-      const offsetX = curRow.offsetX || (element.listId && listStyleMap.get(element.listId) || 0) + listIndentWidth || 0;
+      const listMarkerWidth = element.listId && listStyleMap.get(element.listId) || 0;
+      const listIndentWidth = element.listId ? this.listParticle.getListIndentWidth(element, listMarkerWidth) : 0;
+      const offsetX = curRow.offsetX || listMarkerWidth + listIndentWidth || 0;
       const availableWidth = innerWidth - offsetX;
       const isStartElement = curRow.elementList.length === 1;
       x += isStartElement ? offsetX : 0;
@@ -23240,7 +23243,10 @@ var Draw = class {
         if (element.listId) {
           row.isList = true;
           const baseListOffset = listStyleMap.get(element.listId) || 0;
-          const rowListIndent = this.listParticle.getListIndentWidth(element);
+          const rowListIndent = this.listParticle.getListIndentWidth(
+            element,
+            baseListOffset
+          );
           row.offsetX = baseListOffset + rowListIndent;
           row.listIndex = listState.listIndex;
         }
@@ -24707,6 +24713,8 @@ async function createDocument(ctx) {
   });
   const footerChildren = opts.footer.disabled ? [] : await serializeFooter(ctx, width, height, margins);
   const { pageNumber } = draw.getOptions();
+  endWithParagraph(headerChildren);
+  endWithParagraph(footerChildren);
   return new import_docx2.Document({
     compatabilityModeVersion: 15,
     // LibreOffice formats PAGE/NUMPAGES results from the paragraph style
@@ -24933,6 +24941,7 @@ async function serializeRow(ctx, row, zone, options, suffix) {
   }
   return new import_docx2.Paragraph({
     children,
+    run: hasInlineImage(row) ? { size: IMAGE_MARK_HALF_POINTS } : void 0,
     style: suffix?.style,
     pageBreakBefore,
     widowControl: false,
@@ -24942,9 +24951,23 @@ async function serializeRow(ctx, row, zone, options, suffix) {
   });
 }
 var EXACT_BASELINE_RATIO = 0.8;
+var IMAGE_MARK_HALF_POINTS = 2;
+var IMAGE_MARK_DESCENT_PX = 0.3;
+function hasInlineImage(row) {
+  return row.elementList.some((el) => el.type === "image" /* IMAGE */);
+}
 function rowLine(ctx, row, baseline = row.ascent / ctx.scale) {
   const { scale } = ctx;
   const height = row.height / scale;
+  if (hasInlineImage(row)) {
+    const lineTw2 = pxTw(Math.min(baseline, height) + IMAGE_MARK_DESCENT_PX);
+    return {
+      lineTw: lineTw2,
+      beforeTw: 0,
+      afterTw: Math.max(0, pxTw(height) - lineTw2),
+      atLeast: true
+    };
+  }
   const ascent = Math.min(baseline, height);
   const line = Math.min(
     ascent / EXACT_BASELINE_RATIO,
@@ -24956,7 +24979,7 @@ function rowLine(ctx, row, baseline = row.ascent / ctx.scale) {
     pxTw(ascent) - Math.round(lineTw * EXACT_BASELINE_RATIO)
   );
   const afterTw = Math.max(0, pxTw(height) - lineTw - beforeTw);
-  return { lineTw, beforeTw, afterTw };
+  return { lineTw, beforeTw, afterTw, atLeast: false };
 }
 function rowLead(ctx, row, options) {
   const separator = row.elementList.find(
@@ -24971,12 +24994,12 @@ function rowLead(ctx, row, options) {
   return rowLine(ctx, row, baseline).beforeTw + tw(ctx, (row.offsetY || 0) + (row.spaceAbove || 0)) + pxTw(options.padTop || 0);
 }
 function rowSpacing(ctx, row, options) {
-  const { lineTw, afterTw } = rowLine(ctx, row);
+  const { lineTw, afterTw, atLeast } = rowLine(ctx, row);
   return {
     before: options.skipLead ? 0 : rowLead(ctx, row, options),
     after: afterTw + tw(ctx, row.spaceBelow || 0) + pxTw(options.padBottom || 0) + (options.extraAfter || 0),
     line: lineTw,
-    lineRule: import_docx2.LineRuleType.EXACT
+    lineRule: atLeast ? import_docx2.LineRuleType.AT_LEAST : import_docx2.LineRuleType.EXACT
   };
 }
 function createSeparatorParagraph(ctx, row, element, x, rowY2, zone, options) {
@@ -25028,6 +25051,12 @@ function createLineImage(width, height, color, dashArray) {
   for (let i = 0; i < binary.length; i++) bytes[i] = binary.charCodeAt(i);
   return bytes;
 }
+function endWithParagraph(children) {
+  if (children[children.length - 1] instanceof import_docx2.Table) {
+    children.push(createSpacerParagraph(false));
+  }
+  return children;
+}
 function createSpacerParagraph(pageBreakBefore, height = 0) {
   return new import_docx2.Paragraph({
     pageBreakBefore,
@@ -25070,7 +25099,7 @@ async function serializeTable(ctx, element, position, zone) {
       );
       cells.push(
         new import_docx2.TableCell({
-          children: cellChildren.length ? cellChildren : [createSpacerParagraph(false)],
+          children: cellChildren.length ? endWithParagraph(cellChildren) : [createSpacerParagraph(false)],
           columnSpan: td.colspan > 1 ? td.colspan : void 0,
           rowSpan: td.rowspan > 1 ? td.rowspan : void 0,
           width: { size: pxTw(td.width), type: import_docx2.WidthType.DXA },