postext 1.23.0 → 1.25.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/__tests__/bundle/bitmapInfo.test.d.ts +2 -0
- package/dist/__tests__/bundle/bitmapInfo.test.d.ts.map +1 -0
- package/dist/__tests__/bundle/bitmapInfo.test.js +78 -0
- package/dist/__tests__/bundle/bitmapInfo.test.js.map +1 -0
- package/dist/__tests__/bundle/cjkRulesPin.test.d.ts +2 -0
- package/dist/__tests__/bundle/cjkRulesPin.test.d.ts.map +1 -0
- package/dist/__tests__/bundle/cjkRulesPin.test.js +78 -0
- package/dist/__tests__/bundle/cjkRulesPin.test.js.map +1 -0
- package/dist/__tests__/bundle/designOverflowPin.test.d.ts +2 -0
- package/dist/__tests__/bundle/designOverflowPin.test.d.ts.map +1 -0
- package/dist/__tests__/bundle/designOverflowPin.test.js +89 -0
- package/dist/__tests__/bundle/designOverflowPin.test.js.map +1 -0
- package/dist/__tests__/bundle/flowColumnsPin.test.d.ts +2 -0
- package/dist/__tests__/bundle/flowColumnsPin.test.d.ts.map +1 -0
- package/dist/__tests__/bundle/flowColumnsPin.test.js +40 -0
- package/dist/__tests__/bundle/flowColumnsPin.test.js.map +1 -0
- package/dist/__tests__/bundle/gridBalancingPin.test.d.ts +2 -0
- package/dist/__tests__/bundle/gridBalancingPin.test.d.ts.map +1 -0
- package/dist/__tests__/bundle/gridBalancingPin.test.js +53 -0
- package/dist/__tests__/bundle/gridBalancingPin.test.js.map +1 -0
- package/dist/__tests__/bundle/inlineTableSplitPin.test.d.ts +2 -0
- package/dist/__tests__/bundle/inlineTableSplitPin.test.d.ts.map +1 -0
- package/dist/__tests__/bundle/inlineTableSplitPin.test.js +43 -0
- package/dist/__tests__/bundle/inlineTableSplitPin.test.js.map +1 -0
- package/dist/__tests__/bundle/openerHeadFloatsPin.test.d.ts +2 -0
- package/dist/__tests__/bundle/openerHeadFloatsPin.test.d.ts.map +1 -0
- package/dist/__tests__/bundle/openerHeadFloatsPin.test.js +50 -0
- package/dist/__tests__/bundle/openerHeadFloatsPin.test.js.map +1 -0
- package/dist/__tests__/bundle.test.js +11 -1
- package/dist/__tests__/bundle.test.js.map +1 -1
- package/dist/__tests__/cjk/annotationsRender.test.js +5 -2
- package/dist/__tests__/cjk/annotationsRender.test.js.map +1 -1
- package/dist/__tests__/cjk/circledNumbers.test.d.ts +2 -0
- package/dist/__tests__/cjk/circledNumbers.test.d.ts.map +1 -0
- package/dist/__tests__/cjk/circledNumbers.test.js +83 -0
- package/dist/__tests__/cjk/circledNumbers.test.js.map +1 -0
- package/dist/__tests__/cjk/gridBalancing.test.d.ts +2 -0
- package/dist/__tests__/cjk/gridBalancing.test.d.ts.map +1 -0
- package/dist/__tests__/cjk/gridBalancing.test.js +227 -0
- package/dist/__tests__/cjk/gridBalancing.test.js.map +1 -0
- package/dist/__tests__/cjk/justifyRender.test.js +2 -1
- package/dist/__tests__/cjk/justifyRender.test.js.map +1 -1
- package/dist/__tests__/cjk/titleBreaks.test.d.ts +2 -0
- package/dist/__tests__/cjk/titleBreaks.test.d.ts.map +1 -0
- package/dist/__tests__/cjk/titleBreaks.test.js +76 -0
- package/dist/__tests__/cjk/titleBreaks.test.js.map +1 -0
- package/dist/__tests__/cjk/wordJoiner.test.js +13 -4
- package/dist/__tests__/cjk/wordJoiner.test.js.map +1 -1
- package/dist/__tests__/codeBlocks.test.js +1 -1
- package/dist/__tests__/codeBlocks.test.js.map +1 -1
- package/dist/__tests__/design/cjkDesignText.test.d.ts +2 -0
- package/dist/__tests__/design/cjkDesignText.test.d.ts.map +1 -0
- package/dist/__tests__/design/cjkDesignText.test.js +130 -0
- package/dist/__tests__/design/cjkDesignText.test.js.map +1 -0
- package/dist/__tests__/design/cjkDesignTextRender.test.d.ts +2 -0
- package/dist/__tests__/design/cjkDesignTextRender.test.d.ts.map +1 -0
- package/dist/__tests__/design/cjkDesignTextRender.test.js +100 -0
- package/dist/__tests__/design/cjkDesignTextRender.test.js.map +1 -0
- package/dist/__tests__/design/designTextOverflow.test.d.ts +2 -0
- package/dist/__tests__/design/designTextOverflow.test.d.ts.map +1 -0
- package/dist/__tests__/design/designTextOverflow.test.js +102 -0
- package/dist/__tests__/design/designTextOverflow.test.js.map +1 -0
- package/dist/__tests__/exports.test.js +60 -0
- package/dist/__tests__/exports.test.js.map +1 -1
- package/dist/__tests__/frontmatterInvalid.test.d.ts +2 -0
- package/dist/__tests__/frontmatterInvalid.test.d.ts.map +1 -0
- package/dist/__tests__/frontmatterInvalid.test.js +101 -0
- package/dist/__tests__/frontmatterInvalid.test.js.map +1 -0
- package/dist/__tests__/hardBreaks.test.js +1 -1
- package/dist/__tests__/hardBreaks.test.js.map +1 -1
- package/dist/__tests__/headingFirstLineIndent.test.d.ts +2 -0
- package/dist/__tests__/headingFirstLineIndent.test.d.ts.map +1 -0
- package/dist/__tests__/headingFirstLineIndent.test.js +185 -0
- package/dist/__tests__/headingFirstLineIndent.test.js.map +1 -0
- package/dist/__tests__/headingInlineMarks.test.js +1 -1
- package/dist/__tests__/headingInlineMarks.test.js.map +1 -1
- package/dist/__tests__/headingLetterSpacing.test.js +1 -1
- package/dist/__tests__/headingLetterSpacing.test.js.map +1 -1
- package/dist/__tests__/headingNumberSpans.test.d.ts +2 -0
- package/dist/__tests__/headingNumberSpans.test.d.ts.map +1 -0
- package/dist/__tests__/headingNumberSpans.test.js +96 -0
- package/dist/__tests__/headingNumberSpans.test.js.map +1 -0
- package/dist/__tests__/mathSizeMigration.test.js +2 -2
- package/dist/__tests__/mathSizeMigration.test.js.map +1 -1
- package/dist/__tests__/multipleColumns.test.js +207 -0
- package/dist/__tests__/multipleColumns.test.js.map +1 -1
- package/dist/__tests__/parse/citations.test.js +29 -0
- package/dist/__tests__/parse/citations.test.js.map +1 -1
- package/dist/__tests__/pipeline/bitmapResolution.test.d.ts +2 -0
- package/dist/__tests__/pipeline/bitmapResolution.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/bitmapResolution.test.js +139 -0
- package/dist/__tests__/pipeline/bitmapResolution.test.js.map +1 -0
- package/dist/__tests__/pipeline/calloutInlineResourceGap.test.js +10 -6
- package/dist/__tests__/pipeline/calloutInlineResourceGap.test.js.map +1 -1
- package/dist/__tests__/pipeline/calloutOverflow.test.js +4 -2
- package/dist/__tests__/pipeline/calloutOverflow.test.js.map +1 -1
- package/dist/__tests__/pipeline/calloutSplitMinLinesChild.test.js +1 -1
- package/dist/__tests__/pipeline/calloutSplitMinLinesChild.test.js.map +1 -1
- package/dist/__tests__/pipeline/calloutTallKeepTogether.test.js +6 -5
- package/dist/__tests__/pipeline/calloutTallKeepTogether.test.js.map +1 -1
- package/dist/__tests__/pipeline/colonListRoom.test.js +1 -1
- package/dist/__tests__/pipeline/colonListRoom.test.js.map +1 -1
- package/dist/__tests__/pipeline/compoundBreaks.test.js +1 -1
- package/dist/__tests__/pipeline/compoundBreaks.test.js.map +1 -1
- package/dist/__tests__/pipeline/dashBreaks.test.js +1 -1
- package/dist/__tests__/pipeline/dashBreaks.test.js.map +1 -1
- package/dist/__tests__/pipeline/designTextTruncated.test.d.ts +2 -0
- package/dist/__tests__/pipeline/designTextTruncated.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/designTextTruncated.test.js +116 -0
- package/dist/__tests__/pipeline/designTextTruncated.test.js.map +1 -0
- package/dist/__tests__/pipeline/floatCitingPage.test.d.ts +2 -0
- package/dist/__tests__/pipeline/floatCitingPage.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/floatCitingPage.test.js +241 -0
- package/dist/__tests__/pipeline/floatCitingPage.test.js.map +1 -0
- package/dist/__tests__/pipeline/floatOverInlineResource.test.js +18 -6
- package/dist/__tests__/pipeline/floatOverInlineResource.test.js.map +1 -1
- package/dist/__tests__/pipeline/floatPlacement.test.js +3 -3
- package/dist/__tests__/pipeline/floatPlacement.test.js.map +1 -1
- package/dist/__tests__/pipeline/floatShrink.test.d.ts +2 -0
- package/dist/__tests__/pipeline/floatShrink.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/floatShrink.test.js +298 -0
- package/dist/__tests__/pipeline/floatShrink.test.js.map +1 -0
- package/dist/__tests__/pipeline/flowColumns.test.d.ts +2 -0
- package/dist/__tests__/pipeline/flowColumns.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/flowColumns.test.js +261 -0
- package/dist/__tests__/pipeline/flowColumns.test.js.map +1 -0
- package/dist/__tests__/pipeline/headingKeepFitEps.test.d.ts +2 -0
- package/dist/__tests__/pipeline/headingKeepFitEps.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/headingKeepFitEps.test.js +83 -0
- package/dist/__tests__/pipeline/headingKeepFitEps.test.js.map +1 -0
- package/dist/__tests__/pipeline/headingSplitOrphans.test.js +1 -1
- package/dist/__tests__/pipeline/headingSplitOrphans.test.js.map +1 -1
- package/dist/__tests__/pipeline/inlineFigureSpace.test.js +1 -1
- package/dist/__tests__/pipeline/inlineFigureSpace.test.js.map +1 -1
- package/dist/__tests__/pipeline/inlineTableSplit.test.d.ts +2 -0
- package/dist/__tests__/pipeline/inlineTableSplit.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/inlineTableSplit.test.js +238 -0
- package/dist/__tests__/pipeline/inlineTableSplit.test.js.map +1 -0
- package/dist/__tests__/pipeline/paragraphContainerTail.test.js +1 -1
- package/dist/__tests__/pipeline/paragraphContainerTail.test.js.map +1 -1
- package/dist/__tests__/pipeline/raggedOptimal.test.js +1 -1
- package/dist/__tests__/pipeline/raggedOptimal.test.js.map +1 -1
- package/dist/__tests__/pipeline/resolvedPaletteCopy.test.js +3 -2
- package/dist/__tests__/pipeline/resolvedPaletteCopy.test.js.map +1 -1
- package/dist/__tests__/pipeline/sideBoxAfterText.test.d.ts +2 -0
- package/dist/__tests__/pipeline/sideBoxAfterText.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/sideBoxAfterText.test.js +163 -0
- package/dist/__tests__/pipeline/sideBoxAfterText.test.js.map +1 -0
- package/dist/__tests__/pipeline/textWrap.test.d.ts +2 -0
- package/dist/__tests__/pipeline/textWrap.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/textWrap.test.js +453 -0
- package/dist/__tests__/pipeline/textWrap.test.js.map +1 -0
- package/dist/__tests__/preflight.test.js +30 -1
- package/dist/__tests__/preflight.test.js.map +1 -1
- package/dist/__tests__/prepareFonts.test.d.ts +2 -0
- package/dist/__tests__/prepareFonts.test.d.ts.map +1 -0
- package/dist/__tests__/prepareFonts.test.js +358 -0
- package/dist/__tests__/prepareFonts.test.js.map +1 -0
- package/dist/__tests__/presets/showcaseDesignOverflow.test.d.ts +2 -0
- package/dist/__tests__/presets/showcaseDesignOverflow.test.d.ts.map +1 -0
- package/dist/__tests__/presets/showcaseDesignOverflow.test.js +58 -0
- package/dist/__tests__/presets/showcaseDesignOverflow.test.js.map +1 -0
- package/dist/__tests__/svgFonts.test.d.ts +2 -0
- package/dist/__tests__/svgFonts.test.d.ts.map +1 -0
- package/dist/__tests__/svgFonts.test.js +286 -0
- package/dist/__tests__/svgFonts.test.js.map +1 -0
- package/dist/__tests__/table/booktabs.test.d.ts +2 -0
- package/dist/__tests__/table/booktabs.test.d.ts.map +1 -0
- package/dist/__tests__/table/booktabs.test.js +290 -0
- package/dist/__tests__/table/booktabs.test.js.map +1 -0
- package/dist/__tests__/textWrapMeasure.test.d.ts +2 -0
- package/dist/__tests__/textWrapMeasure.test.d.ts.map +1 -0
- package/dist/__tests__/textWrapMeasure.test.js +162 -0
- package/dist/__tests__/textWrapMeasure.test.js.map +1 -0
- package/dist/__tests__/verseLines.test.js +134 -4
- package/dist/__tests__/verseLines.test.js.map +1 -1
- package/dist/__tests__/vertical/measurePaint.test.js +16 -0
- package/dist/__tests__/vertical/measurePaint.test.js.map +1 -1
- package/dist/bitmapResolution.d.ts +42 -0
- package/dist/bitmapResolution.d.ts.map +1 -0
- package/dist/bitmapResolution.js +82 -0
- package/dist/bitmapResolution.js.map +1 -0
- package/dist/bundle/adapters.d.ts +31 -7
- package/dist/bundle/adapters.d.ts.map +1 -1
- package/dist/bundle/adapters.js +113 -34
- package/dist/bundle/adapters.js.map +1 -1
- package/dist/bundle/codec.d.ts +9 -2
- package/dist/bundle/codec.d.ts.map +1 -1
- package/dist/bundle/codec.js +25 -2
- package/dist/bundle/codec.js.map +1 -1
- package/dist/bundle/configVersion.d.ts +168 -10
- package/dist/bundle/configVersion.d.ts.map +1 -1
- package/dist/bundle/configVersion.js +414 -8
- package/dist/bundle/configVersion.js.map +1 -1
- package/dist/bundle/index.d.ts +5 -5
- package/dist/bundle/index.d.ts.map +1 -1
- package/dist/bundle/index.js +3 -3
- package/dist/bundle/index.js.map +1 -1
- package/dist/bundle/manifest.d.ts +12 -2
- package/dist/bundle/manifest.d.ts.map +1 -1
- package/dist/bundle/manifest.js +134 -7
- package/dist/bundle/manifest.js.map +1 -1
- package/dist/bundle/types.d.ts +32 -2
- package/dist/bundle/types.d.ts.map +1 -1
- package/dist/canvas-backend/blockRender.d.ts.map +1 -1
- package/dist/canvas-backend/blockRender.js +6 -4
- package/dist/canvas-backend/blockRender.js.map +1 -1
- package/dist/canvas-backend/headerFooter.d.ts.map +1 -1
- package/dist/canvas-backend/headerFooter.js +3 -1
- package/dist/canvas-backend/headerFooter.js.map +1 -1
- package/dist/canvas-backend/renderResourceBlock.d.ts.map +1 -1
- package/dist/canvas-backend/renderResourceBlock.js +15 -1
- package/dist/canvas-backend/renderResourceBlock.js.map +1 -1
- package/dist/columnRule.d.ts.map +1 -1
- package/dist/columnRule.js +5 -2
- package/dist/columnRule.js.map +1 -1
- package/dist/configWarnings.js +30 -3
- package/dist/configWarnings.js.map +1 -1
- package/dist/defaults/cjk.d.ts +2 -1
- package/dist/defaults/cjk.d.ts.map +1 -1
- package/dist/defaults/cjk.js +17 -1
- package/dist/defaults/cjk.js.map +1 -1
- package/dist/defaults/diagramStyle.d.ts.map +1 -1
- package/dist/defaults/diagramStyle.js +6 -0
- package/dist/defaults/diagramStyle.js.map +1 -1
- package/dist/defaults/headerFooter.d.ts +21 -6
- package/dist/defaults/headerFooter.d.ts.map +1 -1
- package/dist/defaults/headerFooter.js +37 -14
- package/dist/defaults/headerFooter.js.map +1 -1
- package/dist/defaults/headings.d.ts +5 -4
- package/dist/defaults/headings.d.ts.map +1 -1
- package/dist/defaults/headings.js +18 -4
- package/dist/defaults/headings.js.map +1 -1
- package/dist/defaults/index.d.ts +1 -1
- package/dist/defaults/index.d.ts.map +1 -1
- package/dist/defaults/index.js +1 -1
- package/dist/defaults/index.js.map +1 -1
- package/dist/defaults/layout.d.ts +35 -1
- package/dist/defaults/layout.d.ts.map +1 -1
- package/dist/defaults/layout.js +137 -1
- package/dist/defaults/layout.js.map +1 -1
- package/dist/defaults/parts.js +4 -4
- package/dist/defaults/parts.js.map +1 -1
- package/dist/defaults/tableStyle.d.ts.map +1 -1
- package/dist/defaults/tableStyle.js +50 -0
- package/dist/defaults/tableStyle.js.map +1 -1
- package/dist/defaults/toc.js +2 -2
- package/dist/defaults/verse.d.ts +2 -1
- package/dist/defaults/verse.d.ts.map +1 -1
- package/dist/defaults/verse.js +6 -1
- package/dist/defaults/verse.js.map +1 -1
- package/dist/design/cjkText.d.ts +34 -0
- package/dist/design/cjkText.d.ts.map +1 -0
- package/dist/design/cjkText.js +82 -0
- package/dist/design/cjkText.js.map +1 -0
- package/dist/design/layout.d.ts +15 -1
- package/dist/design/layout.d.ts.map +1 -1
- package/dist/design/layout.js +130 -8
- package/dist/design/layout.js.map +1 -1
- package/dist/design/richText.d.ts +24 -0
- package/dist/design/richText.d.ts.map +1 -1
- package/dist/design/richText.js +37 -1
- package/dist/design/richText.js.map +1 -1
- package/dist/fonts/buildWithFonts.d.ts +19 -0
- package/dist/fonts/buildWithFonts.d.ts.map +1 -0
- package/dist/fonts/buildWithFonts.js +16 -0
- package/dist/fonts/buildWithFonts.js.map +1 -0
- package/dist/fonts/faces.d.ts +88 -0
- package/dist/fonts/faces.d.ts.map +1 -0
- package/dist/fonts/faces.js +264 -0
- package/dist/fonts/faces.js.map +1 -0
- package/dist/fonts/fontSet.d.ts +34 -0
- package/dist/fonts/fontSet.d.ts.map +1 -0
- package/dist/fonts/fontSet.js +173 -0
- package/dist/fonts/fontSet.js.map +1 -0
- package/dist/fonts/prepare.d.ts +120 -0
- package/dist/fonts/prepare.d.ts.map +1 -0
- package/dist/fonts/prepare.js +375 -0
- package/dist/fonts/prepare.js.map +1 -0
- package/dist/frontmatter.d.ts +20 -0
- package/dist/frontmatter.d.ts.map +1 -1
- package/dist/frontmatter.js +69 -3
- package/dist/frontmatter.js.map +1 -1
- package/dist/html-backend.d.ts +17 -0
- package/dist/html-backend.d.ts.map +1 -1
- package/dist/html-backend.js +109 -7
- package/dist/html-backend.js.map +1 -1
- package/dist/index.d.ts +35 -10
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +23 -4
- package/dist/index.js.map +1 -1
- package/dist/measure/bidiLines.d.ts +4 -3
- package/dist/measure/bidiLines.d.ts.map +1 -1
- package/dist/measure/bidiLines.js +12 -7
- package/dist/measure/bidiLines.js.map +1 -1
- package/dist/measure/cache.d.ts.map +1 -1
- package/dist/measure/cache.js +32 -2
- package/dist/measure/cache.js.map +1 -1
- package/dist/measure/canvas.d.ts +15 -0
- package/dist/measure/canvas.d.ts.map +1 -1
- package/dist/measure/canvas.js +68 -4
- package/dist/measure/canvas.js.map +1 -1
- package/dist/measure/cjk.d.ts.map +1 -1
- package/dist/measure/cjk.js +4 -1
- package/dist/measure/cjk.js.map +1 -1
- package/dist/measure/cjkClasses.d.ts +17 -0
- package/dist/measure/cjkClasses.d.ts.map +1 -1
- package/dist/measure/cjkClasses.js +41 -1
- package/dist/measure/cjkClasses.js.map +1 -1
- package/dist/measure/cjkCompose.d.ts.map +1 -1
- package/dist/measure/cjkCompose.js +126 -10
- package/dist/measure/cjkCompose.js.map +1 -1
- package/dist/measure/cjkPunctuation.d.ts +18 -1
- package/dist/measure/cjkPunctuation.d.ts.map +1 -1
- package/dist/measure/cjkPunctuation.js +13 -1
- package/dist/measure/cjkPunctuation.js.map +1 -1
- package/dist/measure/font.d.ts +8 -0
- package/dist/measure/font.d.ts.map +1 -1
- package/dist/measure/font.js +13 -2
- package/dist/measure/font.js.map +1 -1
- package/dist/measure/fontString.d.ts +14 -0
- package/dist/measure/fontString.d.ts.map +1 -0
- package/dist/measure/fontString.js +55 -0
- package/dist/measure/fontString.js.map +1 -0
- package/dist/measure/hardBreaks.d.ts.map +1 -1
- package/dist/measure/hardBreaks.js +13 -1
- package/dist/measure/hardBreaks.js.map +1 -1
- package/dist/measure/index.d.ts +7 -4
- package/dist/measure/index.d.ts.map +1 -1
- package/dist/measure/index.js +7 -5
- package/dist/measure/index.js.map +1 -1
- package/dist/measure/plain.d.ts.map +1 -1
- package/dist/measure/plain.js +11 -7
- package/dist/measure/plain.js.map +1 -1
- package/dist/measure/rich.d.ts.map +1 -1
- package/dist/measure/rich.js +9 -6
- package/dist/measure/rich.js.map +1 -1
- package/dist/measure/types.d.ts +53 -3
- package/dist/measure/types.d.ts.map +1 -1
- package/dist/measure/types.js +67 -3
- package/dist/measure/types.js.map +1 -1
- package/dist/parse/citations.d.ts.map +1 -1
- package/dist/parse/citations.js +7 -3
- package/dist/parse/citations.js.map +1 -1
- package/dist/pipeline/build.d.ts +36 -0
- package/dist/pipeline/build.d.ts.map +1 -1
- package/dist/pipeline/build.js +1482 -153
- package/dist/pipeline/build.js.map +1 -1
- package/dist/pipeline/buildBlockKind.d.ts +5 -0
- package/dist/pipeline/buildBlockKind.d.ts.map +1 -1
- package/dist/pipeline/buildBlockKind.js +34 -7
- package/dist/pipeline/buildBlockKind.js.map +1 -1
- package/dist/pipeline/buildMeasurement.d.ts +6 -0
- package/dist/pipeline/buildMeasurement.d.ts.map +1 -1
- package/dist/pipeline/buildMeasurement.js +4 -3
- package/dist/pipeline/buildMeasurement.js.map +1 -1
- package/dist/pipeline/calloutLayout.d.ts +59 -0
- package/dist/pipeline/calloutLayout.d.ts.map +1 -1
- package/dist/pipeline/calloutLayout.js +287 -65
- package/dist/pipeline/calloutLayout.js.map +1 -1
- package/dist/pipeline/columnBalancing.d.ts +20 -0
- package/dist/pipeline/columnBalancing.d.ts.map +1 -1
- package/dist/pipeline/columnBalancing.js +27 -4
- package/dist/pipeline/columnBalancing.js.map +1 -1
- package/dist/pipeline/columnsGroup.d.ts +61 -0
- package/dist/pipeline/columnsGroup.d.ts.map +1 -0
- package/dist/pipeline/columnsGroup.js +88 -0
- package/dist/pipeline/columnsGroup.js.map +1 -0
- package/dist/pipeline/config.d.ts +28 -0
- package/dist/pipeline/config.d.ts.map +1 -1
- package/dist/pipeline/config.js +67 -8
- package/dist/pipeline/config.js.map +1 -1
- package/dist/pipeline/contentWarnings.d.ts +16 -0
- package/dist/pipeline/contentWarnings.d.ts.map +1 -1
- package/dist/pipeline/contentWarnings.js +141 -17
- package/dist/pipeline/contentWarnings.js.map +1 -1
- package/dist/pipeline/floatPlacement.d.ts +48 -4
- package/dist/pipeline/floatPlacement.d.ts.map +1 -1
- package/dist/pipeline/floatPlacement.js +43 -5
- package/dist/pipeline/floatPlacement.js.map +1 -1
- package/dist/pipeline/floatSlots.d.ts +16 -3
- package/dist/pipeline/floatSlots.d.ts.map +1 -1
- package/dist/pipeline/floatSlots.js +15 -6
- package/dist/pipeline/floatSlots.js.map +1 -1
- package/dist/pipeline/flowColumns.d.ts +41 -0
- package/dist/pipeline/flowColumns.d.ts.map +1 -0
- package/dist/pipeline/flowColumns.js +116 -0
- package/dist/pipeline/flowColumns.js.map +1 -0
- package/dist/pipeline/headerFooter.d.ts +4 -1
- package/dist/pipeline/headerFooter.d.ts.map +1 -1
- package/dist/pipeline/headerFooter.js +19 -5
- package/dist/pipeline/headerFooter.js.map +1 -1
- package/dist/pipeline/measureContentBlock.d.ts +20 -1
- package/dist/pipeline/measureContentBlock.d.ts.map +1 -1
- package/dist/pipeline/measureContentBlock.js +35 -11
- package/dist/pipeline/measureContentBlock.js.map +1 -1
- package/dist/pipeline/partPalette.d.ts +3 -0
- package/dist/pipeline/partPalette.d.ts.map +1 -1
- package/dist/pipeline/partPalette.js +5 -0
- package/dist/pipeline/partPalette.js.map +1 -1
- package/dist/pipeline/placement.d.ts +19 -0
- package/dist/pipeline/placement.d.ts.map +1 -1
- package/dist/pipeline/placement.js +12 -2
- package/dist/pipeline/placement.js.map +1 -1
- package/dist/pipeline/resourceLayout.d.ts +41 -0
- package/dist/pipeline/resourceLayout.d.ts.map +1 -1
- package/dist/pipeline/resourceLayout.js +148 -18
- package/dist/pipeline/resourceLayout.js.map +1 -1
- package/dist/pipeline/styles.d.ts.map +1 -1
- package/dist/pipeline/styles.js +8 -5
- package/dist/pipeline/styles.js.map +1 -1
- package/dist/pipeline/textWrap.d.ts +94 -0
- package/dist/pipeline/textWrap.d.ts.map +1 -0
- package/dist/pipeline/textWrap.js +188 -0
- package/dist/pipeline/textWrap.js.map +1 -0
- package/dist/pipeline/toc.d.ts.map +1 -1
- package/dist/pipeline/toc.js +6 -1
- package/dist/pipeline/toc.js.map +1 -1
- package/dist/pipeline/verseLines.d.ts +22 -2
- package/dist/pipeline/verseLines.d.ts.map +1 -1
- package/dist/pipeline/verseLines.js +52 -4
- package/dist/pipeline/verseLines.js.map +1 -1
- package/dist/preflight.d.ts +46 -1
- package/dist/preflight.d.ts.map +1 -1
- package/dist/preflight.js +42 -7
- package/dist/preflight.js.map +1 -1
- package/dist/svg/fontRegistry.d.ts +66 -0
- package/dist/svg/fontRegistry.d.ts.map +1 -0
- package/dist/svg/fontRegistry.js +294 -0
- package/dist/svg/fontRegistry.js.map +1 -0
- package/dist/svg/fonts.d.ts +140 -0
- package/dist/svg/fonts.d.ts.map +1 -0
- package/dist/svg/fonts.js +642 -0
- package/dist/svg/fonts.js.map +1 -0
- package/dist/svg/image.d.ts +44 -0
- package/dist/svg/image.d.ts.map +1 -0
- package/dist/svg/image.js +67 -0
- package/dist/svg/image.js.map +1 -0
- package/dist/table/booktabs.d.ts +37 -0
- package/dist/table/booktabs.d.ts.map +1 -0
- package/dist/table/booktabs.js +82 -0
- package/dist/table/booktabs.js.map +1 -0
- package/dist/types.d.ts +365 -10
- package/dist/types.d.ts.map +1 -1
- package/dist/util/stableHash.d.ts +20 -0
- package/dist/util/stableHash.d.ts.map +1 -0
- package/dist/util/stableHash.js +59 -0
- package/dist/util/stableHash.js.map +1 -0
- package/dist/vdt.d.ts +249 -9
- package/dist/vdt.d.ts.map +1 -1
- package/dist/vdt.js +3 -2
- package/dist/vdt.js.map +1 -1
- package/dist/word/index.d.ts +1 -1
- package/dist/word/index.d.ts.map +1 -1
- package/dist/word/index.js +1 -1
- package/dist/word/index.js.map +1 -1
- package/dist/word/toMarkdown.d.ts +10 -0
- package/dist/word/toMarkdown.d.ts.map +1 -1
- package/dist/word/toMarkdown.js +16 -1
- package/dist/word/toMarkdown.js.map +1 -1
- package/dist/worker/client.d.ts +8 -0
- package/dist/worker/client.d.ts.map +1 -1
- package/dist/worker/client.js +22 -0
- package/dist/worker/client.js.map +1 -1
- package/dist/worker/fonts.d.ts +1 -13
- package/dist/worker/fonts.d.ts.map +1 -1
- package/dist/worker/fonts.js +3 -61
- package/dist/worker/fonts.js.map +1 -1
- package/dist/worker/layout.worker.js +23 -16
- package/dist/worker/layout.worker.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,298 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { buildDocument } from '../../pipeline';
|
|
3
|
+
import { resolveLayoutConfig, stripLayoutDefaults } from '../../defaults/layout';
|
|
4
|
+
import { computeFloatPlan, resolveResourcePlacement } from '../../pipeline/floatPlacement';
|
|
5
|
+
import { layoutResourceBlock } from '../../pipeline/resourceLayout';
|
|
6
|
+
import { resolveAllConfig } from '../../pipeline/config';
|
|
7
|
+
import { parseMarkdown } from '../../parse';
|
|
8
|
+
// Deterministic text measurement stub (no DOM in the node test env).
|
|
9
|
+
class StubCtx {
|
|
10
|
+
font = '';
|
|
11
|
+
measureText(s) {
|
|
12
|
+
return { width: s.length * 7 };
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
globalThis.OffscreenCanvas = class {
|
|
16
|
+
getContext() {
|
|
17
|
+
return new StubCtx();
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
const px = (value) => ({ value, unit: 'px' });
|
|
21
|
+
/** A 600 × 400 px page, no margins, one column, a 24 px grid. */
|
|
22
|
+
const PAGE = {
|
|
23
|
+
page: { dpi: 144, width: px(600), height: px(400), margins: { top: px(0), bottom: px(0), left: px(0), right: px(0) } },
|
|
24
|
+
layout: { layoutType: 'single' },
|
|
25
|
+
headings: { balancing: { enabled: false }, levels: [{ level: 1, breakBefore: { enabled: false } }] },
|
|
26
|
+
};
|
|
27
|
+
const GRID = 24;
|
|
28
|
+
const withLayout = (layout, base = PAGE) => ({ ...base, layout: { ...base.layout, ...layout } });
|
|
29
|
+
const para = (i) => `Paragraph ${i} carries enough words to take a few lines of the column so the flow advances.`;
|
|
30
|
+
const filler = (n, from = 0) => Array.from({ length: n }, (_, i) => para(from + i)).join('\n\n');
|
|
31
|
+
const picture = (id, w, h, placement, more = {}) => ({
|
|
32
|
+
id, typeId: 'figure', kind: 'bitmap', caption: `Plate ${id}.`, createdAt: 0, updatedAt: 0,
|
|
33
|
+
bitmap: { fileId: `${id}.jpg`, format: 'jpeg', width: w, height: h },
|
|
34
|
+
...(placement ? { placement } : {}),
|
|
35
|
+
...more,
|
|
36
|
+
});
|
|
37
|
+
const floatsOf = (doc) => doc.pages.flatMap((p) => (p.floats ?? []).map((b) => ({ page: p.index, block: b, id: b.resourceBlock.resource.id })));
|
|
38
|
+
const floatOf = (doc, id) => floatsOf(doc).find((f) => f.id === id);
|
|
39
|
+
const bottom = (b) => b.bbox.y + b.bbox.height;
|
|
40
|
+
/** Every block of a page's columns and floats, as JSON: a fingerprint. */
|
|
41
|
+
const fingerprint = (doc) => JSON.stringify(doc.pages.map((p) => ({
|
|
42
|
+
floats: (p.floats ?? []).map((b) => [b.id, b.bbox, b.resourceBlock?.bodyRect, b.resourceBlock?.shrinkScale]),
|
|
43
|
+
columns: p.columns.map((c) => [c.bbox, c.blocks.map((b) => [b.id, b.bbox, b.lines.map((l) => [l.text, l.bbox.y])])]),
|
|
44
|
+
})));
|
|
45
|
+
/** Two paragraphs, then a citation of `w`, then text enough for two pages. */
|
|
46
|
+
const citedLate = (id) => `${para(1)}\n\n${para(2)} :ref{id="${id}"}\n\n${filler(14, 3)}`;
|
|
47
|
+
/** At the 600 px measure a 3000 × 1500 picture stands 300 px tall, with its
|
|
48
|
+
* caption 336 px: a page holds it, the room under two paragraphs does not. */
|
|
49
|
+
const WIDE = [3000, 1500];
|
|
50
|
+
/** A 3000 × 2000 picture stands 400 px tall at the measure (436 with its
|
|
51
|
+
* caption): taller than the page. */
|
|
52
|
+
const TALL = [3000, 2000];
|
|
53
|
+
describe('placement.shrink (#626)', () => {
|
|
54
|
+
it("'never' moves a float on to the next page, as before", () => {
|
|
55
|
+
const doc = buildDocument({ markdown: citedLate('w'), resources: [picture('w', ...WIDE, { shrink: 'never' })] }, PAGE);
|
|
56
|
+
const f = floatOf(doc, 'w');
|
|
57
|
+
expect(f.page).toBe(1);
|
|
58
|
+
expect(f.block.resourceBlock.shrinkScale).toBeUndefined();
|
|
59
|
+
expect(f.block.resourceBlock.bodyRect.width).toBeCloseTo(600, 3);
|
|
60
|
+
expect(doc.contentWarnings?.some((w) => w.kind === 'floatShrunk')).toBeFalsy();
|
|
61
|
+
});
|
|
62
|
+
it("'page' leaves a float that fits a fresh page at its size", () => {
|
|
63
|
+
const doc = buildDocument({ markdown: citedLate('w'), resources: [picture('w', ...WIDE, { shrink: 'page' })] }, PAGE);
|
|
64
|
+
const f = floatOf(doc, 'w');
|
|
65
|
+
expect(f.page).toBe(1);
|
|
66
|
+
expect(f.block.resourceBlock.shrinkScale).toBeUndefined();
|
|
67
|
+
});
|
|
68
|
+
it("'slot' scales a float to the room left on its page, caption included, the band on the grid", () => {
|
|
69
|
+
const doc = buildDocument({ markdown: citedLate('w'), resources: [picture('w', ...WIDE, { shrink: 'slot', minScale: 0.5 })] }, PAGE);
|
|
70
|
+
const f = floatOf(doc, 'w');
|
|
71
|
+
expect(f.page).toBe(0);
|
|
72
|
+
const rb = f.block.resourceBlock;
|
|
73
|
+
expect(rb.shrinkScale).toBeGreaterThan(0.5);
|
|
74
|
+
expect(rb.shrinkScale).toBeLessThan(1);
|
|
75
|
+
// Aspect kept.
|
|
76
|
+
expect(rb.bodyRect.height / rb.bodyRect.width).toBeCloseTo(0.5, 3);
|
|
77
|
+
// The whole float stays on the page; its caption's last baseline is on
|
|
78
|
+
// the grid (a bottom band), so the text above keeps its lines.
|
|
79
|
+
expect(bottom(f.block)).toBeLessThanOrEqual(400 + 0.01);
|
|
80
|
+
const last = rb.captionLines[rb.captionLines.length - 1];
|
|
81
|
+
expect(((last.baseline + 0.2 * GRID) / GRID) % 1).toBeCloseTo(0, 3);
|
|
82
|
+
const col = doc.pages[0].columns[0];
|
|
83
|
+
expect(bottom(col.blocks[col.blocks.length - 1])).toBeLessThanOrEqual(f.block.bbox.y + 0.01);
|
|
84
|
+
const warning = doc.contentWarnings?.find((w) => w.kind === 'floatShrunk');
|
|
85
|
+
expect(warning).toMatchObject({ kind: 'floatShrunk', resourceId: 'w', pageIndex: 0 });
|
|
86
|
+
expect(warning && 'overflowPx' in warning ? warning.overflowPx : undefined).toBeUndefined();
|
|
87
|
+
});
|
|
88
|
+
it("'slot' moves on when the room left needs less than minScale", () => {
|
|
89
|
+
const loose = buildDocument({ markdown: citedLate('w'), resources: [picture('w', ...WIDE, { shrink: 'slot', minScale: 0.5 })] }, PAGE);
|
|
90
|
+
const scale = floatOf(loose, 'w').block.resourceBlock.shrinkScale;
|
|
91
|
+
const strict = buildDocument({ markdown: citedLate('w'), resources: [picture('w', ...WIDE, { shrink: 'slot', minScale: scale + 0.05 })] }, PAGE);
|
|
92
|
+
const f = floatOf(strict, 'w');
|
|
93
|
+
expect(f.page).toBe(1);
|
|
94
|
+
expect(f.block.resourceBlock.shrinkScale).toBeUndefined();
|
|
95
|
+
});
|
|
96
|
+
it("'page' scales a float taller than a fresh page's band to that band", () => {
|
|
97
|
+
const never = buildDocument({ markdown: citedLate('t'), resources: [picture('t', ...TALL)] }, PAGE);
|
|
98
|
+
// Today: placed whole, running past the page.
|
|
99
|
+
expect(bottom(floatOf(never, 't').block)).toBeGreaterThan(400);
|
|
100
|
+
const doc = buildDocument({ markdown: citedLate('t'), resources: [picture('t', ...TALL, { shrink: 'page' })] }, PAGE);
|
|
101
|
+
const f = floatOf(doc, 't');
|
|
102
|
+
expect(f.page).toBe(1);
|
|
103
|
+
// A top band rounds up to the grid: 16 lines (384 px) hold the float
|
|
104
|
+
// and its gap.
|
|
105
|
+
expect(f.block.bbox.height).toBeCloseTo(16 * GRID - GRID, 3);
|
|
106
|
+
expect(f.block.resourceBlock.shrinkScale).toBeCloseTo(324 / 400, 3);
|
|
107
|
+
// The text under it starts on the grid.
|
|
108
|
+
const col = doc.pages[1].columns[0];
|
|
109
|
+
expect(col.bbox.y).toBeCloseTo(16 * GRID, 3);
|
|
110
|
+
});
|
|
111
|
+
it("'page' sets a float at minScale and lets it run past the band when even that does not fit", () => {
|
|
112
|
+
const doc = buildDocument({ markdown: citedLate('t'), resources: [picture('t', ...TALL, { shrink: 'page', minScale: 0.95 })] }, PAGE);
|
|
113
|
+
const f = floatOf(doc, 't');
|
|
114
|
+
expect(f.page).toBe(1);
|
|
115
|
+
expect(f.block.resourceBlock.shrinkScale).toBeCloseTo(0.95, 3);
|
|
116
|
+
expect(bottom(f.block)).toBeGreaterThan(400);
|
|
117
|
+
const warning = doc.contentWarnings?.find((w) => w.kind === 'floatShrunk');
|
|
118
|
+
expect(warning).toMatchObject({ kind: 'floatShrunk', resourceId: 't', scale: 0.95, pageIndex: 1 });
|
|
119
|
+
expect(warning && 'overflowPx' in warning ? warning.overflowPx : 0).toBeGreaterThan(0);
|
|
120
|
+
});
|
|
121
|
+
it('crops a picture within its safe area before it scales it', () => {
|
|
122
|
+
// The safe area is the middle half of the picture's height: cropping
|
|
123
|
+
// alone brings the body from 400 to 324 px, at full width.
|
|
124
|
+
const cropped = picture('t', ...TALL, { shrink: 'page' }, { safeArea: { x: 0, y: 0.25, width: 1, height: 0.5 } });
|
|
125
|
+
const doc = buildDocument({ markdown: citedLate('t'), resources: [cropped] }, PAGE);
|
|
126
|
+
const rb = floatOf(doc, 't').block.resourceBlock;
|
|
127
|
+
expect(rb.shrinkScale).toBeUndefined();
|
|
128
|
+
expect(rb.bodyRect.width).toBeCloseTo(600, 3);
|
|
129
|
+
expect(rb.bodyRect.height).toBeCloseTo(324, 3);
|
|
130
|
+
expect(rb.bodySource).toBeDefined();
|
|
131
|
+
// A narrow safe area runs out first: then the picture scales.
|
|
132
|
+
const tight = picture('t', ...TALL, { shrink: 'page' }, { safeArea: { x: 0, y: 0.1, width: 1, height: 0.85 } });
|
|
133
|
+
const rb2 = floatOf(buildDocument({ markdown: citedLate('t'), resources: [tight] }, PAGE), 't').block.resourceBlock;
|
|
134
|
+
expect(rb2.bodyRect.height).toBeCloseTo(324, 3);
|
|
135
|
+
// Cropped to the safe area's 340 px first, then scaled by 324 / 340.
|
|
136
|
+
expect(rb2.shrinkScale).toBeCloseTo(324 / 340, 3);
|
|
137
|
+
});
|
|
138
|
+
it("captionMeasure 'body' sets the caption at the picture's width, aligned with it", () => {
|
|
139
|
+
const caption = 'A long caption that runs across more than one line when it is set at the width of the shrunk picture rather than the page.';
|
|
140
|
+
const at = (captionMeasure, align) => floatOf(buildDocument({ markdown: citedLate('t'), resources: [picture('t', ...TALL, { shrink: 'page', align, captionMeasure }, { caption })] }, PAGE), 't').block.resourceBlock;
|
|
141
|
+
const slot = at('slot', 'center');
|
|
142
|
+
expect(Math.max(...slot.captionLines.map((l) => l.bbox.x + l.bbox.width))).toBeGreaterThan(slot.bodyRect.x + slot.bodyRect.width + 1);
|
|
143
|
+
const body = at('body', 'center');
|
|
144
|
+
expect(body.bodyRect.x).toBeGreaterThan(0);
|
|
145
|
+
for (const l of body.captionLines) {
|
|
146
|
+
expect(l.bbox.x).toBeGreaterThanOrEqual(body.bodyRect.x - 0.5);
|
|
147
|
+
expect(l.bbox.x + l.bbox.width).toBeLessThanOrEqual(body.bodyRect.x + body.bodyRect.width + 0.5);
|
|
148
|
+
}
|
|
149
|
+
// A taller caption leaves the picture less room.
|
|
150
|
+
expect(body.bodyRect.width).toBeLessThan(slot.bodyRect.width);
|
|
151
|
+
// Centred: the picture's centre is the slot's.
|
|
152
|
+
expect(body.bodyRect.x + body.bodyRect.width / 2).toBeCloseTo(300, 1);
|
|
153
|
+
});
|
|
154
|
+
it('two consecutive builds are identical', () => {
|
|
155
|
+
const resources = [picture('w', ...WIDE, { shrink: 'slot', minScale: 0.5 }), picture('t', ...TALL, { shrink: 'page' })];
|
|
156
|
+
const md = `${para(1)}\n\n${para(2)} :ref{id="w"}\n\n${filler(6, 3)} :ref{id="t"}\n\n${filler(12, 10)}`;
|
|
157
|
+
const config = { ...PAGE, layout: { layoutType: 'double' }, headings: { levels: [{ level: 1 }] } };
|
|
158
|
+
const a = buildDocument({ markdown: md, resources }, config);
|
|
159
|
+
const b = buildDocument({ markdown: md, resources }, config);
|
|
160
|
+
expect(fingerprint(a)).toBe(fingerprint(b));
|
|
161
|
+
});
|
|
162
|
+
});
|
|
163
|
+
describe('placement.shrink on multi-column pages (#626)', () => {
|
|
164
|
+
/** Three columns 180 px wide (30 px gutters) on a 600 × 400 page. */
|
|
165
|
+
const THREE = {
|
|
166
|
+
...PAGE,
|
|
167
|
+
layout: { layoutType: 'multiple', columnCount: 3, gutterWidth: px(30) },
|
|
168
|
+
};
|
|
169
|
+
const tallFor = (w) => [3000, Math.round(3000 * (440 / w))];
|
|
170
|
+
it('a column float shrinks to its column', () => {
|
|
171
|
+
const r = picture('c', ...tallFor(180), { shrink: 'page' });
|
|
172
|
+
const f = floatOf(buildDocument({ markdown: citedLate('c'), resources: [r] }, THREE), 'c');
|
|
173
|
+
expect(f.block.resourceBlock.shrinkScale).toBeLessThan(1);
|
|
174
|
+
expect(f.block.bbox.width).toBeCloseTo(180, 0);
|
|
175
|
+
expect(bottom(f.block)).toBeLessThanOrEqual(400 + 0.01);
|
|
176
|
+
});
|
|
177
|
+
it('a float across two columns shrinks to them', () => {
|
|
178
|
+
const r = picture('c', ...tallFor(390), { shrink: 'page', columns: 2 });
|
|
179
|
+
const f = floatOf(buildDocument({ markdown: citedLate('c'), resources: [r] }, THREE), 'c');
|
|
180
|
+
expect(f.block.resourceBlock.shrinkScale).toBeLessThan(1);
|
|
181
|
+
expect(f.block.bbox.width).toBeCloseTo(390, 0);
|
|
182
|
+
expect(bottom(f.block)).toBeLessThanOrEqual(400 + 0.01);
|
|
183
|
+
});
|
|
184
|
+
it('a page-span float shrinks to the page', () => {
|
|
185
|
+
const r = picture('c', ...tallFor(600), { shrink: 'page', span: 'page' });
|
|
186
|
+
const f = floatOf(buildDocument({ markdown: citedLate('c'), resources: [r] }, THREE), 'c');
|
|
187
|
+
expect(f.block.resourceBlock.shrinkScale).toBeLessThan(1);
|
|
188
|
+
expect(f.block.bbox.width).toBeCloseTo(600, 0);
|
|
189
|
+
expect(bottom(f.block)).toBeLessThanOrEqual(400 + 0.01);
|
|
190
|
+
});
|
|
191
|
+
it("a page-span float takes the band left under the text with 'slot', and the next page without", () => {
|
|
192
|
+
const md = `# Opening\n\n${para(1)} :ref{id="p"}\n\n${filler(20, 2)}`;
|
|
193
|
+
const config = { ...PAGE, layout: { layoutType: 'double' } };
|
|
194
|
+
// 300 px of picture and 36 of caption: it fits a fresh page, not the
|
|
195
|
+
// room under the head and the first paragraph.
|
|
196
|
+
const at = (shrink) => floatOf(buildDocument({ markdown: md, resources: [picture('p', ...WIDE, { span: 'page', shrink, minScale: 0.5 })] }, config), 'p');
|
|
197
|
+
expect(at('never').page).toBe(1);
|
|
198
|
+
expect(at('never').block.resourceBlock.shrinkScale).toBeUndefined();
|
|
199
|
+
expect(at('page').page).toBe(1);
|
|
200
|
+
expect(at('page').block.resourceBlock.shrinkScale).toBeUndefined();
|
|
201
|
+
const slot = at('slot');
|
|
202
|
+
expect(slot.page).toBe(0);
|
|
203
|
+
expect(slot.block.resourceBlock.shrinkScale).toBeLessThan(1);
|
|
204
|
+
expect(bottom(slot.block)).toBeLessThanOrEqual(400 + 0.01);
|
|
205
|
+
});
|
|
206
|
+
it("a side float shrinks to the side column's room below its citation with 'slot'", () => {
|
|
207
|
+
const config = { ...PAGE, layout: { layoutType: 'oneAndHalf', sideColumnRole: 'floats', sideColumnPercent: 40, gutterWidth: px(20) } };
|
|
208
|
+
const md = `${filler(4)} :ref{id="s"}\n\n${filler(16, 5)}`;
|
|
209
|
+
// As tall as the column at its width: it fits an empty side column, not
|
|
210
|
+
// the room under the citing line.
|
|
211
|
+
const at = (shrink) => {
|
|
212
|
+
const doc = buildDocument({ markdown: md, resources: [picture('s', 3000, 4400, { span: 'side', shrink, minScale: 0.3 })] }, config);
|
|
213
|
+
return { doc, f: floatOf(doc, 's') };
|
|
214
|
+
};
|
|
215
|
+
const never = at('never');
|
|
216
|
+
expect(never.f.page).toBe(1);
|
|
217
|
+
const slot = at('slot');
|
|
218
|
+
expect(slot.f.page).toBe(0);
|
|
219
|
+
expect(slot.f.block.resourceBlock.shrinkScale).toBeLessThan(1);
|
|
220
|
+
expect(bottom(slot.f.block)).toBeLessThanOrEqual(400 + 0.01);
|
|
221
|
+
});
|
|
222
|
+
it('a rotated float ignores shrink', () => {
|
|
223
|
+
const r = picture('r', 3000, 2000, { rotate: 'ccw', shrink: 'slot', minScale: 0.2 });
|
|
224
|
+
const plan = resolveResourcePlacement(r, undefined);
|
|
225
|
+
expect(plan.shrink).toBe('never');
|
|
226
|
+
const doc = buildDocument({ markdown: citedLate('r'), resources: [r] }, PAGE);
|
|
227
|
+
expect(floatOf(doc, 'r').block.resourceBlock.shrinkScale).toBeUndefined();
|
|
228
|
+
});
|
|
229
|
+
});
|
|
230
|
+
describe('placement.shrink resolution (#626)', () => {
|
|
231
|
+
const type = {
|
|
232
|
+
id: 'figure', name: 'Figure', shortLabel: 'Fig.', numberingTemplate: '{n}', resetOn: 'never',
|
|
233
|
+
counterFormat: 'decimal', captionPrefix: 'Figure', defaultPlacement: { shrink: 'page', minScale: 0.6 },
|
|
234
|
+
};
|
|
235
|
+
it('reads the resource, then its type, then layout.floatShrink', () => {
|
|
236
|
+
const plain = picture('a', 10, 10);
|
|
237
|
+
expect(resolveResourcePlacement(plain, undefined)).toMatchObject({ shrink: 'never', minScale: 0.7 });
|
|
238
|
+
expect(resolveResourcePlacement(plain, undefined, false, { mode: 'slot', minScale: 0.4 })).toMatchObject({ shrink: 'slot', minScale: 0.4 });
|
|
239
|
+
expect(resolveResourcePlacement(plain, type, false, { mode: 'slot', minScale: 0.4 })).toMatchObject({ shrink: 'page', minScale: 0.6 });
|
|
240
|
+
expect(resolveResourcePlacement(picture('a', 10, 10, { shrink: 'never', minScale: 0.9 }), type)).toMatchObject({ shrink: 'never', minScale: 0.9 });
|
|
241
|
+
// Out-of-range or misspelt values fall through.
|
|
242
|
+
expect(resolveResourcePlacement(picture('a', 10, 10, { shrink: 'always', minScale: 2 }), type)).toMatchObject({ shrink: 'page', minScale: 0.6 });
|
|
243
|
+
});
|
|
244
|
+
it('applies to pictures only, never inline embeds or tables', () => {
|
|
245
|
+
const table = { id: 'tb', typeId: 'figure', kind: 'table', createdAt: 0, updatedAt: 0, table: { model: { rows: [[{ content: 'x' }]] } } };
|
|
246
|
+
expect(resolveResourcePlacement(table, type).shrink).toBe('never');
|
|
247
|
+
expect(resolveResourcePlacement(picture('a', 10, 10, { position: 'here' }), type).shrink).toBe('never');
|
|
248
|
+
const video = { id: 'v', typeId: 'figure', kind: 'video', createdAt: 0, updatedAt: 0, video: { source: 'file', url: 'x.mp4' } };
|
|
249
|
+
expect(resolveResourcePlacement(video, type).shrink).toBe('page');
|
|
250
|
+
});
|
|
251
|
+
it('carries shrink into the float plan only when set', () => {
|
|
252
|
+
const blocks = parseMarkdown('Text :ref{id="a"} and :ref{id="b"}.');
|
|
253
|
+
const plan = computeFloatPlan(blocks, [picture('a', 10, 10), picture('b', 10, 10, { shrink: 'slot' })], [], undefined, false);
|
|
254
|
+
expect(plan[0]).not.toHaveProperty('shrink');
|
|
255
|
+
expect(plan[1]).toMatchObject({ shrink: 'slot', minScale: 0.7 });
|
|
256
|
+
const byDefault = computeFloatPlan(blocks, [picture('a', 10, 10)], [], undefined, false, { mode: 'page', minScale: 0.5 });
|
|
257
|
+
expect(byDefault[0]).toMatchObject({ shrink: 'page', minScale: 0.5 });
|
|
258
|
+
});
|
|
259
|
+
it('layout.floatShrink resolves and strips like the other layout keys', () => {
|
|
260
|
+
expect(resolveLayoutConfig().floatShrink).toEqual({ mode: 'never', minScale: 0.7 });
|
|
261
|
+
expect(resolveLayoutConfig({ floatShrink: { mode: 'page' } }).floatShrink).toEqual({ mode: 'page', minScale: 0.7 });
|
|
262
|
+
expect(resolveLayoutConfig({ floatShrink: { mode: 'bogus', minScale: 0 } }).floatShrink).toEqual({ mode: 'never', minScale: 0.7 });
|
|
263
|
+
expect(stripLayoutDefaults({ floatShrink: { mode: 'never', minScale: 0.7 } })).toBeUndefined();
|
|
264
|
+
expect(stripLayoutDefaults({ floatShrink: { mode: 'slot', minScale: 0.7 } })).toEqual({ floatShrink: { mode: 'slot' } });
|
|
265
|
+
});
|
|
266
|
+
it('layout.floatShrink applies to every picture float', () => {
|
|
267
|
+
const doc = buildDocument({ markdown: citedLate('w'), resources: [picture('w', ...WIDE)] }, withLayout({ floatShrink: { mode: 'slot', minScale: 0.5 } }));
|
|
268
|
+
expect(floatOf(doc, 'w').page).toBe(0);
|
|
269
|
+
expect(floatOf(doc, 'w').block.resourceBlock.shrinkScale).toBeLessThan(1);
|
|
270
|
+
});
|
|
271
|
+
});
|
|
272
|
+
describe('layoutResourceBlock maxBodyHeight (#626)', () => {
|
|
273
|
+
const resolved = resolveAllConfig(PAGE);
|
|
274
|
+
const lay = (resource, more = {}) => layoutResourceBlock({
|
|
275
|
+
resource, resourceType: undefined, number: '1', resolved, columnWidth: 600,
|
|
276
|
+
resourceNumbering: {}, resourceTypes: [], resources: [resource], ...more,
|
|
277
|
+
});
|
|
278
|
+
it('scales the body to the cap, never below minBodyScale, and records the scale', () => {
|
|
279
|
+
const r = picture('t', ...TALL);
|
|
280
|
+
expect(lay(r).block.shrinkScale).toBeUndefined();
|
|
281
|
+
const capped = lay(r, { maxBodyHeight: 200 });
|
|
282
|
+
expect(capped.block.bodyRect.height).toBeCloseTo(200, 3);
|
|
283
|
+
expect(capped.block.bodyRect.width).toBeCloseTo(300, 3);
|
|
284
|
+
expect(capped.block.shrinkScale).toBeCloseTo(0.5, 3);
|
|
285
|
+
const floor = lay(r, { maxBodyHeight: 200, minBodyScale: 0.8 });
|
|
286
|
+
expect(floor.block.bodyRect.height).toBeCloseTo(320, 3);
|
|
287
|
+
expect(floor.block.shrinkScale).toBeCloseTo(0.8, 3);
|
|
288
|
+
// A cap the body already fits leaves it alone.
|
|
289
|
+
expect(lay(r, { maxBodyHeight: 500 }).block.shrinkScale).toBeUndefined();
|
|
290
|
+
});
|
|
291
|
+
it('keeps the balancing lever from growing a capped picture past its room', () => {
|
|
292
|
+
const r = picture('t', ...TALL, undefined, { safeArea: { x: 0, y: 0.25, width: 1, height: 0.5 } });
|
|
293
|
+
const capped = lay(r, { maxBodyHeight: 300, bodyHeightDelta: 80 });
|
|
294
|
+
expect(capped.block.bodyRect.height).toBeCloseTo(300, 3);
|
|
295
|
+
expect(capped.block.bodyFlex?.grow ?? 0).toBeCloseTo(0, 3);
|
|
296
|
+
});
|
|
297
|
+
});
|
|
298
|
+
//# sourceMappingURL=floatShrink.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"floatShrink.test.js","sourceRoot":"","sources":["../../../src/__tests__/pipeline/floatShrink.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flowColumns.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/pipeline/flowColumns.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,261 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { buildDocument } from '../../pipeline';
|
|
3
|
+
import { fillGalley, galleyBreaks, minFillHeight } from '../../pipeline/columnsGroup';
|
|
4
|
+
import { wrapFlowColumns, FLOW_COLUMNS_STYLE_ID, FLOW_COLUMNS_PAGE_STYLE_ID } from '../../pipeline/flowColumns';
|
|
5
|
+
import { parseMarkdown } from '../../parse';
|
|
6
|
+
import { computeOutlineFor, outlineFromDoc } from '../../pipeline/outline';
|
|
7
|
+
// `:::columns` in the running text, and groups that split (#634).
|
|
8
|
+
// Deterministic text measurement stub (no DOM in the node test env).
|
|
9
|
+
class StubCtx {
|
|
10
|
+
font = '';
|
|
11
|
+
measureText(s) {
|
|
12
|
+
return { width: s.length * 7 };
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
globalThis.OffscreenCanvas = class {
|
|
16
|
+
getContext() {
|
|
17
|
+
return new StubCtx();
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
const pt = (value) => ({ value, unit: 'pt' });
|
|
21
|
+
const page = (layoutType, height = 300) => ({
|
|
22
|
+
page: { width: pt(400), height: pt(height), margins: { top: pt(20), bottom: pt(20), left: pt(20), right: pt(20) } },
|
|
23
|
+
layout: { layoutType, gutterWidth: pt(12) },
|
|
24
|
+
bodyText: { fontSize: pt(10), lineHeight: pt(13) },
|
|
25
|
+
headings: { balancing: { enabled: false }, levels: [{ level: 1, breakBefore: { enabled: false } }] },
|
|
26
|
+
header: { elements: [] },
|
|
27
|
+
footer: { elements: [] },
|
|
28
|
+
});
|
|
29
|
+
const item = (i) => `Item ${i} has a few words so that it takes two or three lines in a narrow sub-column of the group.`;
|
|
30
|
+
const items = (n, from = 0) => Array.from({ length: n }, (_, i) => item(from + i)).join('\n\n');
|
|
31
|
+
const build = (markdown, config) => buildDocument({ markdown }, config);
|
|
32
|
+
const textBlocks = (doc) => doc.pages.flatMap((p) => p.columns.flatMap((c) => c.blocks.filter((b) => b.type !== 'callout').map((block) => ({ page: p.index, block }))));
|
|
33
|
+
const frames = (doc) => doc.pages.flatMap((p) => p.columns.flatMap((c) => c.blocks.filter((b) => b.type === 'callout').map((block) => ({ page: p.index, block }))));
|
|
34
|
+
const lefts = (blocks) => [...new Set(blocks.map((b) => Math.round(b.bbox.x)))].sort((a, b) => a - b);
|
|
35
|
+
const bottomOf = (blocks) => Math.max(...blocks.map((b) => b.bbox.y + b.bbox.height));
|
|
36
|
+
const startsWith = (b, s) => (b.lines[0]?.text ?? '').startsWith(s);
|
|
37
|
+
describe('main-flow :::columns (#634)', () => {
|
|
38
|
+
it('sets its blocks in three balanced sub-columns across a single-column page', () => {
|
|
39
|
+
const doc = build(`Intro paragraph.\n\n:::columns{count=3}\n${items(6)}\n:::\n\nAfter the group.`, page('single'));
|
|
40
|
+
const all = textBlocks(doc).map((t) => t.block);
|
|
41
|
+
const group = all.filter((b) => startsWith(b, 'Item'));
|
|
42
|
+
expect(group).toHaveLength(6);
|
|
43
|
+
const xs = lefts(group);
|
|
44
|
+
expect(xs).toHaveLength(3);
|
|
45
|
+
const col = doc.pages[0].columns[0];
|
|
46
|
+
// Three sub-columns across the text width, a body line apart.
|
|
47
|
+
const width = group[0].bbox.width;
|
|
48
|
+
expect(width * 3 + 2 * (xs[1] - xs[0] - width)).toBeCloseTo(col.bbox.width, 0);
|
|
49
|
+
// Balanced: two items a column, columns level.
|
|
50
|
+
for (const x of xs)
|
|
51
|
+
expect(group.filter((b) => Math.round(b.bbox.x) === x)).toHaveLength(2);
|
|
52
|
+
// The text after the group follows it at the full measure.
|
|
53
|
+
const after = all.find((b) => startsWith(b, 'After'));
|
|
54
|
+
expect(after.bbox.y).toBeGreaterThanOrEqual(bottomOf(group) - 0.5);
|
|
55
|
+
expect(after.bbox.x).toBeCloseTo(col.bbox.x, 6);
|
|
56
|
+
// The group's frameless box carries no decoration.
|
|
57
|
+
const [frame] = frames(doc);
|
|
58
|
+
expect(frame.block.callout.styleId).toBe(FLOW_COLUMNS_STYLE_ID);
|
|
59
|
+
expect(frame.block.designOverlay.blocks).toEqual([]);
|
|
60
|
+
});
|
|
61
|
+
it('keeps the body typography: the same lines as a paragraph of the text at that width', () => {
|
|
62
|
+
const doc = build(`:::columns{count=2}\n${items(2)}\n:::`, page('single'));
|
|
63
|
+
const group = textBlocks(doc).map((t) => t.block);
|
|
64
|
+
const plain = build(items(1), { ...page('single'), page: { ...page('single').page, width: pt(400 / 2 + 20 - 6.5) } });
|
|
65
|
+
expect(group[0].fontString).toBe(textBlocks(plain)[0].block.fontString);
|
|
66
|
+
});
|
|
67
|
+
it('span="page" cuts a two-column page into a band of three columns, the text resuming in two', () => {
|
|
68
|
+
const md = `${items(2, 100)}\n\n:::columns{count=3 span="page"}\n${items(6)}\n:::\n\n${items(40, 200)}`;
|
|
69
|
+
const doc = build(md, page('double', 500));
|
|
70
|
+
const p0 = doc.pages[0];
|
|
71
|
+
const span = p0.columns.find((c) => c.kind === 'span');
|
|
72
|
+
expect(span).toBeDefined();
|
|
73
|
+
const group = span.blocks.filter((b) => b.type !== 'callout');
|
|
74
|
+
expect(lefts(group)).toHaveLength(3);
|
|
75
|
+
expect(span.blocks[0].callout.styleId).toBe(FLOW_COLUMNS_PAGE_STYLE_ID);
|
|
76
|
+
// Below the band, the text runs in two columns again.
|
|
77
|
+
const below = p0.columns.filter((c) => c.kind !== 'span' && c.bbox.y >= span.bbox.y + span.bbox.height - 0.5);
|
|
78
|
+
expect(below.length).toBe(2);
|
|
79
|
+
expect(below.every((c) => c.blocks.length > 0)).toBe(true);
|
|
80
|
+
});
|
|
81
|
+
it('a snake group taller than the room fills its sub-columns and goes on, the last part balanced', () => {
|
|
82
|
+
const doc = build(`Intro paragraph.\n\n:::columns{count=3}\n${items(60)}\n:::\n\nAfter the group.`, page('single'));
|
|
83
|
+
const fr = frames(doc);
|
|
84
|
+
expect(fr.length).toBeGreaterThan(1);
|
|
85
|
+
fr.forEach(({ block }, i) => {
|
|
86
|
+
expect(block.callout.part).toBe(i);
|
|
87
|
+
expect(block.callout.continued).toBe(i < fr.length - 1);
|
|
88
|
+
});
|
|
89
|
+
// Every item once, in reading order.
|
|
90
|
+
const texts = textBlocks(doc).map((t) => t.block).filter((b) => startsWith(b, 'Item')).map((b) => Number(b.lines[0].text.split(' ')[1]));
|
|
91
|
+
expect(texts).toEqual(Array.from({ length: 60 }, (_, i) => i));
|
|
92
|
+
// A fragment that goes on fills the page down to its foot (within a line).
|
|
93
|
+
const first = fr[0];
|
|
94
|
+
const col = doc.pages[first.page].columns[0];
|
|
95
|
+
expect(col.bbox.y + col.bbox.height - (first.block.bbox.y + first.block.bbox.height)).toBeLessThan(13 * 300 / 72 * 2);
|
|
96
|
+
// The last fragment's sub-columns are balanced: within two items.
|
|
97
|
+
const last = fr[fr.length - 1];
|
|
98
|
+
const lastBlocks = doc.pages[last.page].columns[0].blocks.filter((b) => b.containerId === last.block.containerId && b.type !== 'callout' && b.bbox.y >= last.block.bbox.y - 0.5);
|
|
99
|
+
const xs = lefts(lastBlocks);
|
|
100
|
+
expect(xs.length).toBe(3);
|
|
101
|
+
const heights = xs.map((x) => bottomOf(lastBlocks.filter((b) => Math.round(b.bbox.x) === x)));
|
|
102
|
+
expect(Math.max(...heights) - Math.min(...heights)).toBeLessThan(13 * 300 / 72 * 3);
|
|
103
|
+
// The text after the group follows its last part.
|
|
104
|
+
const after = textBlocks(doc).find((t) => startsWith(t.block, 'After'));
|
|
105
|
+
expect(after.page).toBe(last.page);
|
|
106
|
+
});
|
|
107
|
+
it('a parallel group (breaks) goes on stream by stream, each in its own sub-column, stanzas whole', () => {
|
|
108
|
+
const en = Array.from({ length: 14 }, (_, i) => `English stanza ${i} line one\\\nline two of the stanza\\\nline three ends it.`).join('\n\n');
|
|
109
|
+
const es = Array.from({ length: 14 }, (_, i) => `Estrofa ${i} verso uno\\\nverso dos de la estrofa\\\nverso tres la cierra.`).join('\n\n');
|
|
110
|
+
const doc = build(`Intro.\n\n:::columns{count=2 breaks="15"}\n${en}\n\n${es}\n:::\n\nAfter.`, page('single'));
|
|
111
|
+
const fr = frames(doc);
|
|
112
|
+
expect(fr.length).toBeGreaterThan(1);
|
|
113
|
+
for (const { page: pi, block: frame } of fr) {
|
|
114
|
+
const blocks = doc.pages[pi].columns[0].blocks.filter((b) => b.type !== 'callout' && b.containerId === frame.containerId && b.bbox.y >= frame.bbox.y - 0.5 && b.bbox.y < frame.bbox.y + frame.bbox.height);
|
|
115
|
+
const left = blocks.filter((b) => Math.round(b.bbox.x) === lefts(blocks)[0]);
|
|
116
|
+
const right = blocks.filter((b) => Math.round(b.bbox.x) !== lefts(blocks)[0]);
|
|
117
|
+
// The English stream on the left, the Spanish on the right, level.
|
|
118
|
+
expect(left.every((b) => startsWith(b, 'English'))).toBe(true);
|
|
119
|
+
expect(right.every((b) => startsWith(b, 'Estrofa'))).toBe(true);
|
|
120
|
+
expect(left.map((b) => b.lines[0].text.split(' ')[2])).toEqual(right.map((b) => b.lines[0].text.split(' ')[1]));
|
|
121
|
+
// Stanzas are never cut.
|
|
122
|
+
for (const b of blocks)
|
|
123
|
+
expect(b.lines).toHaveLength(3);
|
|
124
|
+
}
|
|
125
|
+
});
|
|
126
|
+
it('splits with a keepTogether: false box, a nested box inside it staying whole', () => {
|
|
127
|
+
const config = {
|
|
128
|
+
...page('single'),
|
|
129
|
+
calloutStyles: [
|
|
130
|
+
{ id: 'panel', keepTogether: false, title: 'Panel', backgroundEnabled: true },
|
|
131
|
+
{ id: 'inner', keepTogether: true, title: 'Inner' },
|
|
132
|
+
],
|
|
133
|
+
};
|
|
134
|
+
const nested = ':::callout{type="inner"}\nA nested box that never splits, with a line or two of its own text.\n:::';
|
|
135
|
+
const md = `:::callout{type="panel"}\n:::columns{count=2}\n${items(14)}\n\n${nested}\n\n${items(14, 14)}\n:::\n:::`;
|
|
136
|
+
const doc = build(md, config);
|
|
137
|
+
const outer = frames(doc).filter((f) => f.block.callout.styleId === 'panel');
|
|
138
|
+
expect(outer.length).toBeGreaterThan(1);
|
|
139
|
+
// The nested box sits whole in one fragment.
|
|
140
|
+
const inner = doc.blocks.filter((b) => b.type === 'callout' && b.callout?.styleId === 'inner');
|
|
141
|
+
expect(inner).toHaveLength(1);
|
|
142
|
+
const items28 = doc.blocks.filter((b) => b.type !== 'callout' && startsWith(b, 'Item')).map((b) => Number(b.lines[0].text.split(' ')[1]));
|
|
143
|
+
expect(items28).toEqual(Array.from({ length: 28 }, (_, i) => i));
|
|
144
|
+
});
|
|
145
|
+
it('headings inside a group take their numbers, outline entries and pages', () => {
|
|
146
|
+
const config = { ...page('single', 260), headings: { ...page('single').headings, levels: [{ level: 1, breakBefore: { enabled: false } }, { level: 2, numberingTemplate: '{h2}' }] } };
|
|
147
|
+
const md = `# Part\n\n:::columns{count=2}\n## First\n\n${items(40)}\n\n## Second\n\n${items(12, 40)}\n:::`;
|
|
148
|
+
const doc = build(md, config);
|
|
149
|
+
const heads = doc.blocks.filter((b) => b.type === 'heading' && b.headingLevel === 2);
|
|
150
|
+
expect(heads.map((h) => h.lines[0].text)).toEqual([expect.stringContaining('First'), expect.stringContaining('Second')]);
|
|
151
|
+
expect(heads[0].headingNumber).toBe(1);
|
|
152
|
+
expect(heads[1].headingNumber).toBe(2);
|
|
153
|
+
// The outline (and so a :::toc) points at the pages they landed on.
|
|
154
|
+
const outline = outlineFromDoc(doc, computeOutlineFor(parseMarkdown(md), config));
|
|
155
|
+
const entries = outline.filter((e) => e.kind !== 'part' && e.level === 2);
|
|
156
|
+
expect(entries.map((e) => e.pageIndex)).toEqual(heads.map((h) => h.pageIndex));
|
|
157
|
+
expect(heads[1].pageIndex).toBeGreaterThan(heads[0].pageIndex);
|
|
158
|
+
});
|
|
159
|
+
it('footnotes cited in a group go to the foot of the text column', () => {
|
|
160
|
+
const config = { ...page('single'), footnotes: { placement: 'column' } };
|
|
161
|
+
const md = `:::columns{count=2}\n${items(2)}\n\nA cited line[^n].\n:::\n\nAfter.\n\n[^n]: The note.`;
|
|
162
|
+
const doc = build(md, config);
|
|
163
|
+
const note = doc.blocks.find((b) => b.footnoteNote === 'n');
|
|
164
|
+
expect(note).toBeDefined();
|
|
165
|
+
const col = doc.pages[note.pageIndex].columns[note.columnIndex];
|
|
166
|
+
expect(note.bbox.x).toBeCloseTo(col.bbox.x, 6);
|
|
167
|
+
expect(note.pageIndex).toBe(0);
|
|
168
|
+
});
|
|
169
|
+
it('gap and rule: sub-columns that far apart, a rule down each gutter', () => {
|
|
170
|
+
const doc = build(`:::columns{count=3 gap=24pt rule}\n${items(6)}\n:::`, { ...page('single'), layout: { layoutType: 'single', columnRule: { color: { hex: '#ff0000', model: 'hex' }, lineWidth: pt(1) } } });
|
|
171
|
+
const group = textBlocks(doc).map((t) => t.block);
|
|
172
|
+
const xs = [...new Set(group.map((b) => b.bbox.x))].sort((a, b) => a - b);
|
|
173
|
+
const gapPx = 24 * (doc.config.page.dpi / 72);
|
|
174
|
+
expect(xs[1] - xs[0] - group[0].bbox.width).toBeCloseTo(gapPx, 3);
|
|
175
|
+
const rules = frames(doc)[0].block.designOverlay.blocks.filter((b) => b.kind === 'rule');
|
|
176
|
+
expect(rules).toHaveLength(2);
|
|
177
|
+
expect(rules.every((r) => r.kind === 'rule' && r.direction === 'vertical' && r.color === '#ff0000')).toBe(true);
|
|
178
|
+
});
|
|
179
|
+
it('layout.flowColumns: false ignores the fence outside a box, as postext 1.24 did', () => {
|
|
180
|
+
const md = `Intro.\n\n:::columns{count=3}\n${items(6)}\n:::\n\nAfter.`;
|
|
181
|
+
const doc = build(md, { ...page('single'), layout: { layoutType: 'single', flowColumns: false } });
|
|
182
|
+
expect(frames(doc)).toHaveLength(0);
|
|
183
|
+
expect(lefts(textBlocks(doc).map((t) => t.block))).toHaveLength(1);
|
|
184
|
+
});
|
|
185
|
+
it('a group in a box that fits lays out as before; one that does not is cut only under the new rules', () => {
|
|
186
|
+
const config = { ...page('single'), calloutStyles: [{ id: 'panel', keepTogether: false, title: 'Panel' }] };
|
|
187
|
+
const fits = `:::callout{type="panel"}\n:::columns{count=2}\n${items(6)}\n:::\n:::`;
|
|
188
|
+
const a = build(fits, config);
|
|
189
|
+
const b = build(fits, { ...config, layout: { layoutType: 'single', flowColumns: false } });
|
|
190
|
+
expect(JSON.stringify(a.pages)).toBe(JSON.stringify(b.pages));
|
|
191
|
+
const tall = `:::callout{type="panel"}\nOpening line of the box.\n\n:::columns{count=2}\n${items(40)}\n:::\n:::`;
|
|
192
|
+
const cut = build(tall, config);
|
|
193
|
+
const whole = build(tall, { ...config, layout: { layoutType: 'single', flowColumns: false } });
|
|
194
|
+
// Today: the box goes on over several pages, each fragment within its
|
|
195
|
+
// column.
|
|
196
|
+
expect(frames(cut).length).toBeGreaterThan(1);
|
|
197
|
+
for (const { page: pi, block } of frames(cut)) {
|
|
198
|
+
const col = cut.pages[pi].columns[0];
|
|
199
|
+
expect(block.bbox.y + block.bbox.height).toBeLessThanOrEqual(col.bbox.y + col.bbox.height + 0.5);
|
|
200
|
+
}
|
|
201
|
+
// 1.24: no cut inside the group, so the box is set whole, running past
|
|
202
|
+
// the page.
|
|
203
|
+
expect(frames(whole)).toHaveLength(1);
|
|
204
|
+
expect(whole.warnings?.some((w) => w.kind === 'calloutOverflow')).toBe(true);
|
|
205
|
+
});
|
|
206
|
+
it('builds twice to the same pages, balancing on', () => {
|
|
207
|
+
const config = { ...page('double'), headings: { balancing: { enabled: true }, levels: [{ level: 1, breakBefore: { enabled: false } }] } };
|
|
208
|
+
const md = `# Title\n\n${items(3, 100)}\n\n:::columns{count=2}\n${items(30)}\n:::\n\n${items(5, 200)}`;
|
|
209
|
+
expect(JSON.stringify(build(md, config).pages)).toBe(JSON.stringify(build(md, config).pages));
|
|
210
|
+
});
|
|
211
|
+
it('reports sub-columns narrower than six ems, and an unknown flow', () => {
|
|
212
|
+
const doc = build(`:::columns{count=6 flow=zigzag}\n${items(6)}\n:::`, { ...page('single'), page: { width: pt(200), height: pt(300), margins: { top: pt(20), bottom: pt(20), left: pt(20), right: pt(20) } } });
|
|
213
|
+
const kinds = (doc.contentWarnings ?? []).map((w) => w.kind);
|
|
214
|
+
expect(kinds).toContain('columnsTooNarrow');
|
|
215
|
+
expect(kinds).toContain('columnsFlowUnknown');
|
|
216
|
+
});
|
|
217
|
+
});
|
|
218
|
+
describe('wrapFlowColumns', () => {
|
|
219
|
+
it('boxes a group outside a box and leaves one inside a box alone', () => {
|
|
220
|
+
const blocks = parseMarkdown(':::columns{count=2 span="page"}\nA.\n:::\n\n:::callout\n:::columns{count=2}\nB.\n:::\n:::');
|
|
221
|
+
const out = wrapFlowColumns(blocks);
|
|
222
|
+
expect(out.wrapped).toBe(true);
|
|
223
|
+
const boxes = out.blocks.filter((b) => b.type === 'containerStart' && b.containerName === 'callout');
|
|
224
|
+
expect(boxes.map((b) => b.containerAttrs?.type)).toEqual([FLOW_COLUMNS_PAGE_STYLE_ID, undefined]);
|
|
225
|
+
expect(wrapFlowColumns(parseMarkdown('No groups.')).wrapped).toBe(false);
|
|
226
|
+
});
|
|
227
|
+
});
|
|
228
|
+
describe('galley fill', () => {
|
|
229
|
+
const galley = (heights, lines) => {
|
|
230
|
+
let y = 0;
|
|
231
|
+
return heights.map((h, i) => {
|
|
232
|
+
const it = { child: i, lineBase: 0, y, height: h, ...(lines ? { lineBottoms: Array.from({ length: h / lines }, (_, l) => (l + 1) * lines) } : {}) };
|
|
233
|
+
y += h;
|
|
234
|
+
return it;
|
|
235
|
+
});
|
|
236
|
+
};
|
|
237
|
+
it('fills the columns in turn and stops where the next item does not fit', () => {
|
|
238
|
+
const g = galley([30, 30, 30, 30, 30, 30]);
|
|
239
|
+
const b = galleyBreaks(g, 2);
|
|
240
|
+
const f = fillGalley(g, b, 2, 70);
|
|
241
|
+
expect(f.end).toBe(false);
|
|
242
|
+
expect(f.cuts.map((j) => b[j].item)).toEqual([2, 4]);
|
|
243
|
+
expect(f.used).toBe(60);
|
|
244
|
+
expect(fillGalley(g, b, 3, 60).end).toBe(true);
|
|
245
|
+
});
|
|
246
|
+
it('cuts inside a text item, never leaving fewer than the minimum lines', () => {
|
|
247
|
+
const g = galley([100], 10);
|
|
248
|
+
const b = galleyBreaks(g, 3);
|
|
249
|
+
expect(b.map((x) => x.line)).toEqual([3, 4, 5, 6, 7]);
|
|
250
|
+
const f = fillGalley(g, b, 2, 25);
|
|
251
|
+
expect(f.end).toBe(false);
|
|
252
|
+
expect(f.cuts).toHaveLength(0);
|
|
253
|
+
});
|
|
254
|
+
it('finds the lowest height that holds the galley', () => {
|
|
255
|
+
const g = galley([30, 30, 30, 30], 10);
|
|
256
|
+
const b = galleyBreaks(g, 1);
|
|
257
|
+
expect(minFillHeight(g, b, 2)).toBeCloseTo(60, 1);
|
|
258
|
+
expect(minFillHeight(g, b, 3)).toBeCloseTo(40, 1);
|
|
259
|
+
});
|
|
260
|
+
});
|
|
261
|
+
//# sourceMappingURL=flowColumns.test.js.map
|