postext 1.72.0 → 1.73.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/README.md +1 -1
- package/dist/__tests__/exports.test.js +6 -0
- package/dist/__tests__/exports.test.js.map +1 -1
- package/dist/__tests__/fonts/symbolFont.test.d.ts +2 -0
- package/dist/__tests__/fonts/symbolFont.test.d.ts.map +1 -0
- package/dist/__tests__/fonts/symbolFont.test.js +74 -0
- package/dist/__tests__/fonts/symbolFont.test.js.map +1 -0
- package/dist/__tests__/fonts/symbolFontScope.test.d.ts +2 -0
- package/dist/__tests__/fonts/symbolFontScope.test.d.ts.map +1 -0
- package/dist/__tests__/fonts/symbolFontScope.test.js +140 -0
- package/dist/__tests__/fonts/symbolFontScope.test.js.map +1 -0
- package/dist/__tests__/knuthPlass/stacks.test.d.ts +2 -0
- package/dist/__tests__/knuthPlass/stacks.test.d.ts.map +1 -0
- package/dist/__tests__/knuthPlass/stacks.test.js +226 -0
- package/dist/__tests__/knuthPlass/stacks.test.js.map +1 -0
- package/dist/__tests__/knuthPlass/wasmLineBreaker.test.js +36 -1
- package/dist/__tests__/knuthPlass/wasmLineBreaker.test.js.map +1 -1
- package/dist/__tests__/knuthPlass/wasmSources.test.d.ts +2 -0
- package/dist/__tests__/knuthPlass/wasmSources.test.d.ts.map +1 -0
- package/dist/__tests__/knuthPlass/wasmSources.test.js +17 -0
- package/dist/__tests__/knuthPlass/wasmSources.test.js.map +1 -0
- package/dist/__tests__/pipeline/floats/floatPlacement.test.js +3 -3
- package/dist/__tests__/pipeline/floats/floatPlacement.test.js.map +1 -1
- package/dist/__tests__/pipeline/plates/fixture.d.ts +28 -0
- package/dist/__tests__/pipeline/plates/fixture.d.ts.map +1 -0
- package/dist/__tests__/pipeline/plates/fixture.js +57 -0
- package/dist/__tests__/pipeline/plates/fixture.js.map +1 -0
- package/dist/__tests__/pipeline/plates/lengthSlots.test.d.ts +2 -0
- package/dist/__tests__/pipeline/plates/lengthSlots.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/plates/lengthSlots.test.js +42 -0
- package/dist/__tests__/pipeline/plates/lengthSlots.test.js.map +1 -0
- package/dist/__tests__/pipeline/plates/placementLength.test.d.ts +2 -0
- package/dist/__tests__/pipeline/plates/placementLength.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/plates/placementLength.test.js +75 -0
- package/dist/__tests__/pipeline/plates/placementLength.test.js.map +1 -0
- package/dist/__tests__/pipeline/plates/plate.test.d.ts +2 -0
- package/dist/__tests__/pipeline/plates/plate.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/plates/plate.test.js +177 -0
- package/dist/__tests__/pipeline/plates/plate.test.js.map +1 -0
- package/dist/__tests__/pipeline/plates/plateFlow.test.d.ts +2 -0
- package/dist/__tests__/pipeline/plates/plateFlow.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/plates/plateFlow.test.js +118 -0
- package/dist/__tests__/pipeline/plates/plateFlow.test.js.map +1 -0
- package/dist/__tests__/pipeline/plates/plateRole.test.d.ts +2 -0
- package/dist/__tests__/pipeline/plates/plateRole.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/plates/plateRole.test.js +70 -0
- package/dist/__tests__/pipeline/plates/plateRole.test.js.map +1 -0
- package/dist/__tests__/pipeline/resources/rotatedResource.test.js +1 -1
- package/dist/__tests__/pipeline/resources/rotatedResource.test.js.map +1 -1
- package/dist/__tests__/pipeline/text/chips.test.js +3 -3
- package/dist/__tests__/pipeline/text/chips.test.js.map +1 -1
- package/dist/checks/configWarnings/choices.d.ts.map +1 -1
- package/dist/checks/configWarnings/choices.js +1 -0
- package/dist/checks/configWarnings/choices.js.map +1 -1
- package/dist/checks/stacks.d.ts +39 -0
- package/dist/checks/stacks.d.ts.map +1 -0
- package/dist/checks/stacks.js +122 -0
- package/dist/checks/stacks.js.map +1 -0
- package/dist/defaults/text/bodyText/defaults.d.ts.map +1 -1
- package/dist/defaults/text/bodyText/defaults.js +3 -0
- package/dist/defaults/text/bodyText/defaults.js.map +1 -1
- package/dist/defaults/text/bodyText/resolve.d.ts.map +1 -1
- package/dist/defaults/text/bodyText/resolve.js +3 -0
- package/dist/defaults/text/bodyText/resolve.js.map +1 -1
- package/dist/defaults/text/bodyText/strip.d.ts.map +1 -1
- package/dist/defaults/text/bodyText/strip.js +12 -0
- package/dist/defaults/text/bodyText/strip.js.map +1 -1
- package/dist/design/elementKeys.d.ts +1 -0
- package/dist/design/elementKeys.d.ts.map +1 -1
- package/dist/design/elementKeys.js +1 -1
- package/dist/design/elementKeys.js.map +1 -1
- package/dist/design/layout/primitives.d.ts +3 -1
- package/dist/design/layout/primitives.d.ts.map +1 -1
- package/dist/design/layout/primitives.js +5 -1
- package/dist/design/layout/primitives.js.map +1 -1
- package/dist/fonts/faces.d.ts.map +1 -1
- package/dist/fonts/faces.js +9 -0
- package/dist/fonts/faces.js.map +1 -1
- package/dist/fonts/glyphFallback.d.ts +21 -2
- package/dist/fonts/glyphFallback.d.ts.map +1 -1
- package/dist/fonts/glyphFallback.js +13 -3
- package/dist/fonts/glyphFallback.js.map +1 -1
- package/dist/fonts/glyphPlaces.d.ts +32 -0
- package/dist/fonts/glyphPlaces.d.ts.map +1 -0
- package/dist/fonts/glyphPlaces.js +104 -0
- package/dist/fonts/glyphPlaces.js.map +1 -0
- package/dist/fonts/usage.d.ts.map +1 -1
- package/dist/fonts/usage.js +7 -0
- package/dist/fonts/usage.js.map +1 -1
- package/dist/html-backend/styles.d.ts +16 -0
- package/dist/html-backend/styles.d.ts.map +1 -1
- package/dist/html-backend/styles.js +40 -20
- package/dist/html-backend/styles.js.map +1 -1
- package/dist/index.d.ts +7 -7
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -2
- package/dist/index.js.map +1 -1
- package/dist/knuthPlass/breakpoints/edges.d.ts +68 -0
- package/dist/knuthPlass/breakpoints/edges.d.ts.map +1 -0
- package/dist/knuthPlass/breakpoints/edges.js +269 -0
- package/dist/knuthPlass/breakpoints/edges.js.map +1 -0
- package/dist/knuthPlass/breakpoints/search.d.ts +21 -6
- package/dist/knuthPlass/breakpoints/search.d.ts.map +1 -1
- package/dist/knuthPlass/breakpoints/search.js +85 -8
- package/dist/knuthPlass/breakpoints/search.js.map +1 -1
- package/dist/knuthPlass/breakpoints.d.ts +2 -0
- package/dist/knuthPlass/breakpoints.d.ts.map +1 -1
- package/dist/knuthPlass/breakpoints.js +13 -7
- package/dist/knuthPlass/breakpoints.js.map +1 -1
- package/dist/knuthPlass/constants.d.ts +8 -0
- package/dist/knuthPlass/constants.d.ts.map +1 -1
- package/dist/knuthPlass/constants.js +8 -0
- package/dist/knuthPlass/constants.js.map +1 -1
- package/dist/knuthPlass/pretextAdapter.d.ts +4 -1
- package/dist/knuthPlass/pretextAdapter.d.ts.map +1 -1
- package/dist/knuthPlass/pretextAdapter.js +16 -4
- package/dist/knuthPlass/pretextAdapter.js.map +1 -1
- package/dist/knuthPlass/richAdapter.d.ts +6 -1
- package/dist/knuthPlass/richAdapter.d.ts.map +1 -1
- package/dist/knuthPlass/richAdapter.js +18 -2
- package/dist/knuthPlass/richAdapter.js.map +1 -1
- package/dist/knuthPlass/types.d.ts +22 -0
- package/dist/knuthPlass/types.d.ts.map +1 -1
- package/dist/knuthPlass/wasm/abi.d.ts.map +1 -1
- package/dist/knuthPlass/wasm/abi.js +55 -0
- package/dist/knuthPlass/wasm/abi.js.map +1 -1
- package/dist/knuthPlass/wasm/bytes.generated.d.ts +4 -0
- package/dist/knuthPlass/wasm/bytes.generated.d.ts.map +1 -1
- package/dist/knuthPlass/wasm/bytes.generated.js +523 -404
- package/dist/knuthPlass/wasm/bytes.generated.js.map +1 -1
- package/dist/measure/cache.js +1 -1
- package/dist/measure/cache.js.map +1 -1
- package/dist/measure/canvas/state.d.ts.map +1 -1
- package/dist/measure/canvas/state.js +7 -3
- package/dist/measure/canvas/state.js.map +1 -1
- package/dist/measure/font.d.ts +17 -0
- package/dist/measure/font.d.ts.map +1 -1
- package/dist/measure/font.js +36 -1
- package/dist/measure/font.js.map +1 -1
- package/dist/measure/index.d.ts +1 -1
- package/dist/measure/index.d.ts.map +1 -1
- package/dist/measure/index.js +1 -1
- package/dist/measure/index.js.map +1 -1
- package/dist/measure/plain.d.ts.map +1 -1
- package/dist/measure/plain.js +2 -1
- package/dist/measure/plain.js.map +1 -1
- package/dist/measure/rich/measure.js +2 -1
- package/dist/measure/rich/measure.js.map +1 -1
- package/dist/measure/rich/tokens.d.ts +3 -0
- package/dist/measure/rich/tokens.d.ts.map +1 -1
- package/dist/measure/rich/tokens.js.map +1 -1
- package/dist/measure/rich/wordBreaks.js +1 -1
- package/dist/measure/rich/wordBreaks.js.map +1 -1
- package/dist/measure/types.d.ts +6 -0
- package/dist/measure/types.d.ts.map +1 -1
- package/dist/measure/types.js.map +1 -1
- package/dist/pipeline/blocks/measureContentBlock/measureOptions.d.ts +4 -0
- package/dist/pipeline/blocks/measureContentBlock/measureOptions.d.ts.map +1 -1
- package/dist/pipeline/blocks/measureContentBlock/measureOptions.js +4 -0
- package/dist/pipeline/blocks/measureContentBlock/measureOptions.js.map +1 -1
- package/dist/pipeline/blocks/measureContentBlock.d.ts +1 -0
- package/dist/pipeline/blocks/measureContentBlock.d.ts.map +1 -1
- package/dist/pipeline/blocks/measureContentBlock.js +20 -2
- package/dist/pipeline/blocks/measureContentBlock.js.map +1 -1
- package/dist/pipeline/build/drivers.d.ts.map +1 -1
- package/dist/pipeline/build/drivers.js +10 -3
- package/dist/pipeline/build/drivers.js.map +1 -1
- package/dist/pipeline/build/pass/blocks/resourceBlock.d.ts.map +1 -1
- package/dist/pipeline/build/pass/blocks/resourceBlock.js +8 -4
- package/dist/pipeline/build/pass/blocks/resourceBlock.js.map +1 -1
- package/dist/pipeline/build/pass/callouts/calloutCommit.d.ts +1 -1
- package/dist/pipeline/build/pass/callouts/calloutCommit.d.ts.map +1 -1
- package/dist/pipeline/build/pass/callouts/calloutCommit.js +11 -4
- package/dist/pipeline/build/pass/callouts/calloutCommit.js.map +1 -1
- package/dist/pipeline/build/pass/floats/floatBands.d.ts +5 -2
- package/dist/pipeline/build/pass/floats/floatBands.d.ts.map +1 -1
- package/dist/pipeline/build/pass/floats/floatBands.js +20 -12
- package/dist/pipeline/build/pass/floats/floatBands.js.map +1 -1
- package/dist/pipeline/build/pass/floats/floatFlush.d.ts +1 -0
- package/dist/pipeline/build/pass/floats/floatFlush.d.ts.map +1 -1
- package/dist/pipeline/build/pass/floats/floatFlush.js +8 -4
- package/dist/pipeline/build/pass/floats/floatFlush.js.map +1 -1
- package/dist/pipeline/build/pass/floats/floatMeasure.d.ts +5 -4
- package/dist/pipeline/build/pass/floats/floatMeasure.d.ts.map +1 -1
- package/dist/pipeline/build/pass/floats/floatMeasure.js +31 -9
- package/dist/pipeline/build/pass/floats/floatMeasure.js.map +1 -1
- package/dist/pipeline/build/pass/floats/floatPlace.d.ts +6 -2
- package/dist/pipeline/build/pass/floats/floatPlace.d.ts.map +1 -1
- package/dist/pipeline/build/pass/floats/floatPlace.js +47 -8
- package/dist/pipeline/build/pass/floats/floatPlace.js.map +1 -1
- package/dist/pipeline/build/pass/state.d.ts +3 -0
- package/dist/pipeline/build/pass/state.d.ts.map +1 -1
- package/dist/pipeline/build/pass/types.d.ts +9 -0
- package/dist/pipeline/build/pass/types.d.ts.map +1 -1
- package/dist/pipeline/build/pass.d.ts.map +1 -1
- package/dist/pipeline/build/pass.js +11 -4
- package/dist/pipeline/build/pass.js.map +1 -1
- package/dist/pipeline/composedPages/composedLayout/trialPasses.d.ts.map +1 -1
- package/dist/pipeline/composedPages/composedLayout/trialPasses.js +4 -1
- package/dist/pipeline/composedPages/composedLayout/trialPasses.js.map +1 -1
- package/dist/pipeline/config.d.ts.map +1 -1
- package/dist/pipeline/config.js +3 -0
- package/dist/pipeline/config.js.map +1 -1
- package/dist/pipeline/contentWarnings/formatWarning.d.ts.map +1 -1
- package/dist/pipeline/contentWarnings/formatWarning.js +10 -0
- package/dist/pipeline/contentWarnings/formatWarning.js.map +1 -1
- package/dist/pipeline/contentWarnings/layoutWarnings.d.ts +5 -0
- package/dist/pipeline/contentWarnings/layoutWarnings.d.ts.map +1 -1
- package/dist/pipeline/contentWarnings/layoutWarnings.js +24 -1
- package/dist/pipeline/contentWarnings/layoutWarnings.js.map +1 -1
- package/dist/pipeline/contentWarnings.d.ts +1 -1
- package/dist/pipeline/contentWarnings.d.ts.map +1 -1
- package/dist/pipeline/contentWarnings.js +1 -1
- package/dist/pipeline/contentWarnings.js.map +1 -1
- package/dist/pipeline/floats/floatPlacement.d.ts +22 -1
- package/dist/pipeline/floats/floatPlacement.d.ts.map +1 -1
- package/dist/pipeline/floats/floatPlacement.js +37 -8
- package/dist/pipeline/floats/floatPlacement.js.map +1 -1
- package/dist/pipeline/floats/placementLength.d.ts +43 -0
- package/dist/pipeline/floats/placementLength.d.ts.map +1 -0
- package/dist/pipeline/floats/placementLength.js +63 -0
- package/dist/pipeline/floats/placementLength.js.map +1 -0
- package/dist/pipeline/floats/textWrap.d.ts +3 -0
- package/dist/pipeline/floats/textWrap.d.ts.map +1 -1
- package/dist/pipeline/floats/textWrap.js +5 -2
- package/dist/pipeline/floats/textWrap.js.map +1 -1
- package/dist/pipeline/pages/headerFooter/edgePlates.d.ts +17 -0
- package/dist/pipeline/pages/headerFooter/edgePlates.d.ts.map +1 -0
- package/dist/pipeline/pages/headerFooter/edgePlates.js +63 -0
- package/dist/pipeline/pages/headerFooter/edgePlates.js.map +1 -0
- package/dist/pipeline/pages/headerFooter/layoutHeadersAndFooters.d.ts.map +1 -1
- package/dist/pipeline/pages/headerFooter/layoutHeadersAndFooters.js +9 -0
- package/dist/pipeline/pages/headerFooter/layoutHeadersAndFooters.js.map +1 -1
- package/dist/pipeline/pages/pageRoles.d.ts +5 -0
- package/dist/pipeline/pages/pageRoles.d.ts.map +1 -1
- package/dist/pipeline/pages/pageRoles.js +14 -0
- package/dist/pipeline/pages/pageRoles.js.map +1 -1
- package/dist/pipeline/resources/captionInside.d.ts +5 -2
- package/dist/pipeline/resources/captionInside.d.ts.map +1 -1
- package/dist/pipeline/resources/captionInside.js +15 -4
- package/dist/pipeline/resources/captionInside.js.map +1 -1
- package/dist/pipeline/resources/resourceLayout/captions.d.ts.map +1 -1
- package/dist/pipeline/resources/resourceLayout/captions.js +2 -2
- package/dist/pipeline/resources/resourceLayout/captions.js.map +1 -1
- package/dist/pipeline/resources/resourceLayout/input.d.ts +6 -0
- package/dist/pipeline/resources/resourceLayout/input.d.ts.map +1 -1
- package/dist/pipeline/resources/resourceLayout/resourceBlock/captionNotes.js +2 -2
- package/dist/pipeline/resources/resourceLayout/resourceBlock/captionNotes.js.map +1 -1
- package/dist/pipeline/resources/resourceLayout/resourceBlock.d.ts.map +1 -1
- package/dist/pipeline/resources/resourceLayout/resourceBlock.js +21 -4
- package/dist/pipeline/resources/resourceLayout/resourceBlock.js.map +1 -1
- package/dist/pipeline/resources/resourceLayout/snippets.d.ts +12 -2
- package/dist/pipeline/resources/resourceLayout/snippets.d.ts.map +1 -1
- package/dist/pipeline/resources/resourceLayout/snippets.js +19 -0
- package/dist/pipeline/resources/resourceLayout/snippets.js.map +1 -1
- package/dist/pipeline/resources/resourceLayout/tableLayout.d.ts +3 -0
- package/dist/pipeline/resources/resourceLayout/tableLayout.d.ts.map +1 -1
- package/dist/pipeline/resources/resourceLayout/tableLayout.js +3 -3
- package/dist/pipeline/resources/resourceLayout/tableLayout.js.map +1 -1
- package/dist/pipeline/resources/safeArea.d.ts +4 -0
- package/dist/pipeline/resources/safeArea.d.ts.map +1 -1
- package/dist/pipeline/resources/safeArea.js +15 -0
- package/dist/pipeline/resources/safeArea.js.map +1 -1
- package/dist/pipeline/text/annotations.d.ts.map +1 -1
- package/dist/pipeline/text/annotations.js +8 -2
- package/dist/pipeline/text/annotations.js.map +1 -1
- package/dist/pipeline/text/chips.d.ts.map +1 -1
- package/dist/pipeline/text/chips.js +3 -1
- package/dist/pipeline/text/chips.js.map +1 -1
- package/dist/pipeline/text/stacks.d.ts +7 -0
- package/dist/pipeline/text/stacks.d.ts.map +1 -0
- package/dist/pipeline/text/stacks.js +5 -0
- package/dist/pipeline/text/stacks.js.map +1 -0
- package/dist/types/config.d.ts +9 -0
- package/dist/types/config.d.ts.map +1 -1
- package/dist/types/designPlacement.d.ts +6 -2
- package/dist/types/designPlacement.d.ts.map +1 -1
- package/dist/types/resources/resourceTypes.d.ts +36 -1
- package/dist/types/resources/resourceTypes.d.ts.map +1 -1
- package/dist/types/text/bodyText/config.d.ts +26 -0
- package/dist/types/text/bodyText/config.d.ts.map +1 -1
- package/dist/types/text/bodyText/resolved.d.ts +3 -0
- package/dist/types/text/bodyText/resolved.d.ts.map +1 -1
- package/dist/vdt/contentWarnings/layout.d.ts +19 -0
- package/dist/vdt/contentWarnings/layout.d.ts.map +1 -1
- package/dist/vdt/contentWarnings/text.d.ts +16 -0
- package/dist/vdt/contentWarnings/text.d.ts.map +1 -1
- package/dist/vdt/document.d.ts +3 -0
- package/dist/vdt/document.d.ts.map +1 -1
- package/dist/vdt/document.js.map +1 -1
- package/dist/vdt/pages.d.ts +5 -0
- package/dist/vdt/pages.d.ts.map +1 -1
- package/dist/vdt/resources.d.ts +8 -0
- package/dist/vdt/resources.d.ts.map +1 -1
- package/dist/word/anchors/bookmarks.d.ts +5 -0
- package/dist/word/anchors/bookmarks.d.ts.map +1 -1
- package/dist/word/anchors/bookmarks.js +11 -0
- package/dist/word/anchors/bookmarks.js.map +1 -1
- package/dist/word/anchors/index.d.ts +1 -0
- package/dist/word/anchors/index.d.ts.map +1 -1
- package/dist/word/anchors/index.js +1 -0
- package/dist/word/anchors/index.js.map +1 -1
- package/dist/word/anchors/trace.d.ts +45 -0
- package/dist/word/anchors/trace.d.ts.map +1 -0
- package/dist/word/anchors/trace.js +138 -0
- package/dist/word/anchors/trace.js.map +1 -0
- package/dist/word/anchors/trace.test.d.ts +2 -0
- package/dist/word/anchors/trace.test.d.ts.map +1 -0
- package/dist/word/anchors/trace.test.js +75 -0
- package/dist/word/anchors/trace.test.js.map +1 -0
- package/dist/word/anchors/types.d.ts +3 -0
- package/dist/word/anchors/types.d.ts.map +1 -1
- package/dist/word/formatted/index.d.ts +15 -3
- package/dist/word/formatted/index.d.ts.map +1 -1
- package/dist/word/formatted/index.js +21 -11
- package/dist/word/formatted/index.js.map +1 -1
- package/dist/word/formatted/runs.d.ts.map +1 -1
- package/dist/word/formatted/runs.js +7 -3
- package/dist/word/formatted/runs.js.map +1 -1
- package/dist/word/formatted/symbolFont.test.d.ts +2 -0
- package/dist/word/formatted/symbolFont.test.d.ts.map +1 -0
- package/dist/word/formatted/symbolFont.test.js +82 -0
- package/dist/word/formatted/symbolFont.test.js.map +1 -0
- package/dist/word/formatted/symbols.d.ts +26 -4
- package/dist/word/formatted/symbols.d.ts.map +1 -1
- package/dist/word/formatted/symbols.js +77 -14
- package/dist/word/formatted/symbols.js.map +1 -1
- package/dist/word/index.d.ts +21 -14
- package/dist/word/index.d.ts.map +1 -1
- package/dist/word/index.js +17 -11
- package/dist/word/index.js.map +1 -1
- package/dist/word/integration/plain.test.d.ts +2 -0
- package/dist/word/integration/plain.test.d.ts.map +1 -0
- package/dist/word/integration/plain.test.js +102 -0
- package/dist/word/integration/plain.test.js.map +1 -0
- package/dist/word/omml.d.ts.map +1 -1
- package/dist/word/omml.js +8 -1
- package/dist/word/omml.js.map +1 -1
- package/dist/word/ooxml/package.d.ts.map +1 -1
- package/dist/word/ooxml/package.js +6 -0
- package/dist/word/ooxml/package.js.map +1 -1
- package/dist/word/ooxml/package.test.js +18 -0
- package/dist/word/ooxml/package.test.js.map +1 -1
- package/dist/word/roundtrip/added.d.ts +4 -1
- package/dist/word/roundtrip/added.d.ts.map +1 -1
- package/dist/word/roundtrip/added.js +13 -3
- package/dist/word/roundtrip/added.js.map +1 -1
- package/dist/word/roundtrip/align.d.ts +37 -0
- package/dist/word/roundtrip/align.d.ts.map +1 -0
- package/dist/word/roundtrip/align.js +206 -0
- package/dist/word/roundtrip/align.js.map +1 -0
- package/dist/word/roundtrip/align.test.d.ts +2 -0
- package/dist/word/roundtrip/align.test.d.ts.map +1 -0
- package/dist/word/roundtrip/align.test.js +66 -0
- package/dist/word/roundtrip/align.test.js.map +1 -0
- package/dist/word/roundtrip/apply.d.ts +8 -1
- package/dist/word/roundtrip/apply.d.ts.map +1 -1
- package/dist/word/roundtrip/apply.js +246 -10
- package/dist/word/roundtrip/apply.js.map +1 -1
- package/dist/word/roundtrip/blocks.d.ts +18 -2
- package/dist/word/roundtrip/blocks.d.ts.map +1 -1
- package/dist/word/roundtrip/blocks.js +18 -4
- package/dist/word/roundtrip/blocks.js.map +1 -1
- package/dist/word/roundtrip/diff.d.ts +3 -0
- package/dist/word/roundtrip/diff.d.ts.map +1 -1
- package/dist/word/roundtrip/diff.js +5 -0
- package/dist/word/roundtrip/diff.js.map +1 -1
- package/dist/word/roundtrip/editors.test.d.ts +2 -0
- package/dist/word/roundtrip/editors.test.d.ts.map +1 -0
- package/dist/word/roundtrip/editors.test.js +291 -0
- package/dist/word/roundtrip/editors.test.js.map +1 -0
- package/dist/word/roundtrip/edits.d.ts +2 -0
- package/dist/word/roundtrip/edits.d.ts.map +1 -1
- package/dist/word/roundtrip/edits.js +97 -2
- package/dist/word/roundtrip/edits.js.map +1 -1
- package/dist/word/roundtrip/formats.d.ts.map +1 -1
- package/dist/word/roundtrip/formats.js +20 -3
- package/dist/word/roundtrip/formats.js.map +1 -1
- package/dist/word/roundtrip/googleDocs.test-helper.d.ts +13 -0
- package/dist/word/roundtrip/googleDocs.test-helper.d.ts.map +1 -0
- package/dist/word/roundtrip/googleDocs.test-helper.js +136 -0
- package/dist/word/roundtrip/googleDocs.test-helper.js.map +1 -0
- package/dist/word/roundtrip/googleDocs.test.d.ts +2 -0
- package/dist/word/roundtrip/googleDocs.test.d.ts.map +1 -0
- package/dist/word/roundtrip/googleDocs.test.js +400 -0
- package/dist/word/roundtrip/googleDocs.test.js.map +1 -0
- package/dist/word/roundtrip/index.d.ts +3 -2
- package/dist/word/roundtrip/index.d.ts.map +1 -1
- package/dist/word/roundtrip/index.js +2 -1
- package/dist/word/roundtrip/index.js.map +1 -1
- package/dist/word/roundtrip/looks.d.ts +20 -0
- package/dist/word/roundtrip/looks.d.ts.map +1 -0
- package/dist/word/roundtrip/looks.js +109 -0
- package/dist/word/roundtrip/looks.js.map +1 -0
- package/dist/word/roundtrip/looks.test.d.ts +2 -0
- package/dist/word/roundtrip/looks.test.d.ts.map +1 -0
- package/dist/word/roundtrip/looks.test.js +99 -0
- package/dist/word/roundtrip/looks.test.js.map +1 -0
- package/dist/word/roundtrip/looseTex.d.ts +11 -0
- package/dist/word/roundtrip/looseTex.d.ts.map +1 -0
- package/dist/word/roundtrip/looseTex.js +197 -0
- package/dist/word/roundtrip/looseTex.js.map +1 -0
- package/dist/word/roundtrip/looseTex.test.d.ts +2 -0
- package/dist/word/roundtrip/looseTex.test.d.ts.map +1 -0
- package/dist/word/roundtrip/looseTex.test.js +43 -0
- package/dist/word/roundtrip/looseTex.test.js.map +1 -0
- package/dist/word/roundtrip/lost.d.ts +63 -0
- package/dist/word/roundtrip/lost.d.ts.map +1 -0
- package/dist/word/roundtrip/lost.js +425 -0
- package/dist/word/roundtrip/lost.js.map +1 -0
- package/dist/word/roundtrip/lost.test.d.ts +2 -0
- package/dist/word/roundtrip/lost.test.d.ts.map +1 -0
- package/dist/word/roundtrip/lost.test.js +323 -0
- package/dist/word/roundtrip/lost.test.js.map +1 -0
- package/dist/word/roundtrip/markup.d.ts +5 -3
- package/dist/word/roundtrip/markup.d.ts.map +1 -1
- package/dist/word/roundtrip/markup.js +19 -6
- package/dist/word/roundtrip/markup.js.map +1 -1
- package/dist/word/roundtrip/math.d.ts.map +1 -1
- package/dist/word/roundtrip/math.js +41 -1
- package/dist/word/roundtrip/math.js.map +1 -1
- package/dist/word/roundtrip/merge.d.ts.map +1 -1
- package/dist/word/roundtrip/merge.js +81 -13
- package/dist/word/roundtrip/merge.js.map +1 -1
- package/dist/word/roundtrip/read.d.ts +69 -6
- package/dist/word/roundtrip/read.d.ts.map +1 -1
- package/dist/word/roundtrip/read.js +159 -17
- package/dist/word/roundtrip/read.js.map +1 -1
- package/dist/word/roundtrip/rebuild.d.ts +41 -0
- package/dist/word/roundtrip/rebuild.d.ts.map +1 -0
- package/dist/word/roundtrip/rebuild.js +324 -0
- package/dist/word/roundtrip/rebuild.js.map +1 -0
- package/dist/word/roundtrip/selfRead.d.ts +21 -0
- package/dist/word/roundtrip/selfRead.d.ts.map +1 -0
- package/dist/word/roundtrip/selfRead.js +55 -0
- package/dist/word/roundtrip/selfRead.js.map +1 -0
- package/dist/word/roundtrip/settle.d.ts +13 -0
- package/dist/word/roundtrip/settle.d.ts.map +1 -0
- package/dist/word/roundtrip/settle.js +93 -0
- package/dist/word/roundtrip/settle.js.map +1 -0
- package/dist/word/roundtrip/types.d.ts +37 -0
- package/dist/word/roundtrip/types.d.ts.map +1 -1
- package/dist/word/roundtrip/walk.d.ts +10 -1
- package/dist/word/roundtrip/walk.d.ts.map +1 -1
- package/dist/word/roundtrip/walk.js +135 -13
- package/dist/word/roundtrip/walk.js.map +1 -1
- package/dist/word/semantic/blocks.d.ts.map +1 -1
- package/dist/word/semantic/blocks.js +20 -4
- package/dist/word/semantic/blocks.js.map +1 -1
- package/dist/word/semantic/chapter.d.ts.map +1 -1
- package/dist/word/semantic/chapter.js +5 -0
- package/dist/word/semantic/chapter.js.map +1 -1
- package/dist/word/semantic/containers.d.ts.map +1 -1
- package/dist/word/semantic/containers.js +7 -1
- package/dist/word/semantic/containers.js.map +1 -1
- package/dist/word/semantic/context.d.ts +22 -0
- package/dist/word/semantic/context.d.ts.map +1 -1
- package/dist/word/semantic/context.js.map +1 -1
- package/dist/word/semantic/design/bands.d.ts +4 -0
- package/dist/word/semantic/design/bands.d.ts.map +1 -1
- package/dist/word/semantic/design/bands.js +25 -7
- package/dist/word/semantic/design/bands.js.map +1 -1
- package/dist/word/semantic/design/foot.d.ts +36 -0
- package/dist/word/semantic/design/foot.d.ts.map +1 -0
- package/dist/word/semantic/design/foot.js +56 -0
- package/dist/word/semantic/design/foot.js.map +1 -0
- package/dist/word/semantic/design/ground.d.ts +19 -0
- package/dist/word/semantic/design/ground.d.ts.map +1 -0
- package/dist/word/semantic/design/ground.js +100 -0
- package/dist/word/semantic/design/ground.js.map +1 -0
- package/dist/word/semantic/design/ground.test.d.ts +2 -0
- package/dist/word/semantic/design/ground.test.d.ts.map +1 -0
- package/dist/word/semantic/design/ground.test.js +123 -0
- package/dist/word/semantic/design/ground.test.js.map +1 -0
- package/dist/word/semantic/design/heading.d.ts.map +1 -1
- package/dist/word/semantic/design/heading.js +20 -2
- package/dist/word/semantic/design/heading.js.map +1 -1
- package/dist/word/semantic/design/part.d.ts.map +1 -1
- package/dist/word/semantic/design/part.js +13 -1
- package/dist/word/semantic/design/part.js.map +1 -1
- package/dist/word/semantic/design/partColor.d.ts +7 -0
- package/dist/word/semantic/design/partColor.d.ts.map +1 -1
- package/dist/word/semantic/design/partColor.js +13 -0
- package/dist/word/semantic/design/partColor.js.map +1 -1
- package/dist/word/semantic/design/pictures.d.ts +8 -3
- package/dist/word/semantic/design/pictures.d.ts.map +1 -1
- package/dist/word/semantic/design/pictures.js +12 -5
- package/dist/word/semantic/design/pictures.js.map +1 -1
- package/dist/word/semantic/design/side.d.ts +30 -0
- package/dist/word/semantic/design/side.d.ts.map +1 -0
- package/dist/word/semantic/design/side.js +52 -0
- package/dist/word/semantic/design/side.js.map +1 -0
- package/dist/word/semantic/design/side.test.d.ts +2 -0
- package/dist/word/semantic/design/side.test.d.ts.map +1 -0
- package/dist/word/semantic/design/side.test.js +66 -0
- package/dist/word/semantic/design/side.test.js.map +1 -0
- package/dist/word/semantic/design/text.d.ts.map +1 -1
- package/dist/word/semantic/design/text.js +23 -1
- package/dist/word/semantic/design/text.js.map +1 -1
- package/dist/word/semantic/design/values.d.ts +2 -2
- package/dist/word/semantic/design/values.d.ts.map +1 -1
- package/dist/word/semantic/design/values.js +7 -4
- package/dist/word/semantic/design/values.js.map +1 -1
- package/dist/word/semantic/design/write.d.ts +35 -1
- package/dist/word/semantic/design/write.d.ts.map +1 -1
- package/dist/word/semantic/design/write.js +137 -29
- package/dist/word/semantic/design/write.js.map +1 -1
- package/dist/word/semantic/directives.d.ts.map +1 -1
- package/dist/word/semantic/directives.js +13 -0
- package/dist/word/semantic/directives.js.map +1 -1
- package/dist/word/semantic/exercises/exerciseBody.d.ts.map +1 -1
- package/dist/word/semantic/exercises/exerciseBody.js +21 -19
- package/dist/word/semantic/exercises/exerciseBody.js.map +1 -1
- package/dist/word/semantic/exercises/exerciseStyles.d.ts +8 -0
- package/dist/word/semantic/exercises/exerciseStyles.d.ts.map +1 -0
- package/dist/word/semantic/exercises/exerciseStyles.js +24 -0
- package/dist/word/semantic/exercises/exerciseStyles.js.map +1 -0
- package/dist/word/semantic/exercises/exercises.d.ts.map +1 -1
- package/dist/word/semantic/exercises/exercises.js +9 -4
- package/dist/word/semantic/exercises/exercises.js.map +1 -1
- package/dist/word/semantic/fields.d.ts.map +1 -1
- package/dist/word/semantic/fields.js +3 -2
- package/dist/word/semantic/fields.js.map +1 -1
- package/dist/word/semantic/index.d.ts +30 -0
- package/dist/word/semantic/index.d.ts.map +1 -1
- package/dist/word/semantic/index.js +68 -12
- package/dist/word/semantic/index.js.map +1 -1
- package/dist/word/semantic/inline.d.ts +3 -0
- package/dist/word/semantic/inline.d.ts.map +1 -1
- package/dist/word/semantic/inline.js +22 -7
- package/dist/word/semantic/inline.js.map +1 -1
- package/dist/word/semantic/layout/pageSpan.d.ts +24 -0
- package/dist/word/semantic/layout/pageSpan.d.ts.map +1 -1
- package/dist/word/semantic/layout/pageSpan.js +106 -15
- package/dist/word/semantic/layout/pageSpan.js.map +1 -1
- package/dist/word/semantic/layout/review1458.test.d.ts +2 -0
- package/dist/word/semantic/layout/review1458.test.d.ts.map +1 -0
- package/dist/word/semantic/layout/review1458.test.js +152 -0
- package/dist/word/semantic/layout/review1458.test.js.map +1 -0
- package/dist/word/semantic/layout/sides.test.d.ts +2 -0
- package/dist/word/semantic/layout/sides.test.d.ts.map +1 -0
- package/dist/word/semantic/layout/sides.test.js +44 -0
- package/dist/word/semantic/layout/sides.test.js.map +1 -0
- package/dist/word/semantic/media/captions.d.ts.map +1 -1
- package/dist/word/semantic/media/captions.js +6 -1
- package/dist/word/semantic/media/captions.js.map +1 -1
- package/dist/word/semantic/media/comics.d.ts.map +1 -1
- package/dist/word/semantic/media/comics.js +3 -0
- package/dist/word/semantic/media/comics.js.map +1 -1
- package/dist/word/semantic/media/figures.d.ts +5 -1
- package/dist/word/semantic/media/figures.d.ts.map +1 -1
- package/dist/word/semantic/media/figures.js +61 -15
- package/dist/word/semantic/media/figures.js.map +1 -1
- package/dist/word/semantic/media/frames.d.ts.map +1 -1
- package/dist/word/semantic/media/frames.js +7 -1
- package/dist/word/semantic/media/frames.js.map +1 -1
- package/dist/word/semantic/media/pageOpener.d.ts +8 -1
- package/dist/word/semantic/media/pageOpener.d.ts.map +1 -1
- package/dist/word/semantic/media/pageOpener.js +29 -5
- package/dist/word/semantic/media/pageOpener.js.map +1 -1
- package/dist/word/semantic/media/pages.d.ts +1 -1
- package/dist/word/semantic/media/pages.d.ts.map +1 -1
- package/dist/word/semantic/media/pages.js +31 -16
- package/dist/word/semantic/media/pages.js.map +1 -1
- package/dist/word/semantic/media/pages.test.js +2 -2
- package/dist/word/semantic/media/pages.test.js.map +1 -1
- package/dist/word/semantic/media/plates.test.d.ts +2 -0
- package/dist/word/semantic/media/plates.test.d.ts.map +1 -0
- package/dist/word/semantic/media/plates.test.js +54 -0
- package/dist/word/semantic/media/plates.test.js.map +1 -0
- package/dist/word/semantic/media/strip.d.ts.map +1 -1
- package/dist/word/semantic/media/strip.js +5 -4
- package/dist/word/semantic/media/strip.js.map +1 -1
- package/dist/word/semantic/page/composed.d.ts.map +1 -1
- package/dist/word/semantic/page/composed.js +2 -1
- package/dist/word/semantic/page/composed.js.map +1 -1
- package/dist/word/semantic/page/furniture.d.ts +8 -0
- package/dist/word/semantic/page/furniture.d.ts.map +1 -1
- package/dist/word/semantic/page/furniture.js +49 -16
- package/dist/word/semantic/page/furniture.js.map +1 -1
- package/dist/word/semantic/page/margin.d.ts +4 -3
- package/dist/word/semantic/page/margin.d.ts.map +1 -1
- package/dist/word/semantic/page/margin.js +17 -13
- package/dist/word/semantic/page/margin.js.map +1 -1
- package/dist/word/semantic/page/round4.test.js +21 -5
- package/dist/word/semantic/page/round4.test.js.map +1 -1
- package/dist/word/semantic/plain/config.d.ts +13 -0
- package/dist/word/semantic/plain/config.d.ts.map +1 -0
- package/dist/word/semantic/plain/config.js +316 -0
- package/dist/word/semantic/plain/config.js.map +1 -0
- package/dist/word/semantic/plain/corpus.part1.test.d.ts +2 -0
- package/dist/word/semantic/plain/corpus.part1.test.d.ts.map +1 -0
- package/dist/word/semantic/plain/corpus.part1.test.js +12 -0
- package/dist/word/semantic/plain/corpus.part1.test.js.map +1 -0
- package/dist/word/semantic/plain/corpus.part2.test.d.ts +2 -0
- package/dist/word/semantic/plain/corpus.part2.test.d.ts.map +1 -0
- package/dist/word/semantic/plain/corpus.part2.test.js +12 -0
- package/dist/word/semantic/plain/corpus.part2.test.js.map +1 -0
- package/dist/word/semantic/plain/corpus.part3.test.d.ts +2 -0
- package/dist/word/semantic/plain/corpus.part3.test.d.ts.map +1 -0
- package/dist/word/semantic/plain/corpus.part3.test.js +12 -0
- package/dist/word/semantic/plain/corpus.part3.test.js.map +1 -0
- package/dist/word/semantic/plain/corpus.part4.test.d.ts +2 -0
- package/dist/word/semantic/plain/corpus.part4.test.d.ts.map +1 -0
- package/dist/word/semantic/plain/corpus.part4.test.js +16 -0
- package/dist/word/semantic/plain/corpus.part4.test.js.map +1 -0
- package/dist/word/semantic/plain/corpus.part5.test.d.ts +2 -0
- package/dist/word/semantic/plain/corpus.part5.test.d.ts.map +1 -0
- package/dist/word/semantic/plain/corpus.part5.test.js +16 -0
- package/dist/word/semantic/plain/corpus.part5.test.js.map +1 -0
- package/dist/word/semantic/plain/corpus.test-helper.d.ts +32 -0
- package/dist/word/semantic/plain/corpus.test-helper.d.ts.map +1 -0
- package/dist/word/semantic/plain/corpus.test-helper.js +168 -0
- package/dist/word/semantic/plain/corpus.test-helper.js.map +1 -0
- package/dist/word/semantic/plain/design.d.ts +30 -0
- package/dist/word/semantic/plain/design.d.ts.map +1 -0
- package/dist/word/semantic/plain/design.js +106 -0
- package/dist/word/semantic/plain/design.js.map +1 -0
- package/dist/word/semantic/plain/plain.test.d.ts +2 -0
- package/dist/word/semantic/plain/plain.test.d.ts.map +1 -0
- package/dist/word/semantic/plain/plain.test.js +327 -0
- package/dist/word/semantic/plain/plain.test.js.map +1 -0
- package/dist/word/semantic/plain/styles.d.ts +4 -0
- package/dist/word/semantic/plain/styles.d.ts.map +1 -0
- package/dist/word/semantic/plain/styles.js +36 -0
- package/dist/word/semantic/plain/styles.js.map +1 -0
- package/dist/word/semantic/prose/chips.d.ts.map +1 -1
- package/dist/word/semantic/prose/chips.js +8 -3
- package/dist/word/semantic/prose/chips.js.map +1 -1
- package/dist/word/semantic/prose/citations.d.ts +42 -0
- package/dist/word/semantic/prose/citations.d.ts.map +1 -0
- package/dist/word/semantic/prose/citations.js +138 -0
- package/dist/word/semantic/prose/citations.js.map +1 -0
- package/dist/word/semantic/prose/citations.test.d.ts +2 -0
- package/dist/word/semantic/prose/citations.test.d.ts.map +1 -0
- package/dist/word/semantic/prose/citations.test.js +66 -0
- package/dist/word/semantic/prose/citations.test.js.map +1 -0
- package/dist/word/semantic/prose/leading.d.ts +36 -0
- package/dist/word/semantic/prose/leading.d.ts.map +1 -0
- package/dist/word/semantic/prose/leading.js +115 -0
- package/dist/word/semantic/prose/leading.js.map +1 -0
- package/dist/word/semantic/prose/leading.test.d.ts +2 -0
- package/dist/word/semantic/prose/leading.test.d.ts.map +1 -0
- package/dist/word/semantic/prose/leading.test.js +116 -0
- package/dist/word/semantic/prose/leading.test.js.map +1 -0
- package/dist/word/semantic/prose/tocEntry.d.ts +8 -0
- package/dist/word/semantic/prose/tocEntry.d.ts.map +1 -1
- package/dist/word/semantic/prose/tocEntry.js +40 -0
- package/dist/word/semantic/prose/tocEntry.js.map +1 -1
- package/dist/word/semantic/sections.d.ts +6 -0
- package/dist/word/semantic/sections.d.ts.map +1 -1
- package/dist/word/semantic/sections.js +11 -4
- package/dist/word/semantic/sections.js.map +1 -1
- package/dist/word/semantic/styles.d.ts +5 -1
- package/dist/word/semantic/styles.d.ts.map +1 -1
- package/dist/word/semantic/styles.js +22 -5
- package/dist/word/semantic/styles.js.map +1 -1
- package/dist/word/semantic/tables.d.ts.map +1 -1
- package/dist/word/semantic/tables.js +2 -1
- package/dist/word/semantic/tables.js.map +1 -1
- package/dist/word/semantic/wml.d.ts +3 -0
- package/dist/word/semantic/wml.d.ts.map +1 -1
- package/dist/word/semantic/wml.js +1 -1
- package/dist/word/semantic/wml.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
// A width given as a length and a full-page plate in the semantic .docx
|
|
2
|
+
// (#1461): the picture set that wide, the plate alone on a page of its
|
|
3
|
+
// own, and an unedited export reading back into the same Markdown.
|
|
4
|
+
import { describe, expect, it } from 'vitest';
|
|
5
|
+
import { applyDocxEdits } from '../../roundtrip/index.js';
|
|
6
|
+
import { exportDocx, exportProblems } from '../fixtures/harness.js';
|
|
7
|
+
const PNG = new Uint8Array([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 1, 2, 3]);
|
|
8
|
+
const at = { createdAt: 0, updatedAt: 0 };
|
|
9
|
+
const pic = (id, placement) => ({
|
|
10
|
+
id, typeId: 'figure', kind: 'bitmap', caption: `Figure ${id}`, ...at, placement,
|
|
11
|
+
bitmap: { fileId: 'f1', format: 'png', width: 4000, height: 3000 },
|
|
12
|
+
});
|
|
13
|
+
const bytes = (id) => (id === 'f1' ? PNG : undefined);
|
|
14
|
+
const mm = (value) => ({ value, unit: 'mm' });
|
|
15
|
+
const config = {
|
|
16
|
+
page: { width: mm(170), height: mm(240), margins: { top: mm(20), bottom: mm(20), left: mm(12), right: mm(12) } },
|
|
17
|
+
layout: { layoutType: 'double', gutterWidth: mm(6) },
|
|
18
|
+
};
|
|
19
|
+
/** The width of the picture drawn for `id`, mm (from its extent, EMU). */
|
|
20
|
+
function extentMm(doc, id) {
|
|
21
|
+
const at = doc.indexOf(`ptx:figure:${id}`);
|
|
22
|
+
const m = /<wp:extent cx="(\d+)"/.exec(doc.slice(at));
|
|
23
|
+
return Number(m[1]) / 36000;
|
|
24
|
+
}
|
|
25
|
+
/** Whether the paragraph next to the figure `id` (before or after it)
|
|
26
|
+
* breaks to a new page. */
|
|
27
|
+
function breakBeside(doc, id, side) {
|
|
28
|
+
const start = doc.lastIndexOf('<w:sdt>', doc.indexOf(`ptx:figure:${id}`));
|
|
29
|
+
const end = doc.indexOf('</w:sdt>', start) + '</w:sdt>'.length;
|
|
30
|
+
const para = side === 'before' ? doc.slice(doc.lastIndexOf('<w:p>', start), start) : doc.slice(end, doc.indexOf('</w:p>', end));
|
|
31
|
+
return para.includes('<w:pageBreakBefore/>');
|
|
32
|
+
}
|
|
33
|
+
describe('semantic docx: widths as lengths and full-page plates', () => {
|
|
34
|
+
it('sets a picture as wide as its length, never wider than its column', async () => {
|
|
35
|
+
const md = 'See :ref{id="a"} and :ref{id="b"}.\n';
|
|
36
|
+
const e = await exportDocx(md, { config, resources: [pic('a', { width: mm(40) }), pic('b', { width: mm(300) })], resourceBytes: bytes });
|
|
37
|
+
expect(exportProblems(e, [md])).toEqual([]);
|
|
38
|
+
expect(extentMm(e.doc, 'a')).toBeCloseTo(40, 0);
|
|
39
|
+
// The column is 70 mm wide.
|
|
40
|
+
expect(extentMm(e.doc, 'b')).toBeCloseTo(70, 0);
|
|
41
|
+
});
|
|
42
|
+
it('sets a plate as wide as the text area, on a page of its own', async () => {
|
|
43
|
+
const md = 'See :ref{id="p"}.\n\nThe text runs on.\n';
|
|
44
|
+
const e = await exportDocx(md, { config, resources: [pic('p', { plate: true })], resourceBytes: bytes });
|
|
45
|
+
expect(exportProblems(e, [md])).toEqual([]);
|
|
46
|
+
expect(extentMm(e.doc, 'p')).toBeCloseTo(146, 0);
|
|
47
|
+
expect(breakBeside(e.doc, 'p', 'before')).toBe(true);
|
|
48
|
+
expect(breakBeside(e.doc, 'p', 'after')).toBe(true);
|
|
49
|
+
const same = applyDocxEdits(e.bytes, { chapters: [{ id: 'ch1', markdown: md }], resources: [pic('p', { plate: true })] });
|
|
50
|
+
expect(same.edits).toEqual([]);
|
|
51
|
+
expect(same.chapters[0].markdown).toBe(md);
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
//# sourceMappingURL=plates.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plates.test.js","sourceRoot":"","sources":["../../../../src/word/semantic/media/plates.test.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,uEAAuE;AACvE,mEAAmE;AAEnE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAEpE,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACtF,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;AAC1C,MAAM,GAAG,GAAG,CAAC,EAAU,EAAE,SAAgC,EAAY,EAAE,CAAC,CAAC;IACvE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,SAAS;IAC/E,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;CACnE,CAAC,CAAC;AACH,MAAM,KAAK,GAAG,CAAC,EAAU,EAA0B,EAAE,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AACtF,MAAM,EAAE,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAa,EAAE,CAAC,CAAC;AAC/D,MAAM,MAAM,GAAG;IACb,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;IAChH,MAAM,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE;CACpC,CAAC;AAEnB,0EAA0E;AAC1E,SAAS,QAAQ,CAAC,GAAW,EAAE,EAAU;IACvC,MAAM,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IAC3C,MAAM,CAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IACtD,OAAO,MAAM,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;AAC/B,CAAC;AAED;4BAC4B;AAC5B,SAAS,WAAW,CAAC,GAAW,EAAE,EAAU,EAAE,IAAwB;IACpE,MAAM,KAAK,GAAG,GAAG,CAAC,WAAW,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,CAAC;IAC1E,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/D,MAAM,IAAI,GAAG,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;IAChI,OAAO,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;AAC/C,CAAC;AAED,QAAQ,CAAC,uDAAuD,EAAE,GAAG,EAAE;IACrE,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;QACjF,MAAM,EAAE,GAAG,sCAAsC,CAAC;QAClD,MAAM,CAAC,GAAG,MAAM,UAAU,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;QACzI,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC5C,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAChD,4BAA4B;QAC5B,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC3E,MAAM,EAAE,GAAG,0CAA0C,CAAC;QACtD,MAAM,CAAC,GAAG,MAAM,UAAU,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;QACzG,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC5C,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACjD,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAC1H,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strip.d.ts","sourceRoot":"","sources":["../../../../src/word/semantic/media/strip.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAMnD;;yBAEyB;AACzB,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAc9E;AAKD;yEACyE;AACzE,wBAAgB,WAAW,CAAC,GAAG,EAAE,aAAa,EAAE,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,MAAM,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"strip.d.ts","sourceRoot":"","sources":["../../../../src/word/semantic/media/strip.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAMnD;;yBAEyB;AACzB,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAc9E;AAKD;yEACyE;AACzE,wBAAgB,WAAW,CAAC,GAAG,EAAE,aAAa,EAAE,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,MAAM,GAAG,MAAM,CAuClH"}
|
|
@@ -41,9 +41,10 @@ export function renderStrip(ctx, b, widthTwips, caption) {
|
|
|
41
41
|
const panels = comicPanels(b);
|
|
42
42
|
const comics = resolveComicsConfig(ctx.config.comics, ctx.config.locale);
|
|
43
43
|
const frame = comics.panel;
|
|
44
|
-
|
|
45
|
-
const
|
|
46
|
-
const
|
|
44
|
+
// The plain design frames each panel with a thin black rule.
|
|
45
|
+
const ink = ctx.plain ? '000000' : (hex(frame.borderColor) ?? '000000');
|
|
46
|
+
const paper = ctx.plain ? undefined : hex(frame.background);
|
|
47
|
+
const line = `w:val="single" w:sz="${ctx.plain ? 4 : Math.min(96, Math.max(4, eighths(ctx.units, frame.borderWidth)))}" w:space="0" w:color="${ink}"`;
|
|
47
48
|
const shares = panelShares(b.comic?.attrs.split, Math.max(1, panels.length));
|
|
48
49
|
const widths = shares.map((s) => Math.max(240, Math.floor(widthTwips * s)));
|
|
49
50
|
let cells = '';
|
|
@@ -70,7 +71,7 @@ export function renderStrip(ctx, b, widthTwips, caption) {
|
|
|
70
71
|
const cap = caption();
|
|
71
72
|
const nil = ['top', 'left', 'bottom', 'right'].map((s) => `<w:${s} w:val="nil"/>`).join('');
|
|
72
73
|
const capRow = cap ? `<w:tr><w:trPr><w:cantSplit/></w:trPr><w:tc><w:tcPr><w:tcW w:w="${total}" w:type="dxa"/><w:gridSpan w:val="${widths.length}"/><w:tcBorders>${nil}</w:tcBorders></w:tcPr>${cap}</w:tc></w:tr>` : '';
|
|
73
|
-
const tbl = `<w:tbl><w:tblPr><w:tblW w:w="${total}" w:type="dxa"/><w:jc w:val="center"/><w:tblCellSpacing w:w="${GUTTER / 2}" w:type="dxa"/>` +
|
|
74
|
+
const tbl = `<w:tbl><w:tblPr><w:tblW w:w="${total}" w:type="dxa"/><w:jc w:val="center"/><w:tblCellSpacing w:w="${Math.round(GUTTER / 2)}" w:type="dxa"/>` +
|
|
74
75
|
'<w:tblBorders><w:top w:val="nil"/><w:left w:val="nil"/><w:bottom w:val="nil"/><w:right w:val="nil"/><w:insideH w:val="nil"/><w:insideV w:val="nil"/></w:tblBorders><w:tblLayout w:type="fixed"/>' +
|
|
75
76
|
'<w:tblLook w:val="0000" w:firstRow="0" w:lastRow="0" w:firstColumn="0" w:lastColumn="0" w:noHBand="1" w:noVBand="1"/></w:tblPr>' +
|
|
76
77
|
`<w:tblGrid>${widths.map((w) => `<w:gridCol w:w="${w}"/>`).join('')}</w:tblGrid>` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strip.js","sourceRoot":"","sources":["../../../../src/word/semantic/media/strip.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"strip.js","sourceRoot":"","sources":["../../../../src/word/semantic/media/strip.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"composed.d.ts","sourceRoot":"","sources":["../../../../src/word/semantic/page/composed.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAGnD,kEAAkE;AAClE,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB;AAID;gCACgC;AAChC,wBAAgB,UAAU,CAAC,GAAG,EAAE,aAAa,EAAE,CAAC,EAAE,YAAY,GAAG,SAAS,GAAG,UAAU,
|
|
1
|
+
{"version":3,"file":"composed.d.ts","sourceRoot":"","sources":["../../../../src/word/semantic/page/composed.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAGnD,kEAAkE;AAClE,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB;AAID;gCACgC;AAChC,wBAAgB,UAAU,CAAC,GAAG,EAAE,aAAa,EAAE,CAAC,EAAE,YAAY,GAAG,SAAS,GAAG,UAAU,CAMtF;AAED;gEACgE;AAChE,wBAAgB,WAAW,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,YAAY,GAAG,SAAS,EAAE,CAAC,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAIpH;AAED,0DAA0D;AAC1D,eAAO,MAAM,cAAc,GAAI,GAAG,YAAY,GAAG,SAAS,KAAG,OAA6E,CAAC"}
|
|
@@ -9,7 +9,8 @@ const ALL = { header: true, footer: true };
|
|
|
9
9
|
/** The running heads a composed page `b` prints (its template's); every
|
|
10
10
|
* head for any other block. */
|
|
11
11
|
export function headsShown(ctx, b) {
|
|
12
|
-
|
|
12
|
+
// The plain design prints the same footer on every page.
|
|
13
|
+
if (ctx.plain || b?.type !== 'containerStart' || b.containerName !== 'composedPage')
|
|
13
14
|
return ALL;
|
|
14
15
|
const template = templateOf(ctx, b.composedPage?.template ?? b.containerAttrs?.template);
|
|
15
16
|
if (!template)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"composed.js","sourceRoot":"","sources":["../../../../src/word/semantic/page/composed.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,uEAAuE;AACvE,0EAA0E;AAC1E,0EAA0E;AAC1E,oEAAoE;AACpE,4CAA4C;AAI5C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAQhD,MAAM,GAAG,GAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AAEvD;gCACgC;AAChC,MAAM,UAAU,UAAU,CAAC,GAAkB,EAAE,CAA2B;IACxE,IAAI,CAAC,EAAE,IAAI,KAAK,gBAAgB,IAAI,CAAC,CAAC,aAAa,KAAK,cAAc;QAAE,OAAO,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"composed.js","sourceRoot":"","sources":["../../../../src/word/semantic/page/composed.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,uEAAuE;AACvE,0EAA0E;AAC1E,0EAA0E;AAC1E,oEAAoE;AACpE,4CAA4C;AAI5C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAQhD,MAAM,GAAG,GAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AAEvD;gCACgC;AAChC,MAAM,UAAU,UAAU,CAAC,GAAkB,EAAE,CAA2B;IACxE,yDAAyD;IACzD,IAAI,GAAG,CAAC,KAAK,IAAI,CAAC,EAAE,IAAI,KAAK,gBAAgB,IAAI,CAAC,CAAC,aAAa,KAAK,cAAc;QAAE,OAAO,GAAG,CAAC;IAChG,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,YAAY,EAAE,QAAQ,IAAI,CAAC,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IACzF,IAAI,CAAC,QAAQ;QAAE,OAAO,GAAG,CAAC;IAC1B,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,KAAK,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;AAClF,CAAC;AAED;gEACgE;AAChE,MAAM,UAAU,WAAW,CAAC,GAAkB,EAAE,IAA8B,EAAE,CAA2B;IACzG,MAAM,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAChC,MAAM,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAC7B,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;AACxD,CAAC;AAED,0DAA0D;AAC1D,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAA2B,EAAW,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,gBAAgB,IAAI,CAAC,CAAC,aAAa,KAAK,cAAc,CAAC"}
|
|
@@ -22,6 +22,13 @@ export interface SectionFurnitureInput {
|
|
|
22
22
|
/** Whether the book's running heads tell odd and even pages apart (Word's
|
|
23
23
|
* `w:evenAndOddHeaders`, a setting of the whole document). */
|
|
24
24
|
export declare const usesEvenAndOdd: (r: ResolvedConfig) => boolean;
|
|
25
|
+
/** The styled section in force at block `b` of chapter `chapter`, with
|
|
26
|
+
* the heading that opened it. */
|
|
27
|
+
export declare function styledSectionAt(ctx: WriterContext, chapter: number, b: ContentBlock | undefined): {
|
|
28
|
+
style: ResolvedHeadingStyleConfig;
|
|
29
|
+
heading: ContentBlock;
|
|
30
|
+
index: number;
|
|
31
|
+
} | undefined;
|
|
25
32
|
/** The styled section in force where a section of chapter `chapter`
|
|
26
33
|
* starts with block `first`. */
|
|
27
34
|
export declare function sectionStyleAt(ctx: WriterContext, chapter: number, first: ContentBlock | undefined): ResolvedHeadingStyleConfig | undefined;
|
|
@@ -33,5 +40,6 @@ export declare function sectionStyleAt(ctx: WriterContext, chapter: number, firs
|
|
|
33
40
|
export declare function sectionFurniture(ctx: WriterContext, geo: PageGeometry, input: SectionFurnitureInput): {
|
|
34
41
|
refs: string;
|
|
35
42
|
titlePg: boolean;
|
|
43
|
+
footer?: number;
|
|
36
44
|
};
|
|
37
45
|
//# sourceMappingURL=furniture.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"furniture.d.ts","sourceRoot":"","sources":["../../../../src/word/semantic/page/furniture.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAM5D,OAAO,KAAK,EAAwE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAC1I,OAAO,KAAK,EAAE,cAAc,EAAW,MAAM,iBAAiB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"furniture.d.ts","sourceRoot":"","sources":["../../../../src/word/semantic/page/furniture.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAM5D,OAAO,KAAK,EAAwE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAC1I,OAAO,KAAK,EAAE,cAAc,EAAW,MAAM,iBAAiB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAGnD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAWjE;8CAC8C;AAC9C,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB;8DAC0D;IAC1D,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,YAAY,CAAC;IACpB,iEAAiE;IACjE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,sEAAsE;IACtE,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,6DAA6D;IAC7D,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AA0BD;+DAC+D;AAC/D,eAAO,MAAM,cAAc,GAAI,GAAG,cAAc,KAAG,OAA8B,CAAC;AA2BlF;kCACkC;AAClC,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,YAAY,GAAG,SAAS,GAAG;IAAE,KAAK,EAAE,0BAA0B,CAAC;IAAC,OAAO,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAGzL;AAED;iCACiC;AACjC,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,SAAS,GAAG,0BAA0B,GAAG,SAAS,CAG3I;AA2KD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,qBAAqB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAiGzJ"}
|
|
@@ -13,11 +13,14 @@ import { flattenTitleBreaks } from '../../../parse/inlineFormatting.js';
|
|
|
13
13
|
import { resolveDesignText } from '../../../design/placeholders.js';
|
|
14
14
|
import { resolvedLocale } from '../../../pipeline/config.js';
|
|
15
15
|
import { headingStyleOf } from '../../../pipeline/sections/headingStyles.js';
|
|
16
|
-
import { designPlaceholders, headingLevelOf, partInForce } from '../design/values.js';
|
|
16
|
+
import { designPlaceholders, headingLevelOf, partInForce, partPaletteAt } from '../design/values.js';
|
|
17
|
+
import { recolored } from '../design/partColor.js';
|
|
17
18
|
import { furnitureParagraph, itemRuns, PAGE_MARK, PAGES_MARK, TITLE_MARK } from './paragraph.js';
|
|
18
19
|
import { marginText, verticalRule } from './margin.js';
|
|
19
20
|
import { headsShown } from './composed.js';
|
|
21
|
+
import { plainFooter } from '../plain/design.js';
|
|
20
22
|
import { placeElement } from './place.js';
|
|
23
|
+
import { pageFootOf } from '../design/foot.js';
|
|
21
24
|
const slotsMemo = new WeakMap();
|
|
22
25
|
/** Every header and footer slot of the book: the document's and the
|
|
23
26
|
* styled sections'. */
|
|
@@ -49,6 +52,11 @@ const blockIndex = (ctx, chapter, b) => (b ? (ctx.book[chapter]?.blocks.indexOf(
|
|
|
49
52
|
/** The styled section in force at block `at` of chapter `chapter` (as the
|
|
50
53
|
* engine counts it page by page, here from the chapter's start). */
|
|
51
54
|
function sectionStyle(ctx, chapter, at) {
|
|
55
|
+
return styledSection(ctx, chapter, at)?.style;
|
|
56
|
+
}
|
|
57
|
+
/** The styled section in force at block `at` of chapter `chapter`: its
|
|
58
|
+
* style and the heading that opened it (`index`: where it stands). */
|
|
59
|
+
function styledSection(ctx, chapter, at) {
|
|
52
60
|
const blocks = ctx.book[chapter]?.blocks ?? [];
|
|
53
61
|
let current;
|
|
54
62
|
for (let i = 0; i <= at && i < blocks.length; i++) {
|
|
@@ -58,11 +66,17 @@ function sectionStyle(ctx, chapter, at) {
|
|
|
58
66
|
const level = b.level ?? 1;
|
|
59
67
|
const style = headingStyleOf(b, ctx.resolved);
|
|
60
68
|
if (style)
|
|
61
|
-
current = { style, level };
|
|
69
|
+
current = { style, level, heading: b, index: i };
|
|
62
70
|
else if (current && (level <= current.level || current.style.sectionEnd === 'heading'))
|
|
63
71
|
current = undefined;
|
|
64
72
|
}
|
|
65
|
-
return current
|
|
73
|
+
return current;
|
|
74
|
+
}
|
|
75
|
+
/** The styled section in force at block `b` of chapter `chapter`, with
|
|
76
|
+
* the heading that opened it. */
|
|
77
|
+
export function styledSectionAt(ctx, chapter, b) {
|
|
78
|
+
const at = blockIndex(ctx, chapter, b);
|
|
79
|
+
return at >= 0 ? styledSection(ctx, chapter, at) : undefined;
|
|
66
80
|
}
|
|
67
81
|
/** The styled section in force where a section of chapter `chapter`
|
|
68
82
|
* starts with block `first`. */
|
|
@@ -171,8 +185,10 @@ function prints(el, role, parity) {
|
|
|
171
185
|
function variant(ctx, slots, values, page, role, parity) {
|
|
172
186
|
const items = { header: [], footer: [] };
|
|
173
187
|
const rules = { header: [], footer: [] };
|
|
174
|
-
//
|
|
188
|
+
// Texts set in a page margin, each in a frame of its own, and the
|
|
189
|
+
// vertical rules drawn down the page (page/margin.ts).
|
|
175
190
|
const frames = { header: [], footer: [] };
|
|
191
|
+
const drawn = { header: [], footer: [] };
|
|
176
192
|
for (const own of ['header', 'footer']) {
|
|
177
193
|
const all = slots[own].elements;
|
|
178
194
|
for (const el of all) {
|
|
@@ -182,9 +198,9 @@ function variant(ctx, slots, values, page, role, parity) {
|
|
|
182
198
|
const target = placed.target ?? own;
|
|
183
199
|
if (el.kind === 'rule') {
|
|
184
200
|
if (el.direction === 'vertical') {
|
|
185
|
-
const
|
|
186
|
-
if (
|
|
187
|
-
|
|
201
|
+
const run = verticalRule(ctx, el, page);
|
|
202
|
+
if (run)
|
|
203
|
+
drawn[target].push(run);
|
|
188
204
|
}
|
|
189
205
|
else
|
|
190
206
|
rules[target].push({ el });
|
|
@@ -203,12 +219,14 @@ function variant(ctx, slots, values, page, role, parity) {
|
|
|
203
219
|
items[target].push(item);
|
|
204
220
|
}
|
|
205
221
|
}
|
|
206
|
-
const none = (t) => !items[t].length && !frames[t].length;
|
|
222
|
+
const none = (t) => !items[t].length && !frames[t].length && !drawn[t].length;
|
|
223
|
+
// The paragraph of a header or footer, the rules drawn from it first.
|
|
224
|
+
const line = (t) => furnitureParagraph(ctx, t, items[t], rules[t], page.rtl, page.textTwips).replace(/^<w:p>(?:<w:pPr>(?:(?!<\/w:pPr>)[\s\S])*<\/w:pPr>)?/, (open) => open + drawn[t].join(''));
|
|
207
225
|
return {
|
|
208
226
|
empty: none('header') && none('footer'),
|
|
209
227
|
blank: { header: none('header') && !rules.header.length, footer: none('footer') && !rules.footer.length },
|
|
210
|
-
header: frames.header.join('') +
|
|
211
|
-
footer: frames.footer.join('') +
|
|
228
|
+
header: frames.header.join('') + line('header'),
|
|
229
|
+
footer: frames.footer.join('') + line('footer'),
|
|
212
230
|
};
|
|
213
231
|
}
|
|
214
232
|
const partIds = new WeakMap();
|
|
@@ -241,14 +259,25 @@ function firstSide(input) {
|
|
|
241
259
|
*/
|
|
242
260
|
export function sectionFurniture(ctx, geo, input) {
|
|
243
261
|
const r = ctx.resolved;
|
|
262
|
+
// The plain design: no running heads, the page number in the footer.
|
|
263
|
+
if (ctx.plain)
|
|
264
|
+
return { refs: `<w:footerReference w:type="default" r:id="${ctx.pkg.footerRel(partId(ctx, 'footer', plainFooter()))}"/>`, titlePg: false };
|
|
265
|
+
// The band a design sets across the foot of the page the section opens
|
|
266
|
+
// with (a part page's): its first page's footer (design/foot.ts).
|
|
267
|
+
const foot = input.leads && input.start !== 'continuous' ? pageFootOf(ctx, input.first) : undefined;
|
|
268
|
+
const footRef = () => `<w:footerReference w:type="first" r:id="${ctx.pkg.footerRel(partId(ctx, 'footer', foot.xml))}"/>`;
|
|
244
269
|
if (!bookSlots(r).any)
|
|
245
|
-
return { refs: '', titlePg: false };
|
|
270
|
+
return foot ? { refs: footRef(), titlePg: true, footer: foot.distance } : { refs: '', titlePg: false };
|
|
246
271
|
const style = sectionStyleAt(ctx, input.chapter, input.first);
|
|
247
272
|
// A composed page whose template prints no header or footer (#1444).
|
|
248
273
|
const shown = input.leads ? headsShown(ctx, input.first) : undefined;
|
|
274
|
+
// The running heads in the palette of the part the section stands in
|
|
275
|
+
// (its folios and rules in the part's colour, #1458).
|
|
276
|
+
const palette = input.first ? partPaletteAt(ctx, input.first) : {};
|
|
277
|
+
const inPart = (slot) => (Object.keys(palette).length ? recolored(slot, palette, r.colorPalette ?? []) : slot);
|
|
249
278
|
const slots = {
|
|
250
|
-
header: shown?.header === false ? { ...r.header, elements: [] } : (style?.header ?? r.header),
|
|
251
|
-
footer: shown?.footer === false ? { ...r.footer, elements: [] } : (style?.footer ?? r.footer),
|
|
279
|
+
header: inPart(shown?.header === false ? { ...r.header, elements: [] } : (style?.header ?? r.header)),
|
|
280
|
+
footer: inPart(shown?.footer === false ? { ...r.footer, elements: [] } : (style?.footer ?? r.footer)),
|
|
252
281
|
};
|
|
253
282
|
const values = sectionValues(ctx, input);
|
|
254
283
|
const parity = usesEvenAndOdd(r);
|
|
@@ -264,7 +293,7 @@ export function sectionFurniture(ctx, geo, input) {
|
|
|
264
293
|
recto,
|
|
265
294
|
rightBound: r.page.binding === 'right',
|
|
266
295
|
});
|
|
267
|
-
let role = input.start !== 'continuous' && input.leads ? firstPageRole(ctx, input.first) : undefined;
|
|
296
|
+
let role = input.start !== 'continuous' && input.leads ? (firstPageRole(ctx, input.first) ?? (foot ? 'opener' : undefined)) : undefined;
|
|
268
297
|
const body = (s, v) => {
|
|
269
298
|
const out = [['default', variant(ctx, s, v, box(true), 'body', parity ? 'odd' : undefined)]];
|
|
270
299
|
if (parity)
|
|
@@ -295,7 +324,7 @@ export function sectionFurniture(ctx, geo, input) {
|
|
|
295
324
|
// any other page of that side prints needs no first-page header: Word
|
|
296
325
|
// then picks the odd or even one by folio (#1444). A known side keeps
|
|
297
326
|
// its first-page header, which LibreOffice needs to draw it right.
|
|
298
|
-
if (role && !firstSide(input)) {
|
|
327
|
+
if (role && !foot && !firstSide(input)) {
|
|
299
328
|
const own = role;
|
|
300
329
|
const same = (side, i) => {
|
|
301
330
|
const v = variant(ctx, slots, values, box(side !== 'even'), own, side);
|
|
@@ -319,10 +348,14 @@ export function sectionFurniture(ctx, geo, input) {
|
|
|
319
348
|
let refs = '';
|
|
320
349
|
for (const kind of ['header', 'footer']) {
|
|
321
350
|
for (const [type, xml] of kinds) {
|
|
351
|
+
if (foot && kind === 'footer' && type === 'first') {
|
|
352
|
+
refs += footRef();
|
|
353
|
+
continue;
|
|
354
|
+
}
|
|
322
355
|
const id = partId(ctx, kind, xml[kind]);
|
|
323
356
|
refs += kind === 'header' ? `<w:headerReference w:type="${type}" r:id="${ctx.pkg.headerRel(id)}"/>` : `<w:footerReference w:type="${type}" r:id="${ctx.pkg.footerRel(id)}"/>`;
|
|
324
357
|
}
|
|
325
358
|
}
|
|
326
|
-
return { refs, titlePg };
|
|
359
|
+
return { refs, titlePg, ...(foot ? { footer: foot.distance } : {}) };
|
|
327
360
|
}
|
|
328
361
|
//# sourceMappingURL=furniture.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"furniture.js","sourceRoot":"","sources":["../../../../src/word/semantic/page/furniture.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"furniture.js","sourceRoot":"","sources":["../../../../src/word/semantic/page/furniture.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,8 @@ export type MarginPage = PageBox & {
|
|
|
8
8
|
/** The frame of a text element that stands in a margin (`runs`: its
|
|
9
9
|
* text), or undefined when it stands over the text area. */
|
|
10
10
|
export declare function marginText(ctx: WriterContext, kind: Target, el: ResolvedDesignElement, page: MarginPage, runs: () => string): string | undefined;
|
|
11
|
-
/**
|
|
12
|
-
*
|
|
13
|
-
|
|
11
|
+
/** A vertical rule anchored to the page, as a run that draws it: a
|
|
12
|
+
* picture of its colour behind the text, for the header's (or footer's)
|
|
13
|
+
* paragraph to hold. */
|
|
14
|
+
export declare function verticalRule(ctx: WriterContext, el: ResolvedDesignRuleElement, page: MarginPage): string | undefined;
|
|
14
15
|
//# sourceMappingURL=margin.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"margin.d.ts","sourceRoot":"","sources":["../../../../src/word/semantic/page/margin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"margin.d.ts","sourceRoot":"","sources":["../../../../src/word/semantic/page/margin.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAC1F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAInD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAElD,iCAAiC;AACjC,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AA8CtD;6DAC6D;AAC7D,wBAAgB,UAAU,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,MAAM,GAAG,MAAM,GAAG,SAAS,CAMhJ;AAED;;yBAEyB;AACzB,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,yBAAyB,EAAE,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,SAAS,CAMpH"}
|
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
// Running-head elements set in a page margin (#1444): a note beside the
|
|
2
2
|
// text area ("Do not write in this margin") and a vertical rule down the
|
|
3
|
-
// margin. A header paragraph spans the text area only, so
|
|
4
|
-
// a frame (`w:framePr`) placed on the page where the engine draws
|
|
5
|
-
//
|
|
6
|
-
//
|
|
7
|
-
// a
|
|
8
|
-
|
|
3
|
+
// margin. A header paragraph spans the text area only, so the note goes
|
|
4
|
+
// into a frame (`w:framePr`) placed on the page where the engine draws
|
|
5
|
+
// it, as wide as its box: Word and LibreOffice place frames; a reader
|
|
6
|
+
// without them (Google Docs) sets the frame's paragraph in the header.
|
|
7
|
+
// The rule is a picture of its colour, as thin and as tall as the rule,
|
|
8
|
+
// drawn behind the text at its place on the page (#1458): as the border of
|
|
9
|
+
// an empty frame as tall as the rule, it became a paragraph the height of
|
|
10
|
+
// the page in the header of a reader without frames.
|
|
11
|
+
import { groundRun } from '../design/ground.js';
|
|
12
|
+
import { hex, paragraph, px } from '../wml.js';
|
|
9
13
|
import { STYLE } from '../styles.js';
|
|
10
14
|
const length = (ctx, v) => (v && typeof v === 'object' && 'unit' in v ? px(ctx.units, v) : 0);
|
|
11
15
|
/** The box of an element anchored to the page by a corner, px; undefined
|
|
@@ -50,15 +54,15 @@ export function marginText(ctx, kind, el, page, runs) {
|
|
|
50
54
|
const jc = align === 'center' ? 'center' : align === 'right' || align === 'end' ? 'right' : 'left';
|
|
51
55
|
return framed(ctx, kind, box, { before: 0, after: 0, jc, ind: { left: 0, right: 0, firstLine: 0 }, ...(page.rtl ? { bidi: false } : {}) }, runs(), false);
|
|
52
56
|
}
|
|
53
|
-
/**
|
|
54
|
-
*
|
|
55
|
-
|
|
57
|
+
/** A vertical rule anchored to the page, as a run that draws it: a
|
|
58
|
+
* picture of its colour behind the text, for the header's (or footer's)
|
|
59
|
+
* paragraph to hold. */
|
|
60
|
+
export function verticalRule(ctx, el, page) {
|
|
56
61
|
const box = pageBox(ctx, el, page);
|
|
57
62
|
if (!box || box.height <= 0)
|
|
58
63
|
return undefined;
|
|
59
|
-
|
|
60
|
-
const
|
|
61
|
-
|
|
62
|
-
return framed(ctx, kind, { ...box, width: Math.max(box.width, (2 * ctx.units.dpi) / 72) }, props, '', true);
|
|
64
|
+
// Half a point at least, so the line shows on screen.
|
|
65
|
+
const width = Math.max(px(ctx.units, el.thickness), (0.5 * ctx.units.dpi) / 72);
|
|
66
|
+
return groundRun(ctx, { fill: hex(el.color) ?? '000000', box: { x: box.x, y: box.y, width, height: box.height } });
|
|
63
67
|
}
|
|
64
68
|
//# sourceMappingURL=margin.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"margin.js","sourceRoot":"","sources":["../../../../src/word/semantic/page/margin.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,yEAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"margin.js","sourceRoot":"","sources":["../../../../src/word/semantic/page/margin.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,yEAAyE;AACzE,wEAAwE;AACxE,uEAAuE;AACvE,sEAAsE;AACtE,uEAAuE;AACvE,wEAAwE;AACxE,2EAA2E;AAC3E,0EAA0E;AAC1E,qDAAqD;AAIrD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAkB,MAAM,WAAW,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAcrC,MAAM,MAAM,GAAG,CAAC,GAAkB,EAAE,CAAU,EAAU,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,CAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEvI;4BAC4B;AAC5B,SAAS,OAAO,CAAC,GAAkB,EAAE,EAAyB,EAAE,IAAgB;IAC9E,MAAM,SAAS,GAAG,WAAW,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/D,MAAM,MAAM,GAAG,SAAS,EAAE,MAAM,CAAC;IACjC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,EAAE,KAAK,MAAM;QAAE,OAAO,SAAS,CAAC;IACtD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;IAC/B,MAAM,CAAC,GAAG,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnD,IAAI,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IACzB,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACnD,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC5C,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,EAAE,GAAG,KAAK,CAAC;IACzD,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,MAAM,CAAC;IAC1D,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AACjC,CAAC;AAED,+DAA+D;AAC/D,SAAS,QAAQ,CAAC,GAAQ,EAAE,IAAgB;IAC1C,MAAM,KAAK,GAAG,CAAC,CAAC;IAChB,OAAO,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,IAAI,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC;AAC5G,CAAC;AAED,MAAM,EAAE,GAAG,CAAC,GAAkB,EAAE,CAAS,EAAU,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1G,mDAAmD;AACnD,SAAS,MAAM,CAAC,GAAkB,EAAE,IAAY,EAAE,GAAQ,EAAE,KAAgB,EAAE,OAAe,EAAE,WAAoB;IACjH,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3F,MAAM,KAAK,GAAG,mBAAmB,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,2DAA2D,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7K,MAAM,KAAK,GAAG,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;IAC9D,OAAO,SAAS,CAAC,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,sBAAsB,EAAE,KAAK,KAAK,EAAE,CAAC,CAAC;AAC/F,CAAC;AAED;6DAC6D;AAC7D,MAAM,UAAU,UAAU,CAAC,GAAkB,EAAE,IAAY,EAAE,EAAyB,EAAE,IAAgB,EAAE,IAAkB;IAC1H,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;IACnC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IACrE,MAAM,KAAK,GAAG,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;IAChD,MAAM,EAAE,GAAG,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IACnG,OAAO,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;AAC5J,CAAC;AAED;;yBAEyB;AACzB,MAAM,UAAU,YAAY,CAAC,GAAkB,EAAE,EAA6B,EAAE,IAAgB;IAC9F,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;IACnC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC9C,sDAAsD;IACtD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IAChF,OAAO,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACrH,CAAC"}
|
|
@@ -136,19 +136,35 @@ describe('semantic docx: pages, fourth review (#1444)', () => {
|
|
|
136
136
|
expect(textOf(partOf(e, first, 'footer', 'first'))).toContain('Verso');
|
|
137
137
|
unchanged(e, md);
|
|
138
138
|
});
|
|
139
|
-
it('sets a note in the margin and a vertical rule
|
|
139
|
+
it('sets a note in the margin in a frame and draws a vertical rule down the page', async () => {
|
|
140
140
|
const md = ['# One\n\nText.\n'];
|
|
141
141
|
const note = { kind: 'text', id: 'note', content: 'Do not write in this margin', placement: { anchor: { to: 'page', edge: 'top-left' }, offset: { x: mm(175), y: mm(22) }, size: { width: mm(28) } } };
|
|
142
142
|
const rule = { kind: 'rule', id: 'rule', direction: 'vertical', color: { hex: '#888888' }, thickness: { value: 0.75, unit: 'pt' }, placement: { anchor: { to: 'page', edge: 'top-left' }, offset: { x: mm(172), y: mm(22) }, size: { height: mm(200) } } };
|
|
143
143
|
const config = cfg({ page: { width: mm(210), height: mm(297), margins: { left: mm(25), right: mm(45), top: mm(25), bottom: mm(25) } }, layout: { layoutType: 'single' }, header: { elements: [head('Paper 2'), note, rule] } });
|
|
144
144
|
const e = await exportDocx(md, { config });
|
|
145
145
|
const xml = partOf(e, sectionsOf(e.doc, true)[0], 'header', 'default');
|
|
146
|
+
// The note in a frame at its place on the page.
|
|
146
147
|
const frames = xml.match(/<w:framePr [^>]*\/>/g) ?? [];
|
|
147
|
-
expect(frames.length).toBe(
|
|
148
|
-
|
|
149
|
-
expect(f).toContain('w:hAnchor="page"');
|
|
150
|
-
expect(xml).toMatch(/<w:framePr[^>]*w:hRule="exact"[^>]*\/>(?:(?!<\/w:p>).)*<w:left w:val="single"/);
|
|
148
|
+
expect(frames.length).toBe(1);
|
|
149
|
+
expect(frames[0]).toContain('w:hAnchor="page"');
|
|
151
150
|
expect(textOf(xml)).toContain('Do not write in this margin');
|
|
151
|
+
// The rule: a picture behind the text, 172 mm in and 22 mm down the
|
|
152
|
+
// sheet, 200 mm tall and under a point wide. No paragraph of the
|
|
153
|
+
// header is as tall as the rule: a reader without frames or placed
|
|
154
|
+
// pictures loses the line, not the page.
|
|
155
|
+
expect(xml).toMatch(/<wp:anchor [^>]*behindDoc="1"/);
|
|
156
|
+
expect(xml).toMatch(/<wp:positionH relativeFrom="page"><wp:posOffset>619\d{4}<\/wp:posOffset>/);
|
|
157
|
+
expect(xml).toMatch(/<wp:positionV relativeFrom="page"><wp:posOffset>79\d{4}<\/wp:posOffset>/);
|
|
158
|
+
const [, cx, cy] = /<wp:extent cx="(\d+)" cy="(\d+)"\/>/.exec(xml) ?? [];
|
|
159
|
+
expect(Number(cx)).toBeLessThan(12700);
|
|
160
|
+
expect(Number(cy)).toBeGreaterThan(7190000);
|
|
161
|
+
expect(Number(cy)).toBeLessThan(7210000);
|
|
162
|
+
expect(xml).not.toMatch(/w:hRule="exact"/);
|
|
163
|
+
expect(xml).not.toMatch(/w:line="\d{4,}"/);
|
|
164
|
+
// Drawn from the running head's own paragraph, which reads its
|
|
165
|
+
// picture from the header's relationships.
|
|
166
|
+
expect(xml.match(/<w:p>/g)).toHaveLength(2);
|
|
167
|
+
expect(exportProblems(e, md)).toEqual([]);
|
|
152
168
|
unchanged(e, md);
|
|
153
169
|
});
|
|
154
170
|
it('prints nothing for a part in a book without part pages', async () => {
|