@windoc/core 0.2.8 → 0.2.10

package/dist/index.d.mts

@@ -454,6 +454,8 @@ interface IRow {
     listIndex?: number;
     offsetX?: number;
     offsetY?: number;
+    spaceAbove?: number;
+    spaceBelow?: number;
     elementList: IRowElement[];
     isWidthNotEnough?: boolean;
     rowIndex: number;
@@ -2519,6 +2521,7 @@ declare class Draw {
     getElementSize(el: IElement): number;
     getElementRowMargin(el: IElement): number;
     computeRowList(payload: IComputeRowListPayload): IRow[];
+    private _applyRowSpacing;
     private _computePageList;
     private _drawHighlight;
     drawRow(ctx: CanvasRenderingContext2D, payload: IDrawRowPayload): void;

package/dist/index.d.ts

@@ -454,6 +454,8 @@ interface IRow {
     listIndex?: number;
     offsetX?: number;
     offsetY?: number;
+    spaceAbove?: number;
+    spaceBelow?: number;
     elementList: IRowElement[];
     isWidthNotEnough?: boolean;
     rowIndex: number;
@@ -2519,6 +2521,7 @@ declare class Draw {
     getElementSize(el: IElement): number;
     getElementRowMargin(el: IElement): number;
     computeRowList(payload: IComputeRowListPayload): IRow[];
+    private _applyRowSpacing;
     private _computePageList;
     private _drawHighlight;
     drawRow(ctx: CanvasRenderingContext2D, payload: IDrawRowPayload): void;

package/dist/index.js

@@ -145,6 +145,17 @@ var LETTER_CLASS = {
 };
 var METRICS_BASIS_TEXT = "M";
 
+// src/dataset/enum/Title.ts
+var TitleLevel = /* @__PURE__ */ ((TitleLevel2) => {
+  TitleLevel2["FIRST"] = "first";
+  TitleLevel2["SECOND"] = "second";
+  TitleLevel2["THIRD"] = "third";
+  TitleLevel2["FOURTH"] = "fourth";
+  TitleLevel2["FIFTH"] = "fifth";
+  TitleLevel2["SIXTH"] = "sixth";
+  return TitleLevel2;
+})(TitleLevel || {});
+
 // src/dataset/enum/Row.ts
 var RowFlex = /* @__PURE__ */ ((RowFlex2) => {
   RowFlex2["LEFT"] = "left";
@@ -3964,25 +3975,14 @@ var ulPresetCycles = {
 var INDENT_PER_LEVEL = 20;
 var MAX_LIST_LEVEL = 8;
 
-// src/dataset/enum/Title.ts
-var TitleLevel = /* @__PURE__ */ ((TitleLevel2) => {
-  TitleLevel2["FIRST"] = "first";
-  TitleLevel2["SECOND"] = "second";
-  TitleLevel2["THIRD"] = "third";
-  TitleLevel2["FOURTH"] = "fourth";
-  TitleLevel2["FIFTH"] = "fifth";
-  TitleLevel2["SIXTH"] = "sixth";
-  return TitleLevel2;
-})(TitleLevel || {});
-
 // src/dataset/constant/Title.ts
 var defaultTitleOption = {
-  defaultFirstSize: 26,
-  defaultSecondSize: 24,
-  defaultThirdSize: 22,
-  defaultFourthSize: 20,
-  defaultFifthSize: 18,
-  defaultSixthSize: 16
+  defaultFirstSize: 20,
+  defaultSecondSize: 16,
+  defaultThirdSize: 14,
+  defaultFourthSize: 12,
+  defaultFifthSize: 11,
+  defaultSixthSize: 11
 };
 var titleSizeMapping = {
   ["first" /* FIRST */]: "defaultFirstSize",
@@ -5403,7 +5403,7 @@ function convertElementToDom(element, options) {
   if (element.italic) {
     dom.style.fontStyle = "italic";
   }
-  dom.style.fontSize = `${element.size || options.defaultSize}px`;
+  dom.style.fontSize = `${element.size || options.defaultSize}pt`;
   if (element.highlight) {
     dom.style.backgroundColor = element.highlight;
   }
@@ -5729,7 +5729,7 @@ function convertTextNodeToElement(textNode) {
     color: style.color,
     bold: Number(style.fontWeight) > 500,
     italic: style.fontStyle.includes("italic"),
-    size: Math.floor(parseFloat(style.fontSize))
+    size: Math.round(parseFloat(style.fontSize) * 0.75)
   };
   if (anchorNode.nodeName === "SUB" || style.verticalAlign === "sub") {
     element.type = "subscript" /* SUBSCRIPT */;
@@ -6515,11 +6515,13 @@ var Cursor = class {
     const curIndex = cursorPosition.index;
     const curElement = elementList[curIndex];
     const nextElement = elementList[curIndex + 1];
-    if (curElement && curElement.type === "image" /* IMAGE */ || nextElement && nextElement.type === "image" /* IMAGE */) {
+    const isNearImage = curElement && curElement.type === "image" /* IMAGE */ || nextElement && nextElement.type === "image" /* IMAGE */;
+    const isNearSeparator = curElement && curElement.type === "separator" /* SEPARATOR */ || nextElement && nextElement.type === "separator" /* SEPARATOR */;
+    if (isNearImage || isNearSeparator) {
       const { defaultSize, defaultFont } = this.options;
       const ctx = this.draw.getCtx();
       ctx.save();
-      ctx.font = `${defaultSize * scale}px ${defaultFont}`;
+      ctx.font = `${defaultSize * (96 / 72) * scale}px ${defaultFont}`;
       const textMetrics = ctx.measureText("M");
       ctx.restore();
       const textHeight = textMetrics.actualBoundingBoxAscent + textMetrics.actualBoundingBoxDescent;
@@ -6530,10 +6532,9 @@ var Cursor = class {
         boundingBoxDescent: textMetrics.actualBoundingBoxDescent
       };
     }
-    const descent = effectiveMetrics.boundingBoxDescent < 0 ? 0 : effectiveMetrics.boundingBoxDescent;
     const cursorPadding = 2 * scale;
-    const cursorHeight = effectiveMetrics.height + descent + cursorPadding;
-    const cursorTop = leftTop[1] + ascent - effectiveMetrics.height + cursorPadding / 2 + preY;
+    const cursorHeight = effectiveMetrics.boundingBoxAscent + effectiveMetrics.boundingBoxDescent + cursorPadding;
+    const cursorTop = isNearImage ? leftTop[1] + cursorPosition.lineHeight - effectiveMetrics.boundingBoxDescent - cursorPadding / 2 + preY : leftTop[1] + ascent - effectiveMetrics.boundingBoxAscent - cursorPadding / 2 + preY;
     const cursorLeft = hitLineStartIndex ? leftTop[0] : rightTop[0];
     agentCursorDom.style.left = `${cursorLeft}px`;
     agentCursorDom.style.top = `${cursorTop}px`;
@@ -9310,7 +9311,7 @@ var Position = class {
         }
       }
       x += curRow.offsetX || 0;
-      y += curRow.offsetY || 0;
+      y += (curRow.offsetY || 0) + (curRow.spaceAbove || 0);
       const tablePreX = x;
       const tablePreY = y;
       for (let j = 0; j < curRow.elementList.length; j++) {
@@ -9423,7 +9424,7 @@ var Position = class {
         }
       }
       x = startX;
-      y += curRow.height;
+      y += curRow.height + (curRow.spaceBelow || 0);
     }
     return { x, y, index };
   }
@@ -21170,7 +21171,8 @@ var Draw = class {
     const { defaultSize, defaultFont } = this.options;
     const font = el.font || defaultFont;
     const size = el.actualSize || el.size || defaultSize;
-    return `${el.italic ? "italic " : ""}${el.bold ? "bold " : ""}${size * scale}px ${font}`;
+    const sizePx = size * (96 / 72) * scale;
+    return `${el.italic ? "italic " : ""}${el.bold ? "bold " : ""}${sizePx}px ${font}`;
   }
   getElementSize(el) {
     return el.actualSize || el.size || this.options.defaultSize;
@@ -21811,6 +21813,28 @@ var Draw = class {
     }
     return rowList;
   }
+  _applyRowSpacing() {
+    const { scale } = this.options;
+    const PT_TO_PX = 96 / 72;
+    const HEADING_SPACE = {
+      ["first" /* FIRST */]: { above: 20, below: 6 },
+      ["second" /* SECOND */]: { above: 18, below: 6 },
+      ["third" /* THIRD */]: { above: 16, below: 4 },
+      ["fourth" /* FOURTH */]: { above: 14, below: 4 },
+      ["fifth" /* FIFTH */]: { above: 12, below: 4 },
+      ["sixth" /* SIXTH */]: { above: 12, below: 4 }
+    };
+    for (const row of this.rowList) {
+      const headingEl = row.elementList.find((el) => el.level != null);
+      if (headingEl?.level != null) {
+        const space = HEADING_SPACE[headingEl.level];
+        if (space) {
+          row.spaceAbove = space.above * PT_TO_PX * scale;
+          row.spaceBelow = space.below * PT_TO_PX * scale;
+        }
+      }
+    }
+  }
   _computePageList() {
     const pageRowList = [[]];
     const {
@@ -21827,7 +21851,7 @@ var Draw = class {
         this.rowList[i].columnNo = 0;
       }
       pageHeight += this.rowList.reduce(
-        (pre, cur) => pre + cur.height + (cur.offsetY || 0),
+        (pre, cur) => pre + cur.height + (cur.offsetY || 0) + (cur.spaceAbove || 0) + (cur.spaceBelow || 0),
         0
       );
       const dpr = this.getPagePixelRatio();
@@ -21850,10 +21874,11 @@ var Draw = class {
         const rowOffsetY = row.offsetY || 0;
         const isPageBreak = this.rowList[i - 1]?.isPageBreak;
         const isColumnBreak = this.rowList[i - 1]?.isColumnBreak;
-        if (row.height + rowOffsetY + pageHeight > height || isPageBreak || isColumnBreak) {
+        const rowTotalHeight = row.height + rowOffsetY + (row.spaceAbove || 0) + (row.spaceBelow || 0);
+        if (rowTotalHeight + pageHeight > height || isPageBreak || isColumnBreak) {
           if ((!isPageBreak || isColumnBreak) && columnCount > 1 && columnNo < columnCount - 1) {
             columnNo++;
-            pageHeight = marginHeight + row.height + rowOffsetY;
+            pageHeight = marginHeight + rowTotalHeight;
             row.columnNo = columnNo;
             pageRowList[pageNo].push(row);
           } else {
@@ -21862,14 +21887,14 @@ var Draw = class {
               break;
             }
             columnNo = 0;
-            pageHeight = marginHeight + row.height + rowOffsetY;
+            pageHeight = marginHeight + rowTotalHeight;
             row.columnNo = columnNo;
             pageRowList.push([row]);
             pageNo++;
           }
         } else {
           row.columnNo = columnNo;
-          pageHeight += row.height + rowOffsetY;
+          pageHeight += rowTotalHeight;
           pageRowList[pageNo].push(row);
         }
       }
@@ -22392,6 +22417,7 @@ var Draw = class {
         surroundElementList,
         elementList: this.elementList
       });
+      this._applyRowSpacing();
       this.pageRowList = this._computePageList();
       this.position.computePositionList();
       this.area.compute();
@@ -23719,6 +23745,13 @@ var CommandAdapt = class {
         ]);
         curIndex = startIndex;
       }
+      const afterSepIndex = curIndex + 2;
+      if (elementList[afterSepIndex]?.value !== ZERO) {
+        this.draw.spliceElementList(elementList, afterSepIndex, 0, [
+          { value: ZERO }
+        ]);
+      }
+      curIndex = afterSepIndex - 1;
     }
     this.range.setRange(curIndex, curIndex);
     this.draw.render({ curIndex });