postext 1.72.0 → 1.74.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__/defaults/stripRoundTrip.harness.js +1 -1
- package/dist/__tests__/defaults/stripRoundTrip.harness.js.map +1 -1
- package/dist/__tests__/exports.test.js +10 -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__/paint/canvasFormFields.test.js +10 -0
- package/dist/__tests__/paint/canvasFormFields.test.js.map +1 -1
- package/dist/__tests__/parse/formFields.test.js +17 -1
- package/dist/__tests__/parse/formFields.test.js.map +1 -1
- 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/canvas-backend/index.d.ts +2 -1
- package/dist/canvas-backend/index.d.ts.map +1 -1
- package/dist/canvas-backend/index.js +2 -2
- package/dist/canvas-backend/index.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/output/pdfGeneration.d.ts +5 -1
- package/dist/defaults/output/pdfGeneration.d.ts.map +1 -1
- package/dist/defaults/output/pdfGeneration.js +23 -0
- package/dist/defaults/output/pdfGeneration.js.map +1 -1
- 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/html-backend.d.ts +1 -0
- package/dist/html-backend/html-backend.d.ts.map +1 -1
- package/dist/html-backend/html-backend.js +1 -0
- package/dist/html-backend/html-backend.js.map +1 -1
- package/dist/html-backend/images.d.ts +8 -0
- package/dist/html-backend/images.d.ts.map +1 -1
- package/dist/html-backend/images.js +15 -3
- package/dist/html-backend/images.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 +9 -9
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -4
- 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/parse/formFields.d.ts +4 -0
- package/dist/parse/formFields.d.ts.map +1 -1
- package/dist/parse/formFields.js +14 -0
- package/dist/parse/formFields.js.map +1 -1
- package/dist/parse/index.d.ts +1 -1
- package/dist/parse/index.d.ts.map +1 -1
- package/dist/parse/index.js +1 -1
- package/dist/parse/index.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/output/print.d.ts +29 -0
- package/dist/types/output/print.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
|
@@ -4,30 +4,95 @@
|
|
|
4
4
|
// region changed on both sides is a conflict. Then the edits of one text
|
|
5
5
|
// are applied from the end backwards.
|
|
6
6
|
import { diffText, mapThrough } from './diff.js';
|
|
7
|
+
/** Whether a change of the book stands in the way of the range `[s, e)`. */
|
|
8
|
+
function touches(h, s, e) {
|
|
9
|
+
const editEmpty = s === e;
|
|
10
|
+
const hunkEmpty = h.a0 === h.a1;
|
|
11
|
+
if (editEmpty && hunkEmpty)
|
|
12
|
+
return h.a0 === s;
|
|
13
|
+
if (editEmpty)
|
|
14
|
+
return h.a0 < s && s < h.a1;
|
|
15
|
+
if (hunkEmpty)
|
|
16
|
+
return s < h.a0 && h.a0 < e;
|
|
17
|
+
return h.a0 < e && s < h.a1;
|
|
18
|
+
}
|
|
7
19
|
/** Carry `[s, e)` of `base` into the current text; undefined on a conflict. */
|
|
8
20
|
function transform(hunks, s, e) {
|
|
9
21
|
let delta = 0;
|
|
10
22
|
for (const h of hunks) {
|
|
11
23
|
if (h.a0 > e)
|
|
12
24
|
break;
|
|
13
|
-
|
|
14
|
-
const hunkEmpty = h.a0 === h.a1;
|
|
15
|
-
let overlap;
|
|
16
|
-
if (editEmpty && hunkEmpty)
|
|
17
|
-
overlap = h.a0 === s;
|
|
18
|
-
else if (editEmpty)
|
|
19
|
-
overlap = h.a0 < s && s < h.a1;
|
|
20
|
-
else if (hunkEmpty)
|
|
21
|
-
overlap = s < h.a0 && h.a0 < e;
|
|
22
|
-
else
|
|
23
|
-
overlap = h.a0 < e && s < h.a1;
|
|
24
|
-
if (overlap)
|
|
25
|
+
if (touches(h, s, e))
|
|
25
26
|
return undefined;
|
|
26
27
|
if (h.a1 <= s)
|
|
27
28
|
delta += h.b1 - h.b0 - (h.a1 - h.a0);
|
|
28
29
|
}
|
|
29
30
|
return [s + delta, e + delta];
|
|
30
31
|
}
|
|
32
|
+
/** Whether a change of the book meets the range `[s, e)` or stands at
|
|
33
|
+
* its edge: a diff may write one replaced word as an insertion before it
|
|
34
|
+
* and a deletion of its rest. */
|
|
35
|
+
const meets = (h, s, e) => touches(h, s, e) || (h.a0 === h.a1 && (h.a0 === s || h.a0 === e)) || (s === e && (s === h.a0 || s === h.a1));
|
|
36
|
+
/** The edits the book already holds: where the book changed since the
|
|
37
|
+
* export, the edits and the book's changes that meet are taken together,
|
|
38
|
+
* and when both leave the same text there (the file imported a second
|
|
39
|
+
* time, a correction made on both sides) there is nothing to bring. */
|
|
40
|
+
function alreadyThere(base, ours, hunks, edits) {
|
|
41
|
+
const same = new Set();
|
|
42
|
+
const seen = new Set();
|
|
43
|
+
const live = edits.filter((x) => !x.reject && x.start >= 0);
|
|
44
|
+
for (const first of live) {
|
|
45
|
+
if (seen.has(first) || !hunks.some((h) => meets(h, first.start, first.end)))
|
|
46
|
+
continue;
|
|
47
|
+
const mine = new Set([first]);
|
|
48
|
+
const theirs = new Set();
|
|
49
|
+
for (let grew = true; grew;) {
|
|
50
|
+
grew = false;
|
|
51
|
+
for (const h of hunks) {
|
|
52
|
+
if (theirs.has(h) || ![...mine].some((x) => meets(h, x.start, x.end)))
|
|
53
|
+
continue;
|
|
54
|
+
theirs.add(h);
|
|
55
|
+
grew = true;
|
|
56
|
+
}
|
|
57
|
+
for (const x of live) {
|
|
58
|
+
if (mine.has(x) || ![...theirs].some((h) => meets(h, x.start, x.end)))
|
|
59
|
+
continue;
|
|
60
|
+
mine.add(x);
|
|
61
|
+
grew = true;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
for (const x of mine)
|
|
65
|
+
seen.add(x);
|
|
66
|
+
const lo = Math.min(...[...mine].map((x) => x.start), ...[...theirs].map((h) => h.a0));
|
|
67
|
+
const hi = Math.max(...[...mine].map((x) => x.end), ...[...theirs].map((h) => h.a1));
|
|
68
|
+
const grow = (h) => h.b1 - h.b0 - (h.a1 - h.a0);
|
|
69
|
+
let from = lo;
|
|
70
|
+
let length = hi - lo;
|
|
71
|
+
for (const h of hunks) {
|
|
72
|
+
if (theirs.has(h))
|
|
73
|
+
length += grow(h);
|
|
74
|
+
else if (h.a1 <= lo)
|
|
75
|
+
from += grow(h);
|
|
76
|
+
else if (h.a0 >= lo && h.a1 <= hi && !(h.a0 === h.a1 && h.a0 === hi))
|
|
77
|
+
length += grow(h);
|
|
78
|
+
}
|
|
79
|
+
let text = base.slice(lo, hi);
|
|
80
|
+
const order = [...mine].map((x, k) => ({ x, k })).sort((a, b) => b.x.start - a.x.start || b.x.end - a.x.end || b.k - a.k);
|
|
81
|
+
let floor = Infinity;
|
|
82
|
+
let apart = true;
|
|
83
|
+
for (const { x } of order) {
|
|
84
|
+
if (x.end > floor)
|
|
85
|
+
apart = false;
|
|
86
|
+
else
|
|
87
|
+
text = text.slice(0, x.start - lo) + x.text + text.slice(x.end - lo);
|
|
88
|
+
floor = x.start;
|
|
89
|
+
}
|
|
90
|
+
if (apart && ours.slice(from, from + length) === text)
|
|
91
|
+
for (const x of mine)
|
|
92
|
+
same.add(x);
|
|
93
|
+
}
|
|
94
|
+
return same;
|
|
95
|
+
}
|
|
31
96
|
/** Place and apply the edits of one text. `base` = export-time text,
|
|
32
97
|
* `ours` = the current one (undefined: the target is gone). */
|
|
33
98
|
export function mergeText(base, ours, edits) {
|
|
@@ -39,7 +104,10 @@ export function mergeText(base, ours, edits) {
|
|
|
39
104
|
return { text: ours, placed };
|
|
40
105
|
}
|
|
41
106
|
const hunks = ours === base ? [] : diffText(base, ours);
|
|
107
|
+
const there = hunks.length ? alreadyThere(base, ours, hunks, edits) : new Set();
|
|
42
108
|
for (const edit of edits) {
|
|
109
|
+
if (there.has(edit))
|
|
110
|
+
continue;
|
|
43
111
|
const before = base.slice(edit.start, edit.end);
|
|
44
112
|
if (edit.reject) {
|
|
45
113
|
placed.push({ edit, start: edit.start, end: edit.end, before: edit.before ?? before, status: 'rejected', reason: edit.reject });
|
|
@@ -50,7 +118,7 @@ export function mergeText(base, ours, edits) {
|
|
|
50
118
|
placed.push({ edit, start: edit.start, end: edit.end, before, status: 'conflict', reason: 'changed-since-export' });
|
|
51
119
|
continue;
|
|
52
120
|
}
|
|
53
|
-
placed.push({ edit, start: at[0], end: at[1], before, status: 'applied' });
|
|
121
|
+
placed.push({ edit, start: at[0], end: at[1], before, status: 'applied', ...(edit.note ? { reason: edit.note } : {}) });
|
|
54
122
|
}
|
|
55
123
|
// Apply from the end backwards; for one start, a range before an
|
|
56
124
|
// insertion, and of two insertions the later one first.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../src/word/roundtrip/merge.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,oEAAoE;AACpE,sEAAsE;AACtE,yEAAyE;AACzE,sCAAsC;AAEtC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAa,MAAM,WAAW,CAAC;AAa5D,+EAA+E;AAC/E,SAAS,SAAS,CAAC,KAAsB,EAAE,CAAS,EAAE,CAAS;IAC7D,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,CAAC,EAAE,GAAG,CAAC;YAAE,MAAM;QACpB,
|
|
1
|
+
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../src/word/roundtrip/merge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type
|
|
2
|
-
import { type ParaProps } from './walk.js';
|
|
1
|
+
import { type ExportMap } from '../anchors/types.js';
|
|
2
|
+
import { type ParaProps, type Token } from './walk.js';
|
|
3
3
|
import { type ParaStyles } from './added.js';
|
|
4
4
|
export interface ReadChar {
|
|
5
5
|
ch: string;
|
|
@@ -11,6 +11,11 @@ export interface ReadChar {
|
|
|
11
11
|
tracked?: boolean;
|
|
12
12
|
/** An atom's holder, by the writer's w:noProof mark. */
|
|
13
13
|
holder?: true;
|
|
14
|
+
/** The note a note reference calls (`f3`: footnote 3, `e1`: endnote 1). */
|
|
15
|
+
note?: string;
|
|
16
|
+
/** How the character looks, styles counted in (`looks.ts`), when the
|
|
17
|
+
* file was read for it. */
|
|
18
|
+
look?: string;
|
|
14
19
|
}
|
|
15
20
|
export interface ReadFragment {
|
|
16
21
|
chars: ReadChar[];
|
|
@@ -19,6 +24,9 @@ export interface ReadFragment {
|
|
|
19
24
|
/** Paragraph ordinals of the bookmark's start and end. */
|
|
20
25
|
startPara: number;
|
|
21
26
|
endPara: number;
|
|
27
|
+
/** The editor took the bookmark away with the text it replaced whole;
|
|
28
|
+
* the text is what stands in the fragment's place (`lost.ts`). */
|
|
29
|
+
replaced?: true;
|
|
22
30
|
}
|
|
23
31
|
export interface ReadPosition {
|
|
24
32
|
fid: string;
|
|
@@ -38,11 +46,25 @@ export interface AddedParagraph {
|
|
|
38
46
|
side: 'after' | 'before';
|
|
39
47
|
chars: ReadChar[];
|
|
40
48
|
props?: ParaProps;
|
|
49
|
+
/** The fragment whose bookmark opens right after the paragraph, in the
|
|
50
|
+
* same run of paragraphs. */
|
|
51
|
+
next?: string;
|
|
52
|
+
/** The paragraph stands in a table, the same one as the bookmark it is
|
|
53
|
+
* placed by: in a table of the book, a row or a line added to it. */
|
|
54
|
+
cell?: true;
|
|
41
55
|
}
|
|
42
56
|
export interface ReadDocx {
|
|
43
57
|
map: ExportMap;
|
|
44
58
|
fragments: Map<string, ReadFragment>;
|
|
45
59
|
added: AddedParagraph[];
|
|
60
|
+
/** The text of every paragraph that stands outside the bookmarks, the
|
|
61
|
+
* ones passed over as decoration too: a fragment whose bookmark is gone
|
|
62
|
+
* while its paragraph still stands there word for word lost its
|
|
63
|
+
* bookmark to the editor, and was not deleted (`apply.ts`). */
|
|
64
|
+
strays: string[];
|
|
65
|
+
/** The notes typed in the editor (none of their text is a fragment's),
|
|
66
|
+
* by the key their reference carries (`ReadChar.note`): their text. */
|
|
67
|
+
newNotes: Map<string, ReadChar[]>;
|
|
46
68
|
/** The paragraph styles of the file, to read an added paragraph's role. */
|
|
47
69
|
styles: ParaStyles;
|
|
48
70
|
comments: ReadComment[];
|
|
@@ -50,11 +72,52 @@ export interface ReadDocx {
|
|
|
50
72
|
* (its own w:noProof anchor runs are still there): an unmarked U+00A0
|
|
51
73
|
* is then a typed no-break space. */
|
|
52
74
|
holders: boolean;
|
|
75
|
+
/** Fragments whose bookmark is gone while unmarked text stands between
|
|
76
|
+
* their neighbours, which could not be told from text typed there
|
|
77
|
+
* (`lost.ts`): they read as deleted, the text as typed in. */
|
|
78
|
+
unpaired: Set<string>;
|
|
79
|
+
/** Fragments whose bookmark was put back among more or fewer unmarked
|
|
80
|
+
* paragraphs than fragments without bookmark: each took the paragraph
|
|
81
|
+
* most like it (`lost.ts`). */
|
|
82
|
+
placed: Set<string>;
|
|
83
|
+
/** Some style or run of the file sets capitals with `w:caps`; an editor
|
|
84
|
+
* that has no such mark (Google Docs) types the capitals out. Set when
|
|
85
|
+
* the looks were read. */
|
|
86
|
+
caps?: boolean;
|
|
53
87
|
}
|
|
54
|
-
/**
|
|
55
|
-
|
|
88
|
+
/** How `readExportedDocx` reads a file. */
|
|
89
|
+
export interface ReadOptions {
|
|
90
|
+
/** The map to read the file by when it carries none: the one written
|
|
91
|
+
* again from the book (`rebuild.ts`). */
|
|
92
|
+
map?: ExportMap;
|
|
93
|
+
/** Read each character's look, styles counted in. */
|
|
94
|
+
looks?: boolean;
|
|
95
|
+
/** Bookmarks of the file that stand for nothing in the map and whose
|
|
96
|
+
* text is no addition either (text the book no longer has). */
|
|
97
|
+
foreign?: ReadonlySet<string>;
|
|
98
|
+
/** Fragments of the map the file never held a bookmark for (`lost.ts`). */
|
|
99
|
+
absent?: ReadonlySet<string>;
|
|
100
|
+
/** The paragraphs the writer set outside every fragment. */
|
|
101
|
+
furniture?: ReadonlyMap<string, number>;
|
|
102
|
+
/** Fragment id → the look of each character as the writer set it. */
|
|
103
|
+
written?: ReadonlyMap<string, readonly string[]>;
|
|
104
|
+
}
|
|
105
|
+
/** Whether `bytes` is a .docx written by a postext Word exporter: it holds
|
|
106
|
+
* the export map. The custom property that names the export is not asked
|
|
107
|
+
* for (an editor may drop the document properties and keep the map); when
|
|
108
|
+
* it is there, the map must be the one it names. Never throws. */
|
|
56
109
|
export declare function isExportedDocx(bytes: Uint8Array): boolean;
|
|
110
|
+
/** Whether `bytes` is a postext export an editor saved without its export
|
|
111
|
+
* map (Google Docs drops it): the property naming the export or the
|
|
112
|
+
* fragments' bookmarks are still there, the map is not. Its edits are
|
|
113
|
+
* placed by a map written again from the book (`rebuildExportMap`).
|
|
114
|
+
* Never throws. */
|
|
115
|
+
export declare function exportMapLost(bytes: Uint8Array): boolean;
|
|
116
|
+
/** Distribute the token stream over the fragments. */
|
|
117
|
+
export declare function assign(tokens: Token[], map: ExportMap, foreign?: ReadonlySet<string>): Pick<ReadDocx, 'fragments' | 'added' | 'strays'> & {
|
|
118
|
+
marks: Map<string, ReadPosition>;
|
|
119
|
+
};
|
|
57
120
|
/** Read an exported file. Throws DocxReadError for a broken file or one
|
|
58
|
-
* without an export map. */
|
|
59
|
-
export declare function readExportedDocx(bytes: Uint8Array): ReadDocx;
|
|
121
|
+
* without an export map (its own, or the one given). */
|
|
122
|
+
export declare function readExportedDocx(bytes: Uint8Array, options?: ReadOptions): ReadDocx;
|
|
60
123
|
//# sourceMappingURL=read.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../../src/word/roundtrip/read.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../../src/word/roundtrip/read.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,12 @@
|
|
|
6
6
|
import { unzipSync } from 'fflate';
|
|
7
7
|
import { attr, child, children, parseXml, textOf } from '../xml.js';
|
|
8
8
|
import { readCustomProp, readExportMap, xmlPartText, PROP_EXPORT_ID } from '../anchors/exportMap.js';
|
|
9
|
+
import { BOOKMARK_PREFIX } from '../anchors/types.js';
|
|
9
10
|
import { DocxReadError } from '../docxRead/parts.js';
|
|
10
11
|
import { PARA_CHAR, walkPart } from './walk.js';
|
|
11
12
|
import { readParaStyles } from './added.js';
|
|
13
|
+
import { styleLooks } from './looks.js';
|
|
14
|
+
import { noteOwners, restoreLost } from './lost.js';
|
|
12
15
|
function unzip(bytes) {
|
|
13
16
|
try {
|
|
14
17
|
return unzipSync(bytes);
|
|
@@ -39,28 +42,56 @@ function linksOf(files, part) {
|
|
|
39
42
|
}
|
|
40
43
|
return out;
|
|
41
44
|
}
|
|
42
|
-
/** Whether `bytes` is a .docx written by a postext Word exporter
|
|
43
|
-
* the export map
|
|
45
|
+
/** Whether `bytes` is a .docx written by a postext Word exporter: it holds
|
|
46
|
+
* the export map. The custom property that names the export is not asked
|
|
47
|
+
* for (an editor may drop the document properties and keep the map); when
|
|
48
|
+
* it is there, the map must be the one it names. Never throws. */
|
|
44
49
|
export function isExportedDocx(bytes) {
|
|
50
|
+
try {
|
|
51
|
+
return readExportMap(unzipSync(bytes)) !== undefined;
|
|
52
|
+
}
|
|
53
|
+
catch {
|
|
54
|
+
return false;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
/** Whether `bytes` is a postext export an editor saved without its export
|
|
58
|
+
* map (Google Docs drops it): the property naming the export or the
|
|
59
|
+
* fragments' bookmarks are still there, the map is not. Its edits are
|
|
60
|
+
* placed by a map written again from the book (`rebuildExportMap`).
|
|
61
|
+
* Never throws. */
|
|
62
|
+
export function exportMapLost(bytes) {
|
|
45
63
|
try {
|
|
46
64
|
const files = unzipSync(bytes);
|
|
47
|
-
|
|
65
|
+
if (readExportMap(files) !== undefined)
|
|
66
|
+
return false;
|
|
67
|
+
if (readCustomProp(files, PROP_EXPORT_ID) !== undefined)
|
|
68
|
+
return true;
|
|
69
|
+
const doc = files['word/document.xml'];
|
|
70
|
+
return !!doc && xmlPartText(doc).includes(`w:name="${BOOKMARK_PREFIX}`);
|
|
48
71
|
}
|
|
49
72
|
catch {
|
|
50
73
|
return false;
|
|
51
74
|
}
|
|
52
75
|
}
|
|
53
76
|
/** Distribute the token stream over the fragments. */
|
|
54
|
-
function assign(tokens, map) {
|
|
77
|
+
export function assign(tokens, map, foreign) {
|
|
55
78
|
const fragments = new Map();
|
|
56
79
|
const open = [];
|
|
57
80
|
const lastClosedIn = new Map();
|
|
58
|
-
/** Characters waiting for a fragment that opens later in their paragraph.
|
|
81
|
+
/** Characters waiting for a fragment that opens later in their paragraph.
|
|
82
|
+
* `after`: they stand behind a fragment postext generates (a caption's
|
|
83
|
+
* number), and `at` are the places of the tracked deletions among them. */
|
|
59
84
|
let pending;
|
|
60
85
|
/** Paragraphs without a bookmark yet (added by the user), with the
|
|
61
86
|
* container they stand in. */
|
|
62
87
|
let orphan = [];
|
|
88
|
+
/** The fragments postext generates: text typed just after one, before
|
|
89
|
+
* the book's own text in the same paragraph, belongs to that text. */
|
|
90
|
+
const generated = new Set(map.fragments.filter((f) => f.target.kind === 'generated').map((f) => f.id));
|
|
91
|
+
/** The table each fragment's bookmark opens in. */
|
|
92
|
+
const tableOf = new Map();
|
|
63
93
|
const added = [];
|
|
94
|
+
const strays = [];
|
|
64
95
|
/** A section ended since the last bookmark (semantic: a chapter end), so
|
|
65
96
|
* what follows opens the next chapter. */
|
|
66
97
|
let sectSeen = false;
|
|
@@ -79,13 +110,29 @@ function assign(tokens, map) {
|
|
|
79
110
|
fragments.set(fid, (f = { chars: [], dels: [], startPara: -1, endPara: -1 }));
|
|
80
111
|
return f;
|
|
81
112
|
};
|
|
82
|
-
|
|
113
|
+
/** Text held behind a generated fragment goes to it after all: no text
|
|
114
|
+
* of the book followed in the paragraph. */
|
|
115
|
+
const releaseHeld = () => {
|
|
116
|
+
if (!pending || pending.after === undefined)
|
|
117
|
+
return;
|
|
118
|
+
const f = frag(pending.after);
|
|
119
|
+
const base = f.chars.length;
|
|
120
|
+
for (const d of pending.at ?? [])
|
|
121
|
+
f.dels.push(base + d);
|
|
122
|
+
f.chars.push(...pending.chars);
|
|
123
|
+
pending = undefined;
|
|
124
|
+
};
|
|
83
125
|
// A paragraph in a container without any bookmark (a text box holding a
|
|
84
126
|
// list marker, a folio or a running head) is decoration, not text the
|
|
85
127
|
// user added; the formatted writer leaves those unbookmarked.
|
|
86
128
|
// The others go after the block before them, or before the block after
|
|
87
129
|
// them when they open a chapter (or the document).
|
|
88
130
|
const flushOrphans = (nextBox, nextFid) => {
|
|
131
|
+
for (const o of orphan) {
|
|
132
|
+
const text = o.chars.map((c) => c.ch).join('').trim();
|
|
133
|
+
if (text)
|
|
134
|
+
strays.push(text);
|
|
135
|
+
}
|
|
89
136
|
const paras = orphan
|
|
90
137
|
.filter((o) => boxesWithMarks.has(o.box) || o.box === nextBox)
|
|
91
138
|
.filter((o) => o.chars.some((c) => c.ch.trim() !== '' || c.tex !== undefined));
|
|
@@ -93,17 +140,39 @@ function assign(tokens, map) {
|
|
|
93
140
|
for (const o of paras) {
|
|
94
141
|
const before = nextFid !== undefined && (!lastFid || o.afterSect);
|
|
95
142
|
const fid = before ? nextFid : lastFid;
|
|
143
|
+
const cell = o.tbl !== undefined && fid !== undefined && tableOf.get(fid) === o.tbl;
|
|
96
144
|
if (fid)
|
|
97
|
-
added.push({ fid, side: before ? 'before' : 'after', chars: o.chars, ...(o.props ? { props: o.props } : {}) });
|
|
145
|
+
added.push({ fid, side: before ? 'before' : 'after', chars: o.chars, ...(o.props ? { props: o.props } : {}), ...(nextFid !== undefined ? { next: nextFid } : {}), ...(cell ? { cell } : {}) });
|
|
98
146
|
}
|
|
99
147
|
};
|
|
100
148
|
const known = new Set(map.fragments.map((f) => f.id));
|
|
149
|
+
// Text the book no longer has is read into fragments nothing looks at.
|
|
150
|
+
if (foreign)
|
|
151
|
+
for (const id of foreign)
|
|
152
|
+
known.add(id);
|
|
153
|
+
// A bookmark an editor renamed stands for its fragment when no bookmark
|
|
154
|
+
// keeps the fragment's own name, and only the first such one does.
|
|
155
|
+
const named = new Set();
|
|
156
|
+
for (const tok of tokens)
|
|
157
|
+
if (tok.t === 'bmStart' && !tok.renamed)
|
|
158
|
+
named.add(tok.fid);
|
|
101
159
|
for (const tok of tokens) {
|
|
102
160
|
switch (tok.t) {
|
|
103
161
|
case 'bmStart': {
|
|
104
162
|
if (!known.has(tok.fid))
|
|
105
163
|
break;
|
|
164
|
+
if (tok.renamed) {
|
|
165
|
+
if (named.has(tok.fid))
|
|
166
|
+
break;
|
|
167
|
+
named.add(tok.fid);
|
|
168
|
+
}
|
|
106
169
|
boxesWithMarks.add(tok.box);
|
|
170
|
+
if (tok.tbl !== undefined)
|
|
171
|
+
tableOf.set(tok.fid, tok.tbl);
|
|
172
|
+
// Text held behind a generated fragment: the book's own text
|
|
173
|
+
// opens here and takes it, anything else leaves it where it was.
|
|
174
|
+
if (pending?.after !== undefined && (pending.para !== tok.para || generated.has(tok.fid) || blank(pending.chars)))
|
|
175
|
+
releaseHeld();
|
|
107
176
|
open.push({ wid: tok.wid, fid: tok.fid, depth: tok.depth });
|
|
108
177
|
const f = frag(tok.fid);
|
|
109
178
|
f.startPara = tok.para;
|
|
@@ -138,7 +207,20 @@ function assign(tokens, map) {
|
|
|
138
207
|
}
|
|
139
208
|
case 'char':
|
|
140
209
|
case 'del': {
|
|
141
|
-
const
|
|
210
|
+
const top = open[open.length - 1]?.fid;
|
|
211
|
+
const closed = top === undefined ? lastClosedIn.get(tok.para) : undefined;
|
|
212
|
+
if (closed !== undefined && generated.has(closed)) {
|
|
213
|
+
if (!pending || pending.para !== tok.para || pending.after !== closed)
|
|
214
|
+
pending = { para: tok.para, chars: [], dels: 0, after: closed, at: [] };
|
|
215
|
+
if (tok.t === 'del') {
|
|
216
|
+
pending.dels++;
|
|
217
|
+
pending.at.push(pending.chars.length);
|
|
218
|
+
}
|
|
219
|
+
else
|
|
220
|
+
pending.chars.push(tok);
|
|
221
|
+
break;
|
|
222
|
+
}
|
|
223
|
+
const fid = top ?? closed;
|
|
142
224
|
if (fid) {
|
|
143
225
|
const f = frag(fid);
|
|
144
226
|
if (tok.t === 'del')
|
|
@@ -158,12 +240,13 @@ function assign(tokens, map) {
|
|
|
158
240
|
break;
|
|
159
241
|
}
|
|
160
242
|
case 'para': {
|
|
243
|
+
releaseHeld();
|
|
161
244
|
const top = open[open.length - 1];
|
|
162
245
|
if (top && top.depth === tok.depth) {
|
|
163
246
|
frag(top.fid).chars.push({ ch: PARA_CHAR, flags: '' });
|
|
164
247
|
}
|
|
165
248
|
else if (pending && pending.para === tok.para) {
|
|
166
|
-
orphan.push({ chars: pending.chars, box: tok.box, afterSect: sectSeen, ...(tok.props ? { props: tok.props } : {}) });
|
|
249
|
+
orphan.push({ chars: pending.chars, box: tok.box, afterSect: sectSeen, ...(tok.props ? { props: tok.props } : {}), ...(tok.tbl !== undefined ? { tbl: tok.tbl } : {}) });
|
|
167
250
|
pending = undefined;
|
|
168
251
|
}
|
|
169
252
|
if (chapterSections && tok.props?.sect && !open.length)
|
|
@@ -192,8 +275,13 @@ function assign(tokens, map) {
|
|
|
192
275
|
}
|
|
193
276
|
}
|
|
194
277
|
}
|
|
278
|
+
// A paragraph still waiting when its part ends (a note without any
|
|
279
|
+
// bookmark) is a stray too.
|
|
280
|
+
releaseHeld();
|
|
281
|
+
if (pending && pending.chars.length)
|
|
282
|
+
orphan.push({ chars: pending.chars, box: -1, afterSect: false });
|
|
195
283
|
flushOrphans();
|
|
196
|
-
return { fragments, added, marks };
|
|
284
|
+
return { fragments, added, strays, marks };
|
|
197
285
|
}
|
|
198
286
|
function readComments(files, marks) {
|
|
199
287
|
const root = xmlOf(files, 'word/comments.xml');
|
|
@@ -213,10 +301,10 @@ function readComments(files, marks) {
|
|
|
213
301
|
return out;
|
|
214
302
|
}
|
|
215
303
|
/** Read an exported file. Throws DocxReadError for a broken file or one
|
|
216
|
-
* without an export map. */
|
|
217
|
-
export function readExportedDocx(bytes) {
|
|
304
|
+
* without an export map (its own, or the one given). */
|
|
305
|
+
export function readExportedDocx(bytes, options = {}) {
|
|
218
306
|
const files = unzip(bytes);
|
|
219
|
-
const map = readExportMap(files);
|
|
307
|
+
const map = readExportMap(files) ?? options.map;
|
|
220
308
|
if (!map)
|
|
221
309
|
throw new DocxReadError('no postext export map');
|
|
222
310
|
const doc = xmlOf(files, 'word/document.xml');
|
|
@@ -224,9 +312,25 @@ export function readExportedDocx(bytes) {
|
|
|
224
312
|
if (!body)
|
|
225
313
|
throw new DocxReadError('no document part');
|
|
226
314
|
const tokens = [];
|
|
227
|
-
const
|
|
315
|
+
const looks = options.looks ? styleLooks(xmlOf(files, 'word/styles.xml')) : undefined;
|
|
316
|
+
const more = looks ? { looks } : {};
|
|
317
|
+
const walked = walkPart(body, linksOf(files, 'word/document.xml'), tokens, 0, 0, more);
|
|
228
318
|
const { noProof } = walked;
|
|
229
319
|
let { nextPara: next, nextBox: box } = walked;
|
|
320
|
+
// Notes typed in the editor: the writer numbers a book's notes from 1
|
|
321
|
+
// with no gap, one fragment each, so a note numbered past them is new.
|
|
322
|
+
// Google Docs numbers the notes again from 0 in reading order, so a
|
|
323
|
+
// note typed there may take the number of one of the book's: when every
|
|
324
|
+
// note of the book still stands in the file with its bookmark, a note
|
|
325
|
+
// without one is new whatever its number.
|
|
326
|
+
const known = new Set(map.fragments.map((f) => f.id));
|
|
327
|
+
const noteFragments = new Set(map.fragments.filter((f) => f.role === 'footnote').map((f) => f.id));
|
|
328
|
+
const exportedNotes = noteFragments.size;
|
|
329
|
+
const newNotes = new Map();
|
|
330
|
+
const unmarked = [];
|
|
331
|
+
const standing = new Set();
|
|
332
|
+
const noteBoxes = new Set();
|
|
333
|
+
const boxOf = new Map();
|
|
230
334
|
// Notes after the body, in their part order (the semantic writer's).
|
|
231
335
|
for (const [part, el] of [['word/footnotes.xml', 'footnote'], ['word/endnotes.xml', 'endnote']]) {
|
|
232
336
|
const root = xmlOf(files, part);
|
|
@@ -237,11 +341,49 @@ export function readExportedDocx(bytes) {
|
|
|
237
341
|
const type = attr(note, 'type');
|
|
238
342
|
if (type && type !== 'normal')
|
|
239
343
|
continue;
|
|
240
|
-
|
|
344
|
+
const from = tokens.length;
|
|
345
|
+
noteBoxes.add(box);
|
|
346
|
+
boxOf.set(`${el[0]}${attr(note, 'id') ?? ''}`, box);
|
|
347
|
+
({ nextPara: next, nextBox: box } = walkPart(note, links, tokens, next, box, more));
|
|
348
|
+
// A note with no bookmark of ours may have been typed in the editor.
|
|
349
|
+
const own = tokens.slice(from);
|
|
350
|
+
let marked = false;
|
|
351
|
+
for (const t of own) {
|
|
352
|
+
if (t.t !== 'bmStart' || !known.has(t.fid))
|
|
353
|
+
continue;
|
|
354
|
+
marked = true;
|
|
355
|
+
if (noteFragments.has(t.fid))
|
|
356
|
+
standing.add(t.fid);
|
|
357
|
+
}
|
|
358
|
+
if (!marked)
|
|
359
|
+
unmarked.push({ key: `${el[0]}${attr(note, 'id') ?? ''}`, id: Number(attr(note, 'id')), own });
|
|
241
360
|
}
|
|
242
361
|
}
|
|
243
|
-
const
|
|
362
|
+
const allStand = standing.size >= exportedNotes;
|
|
363
|
+
for (const { key, id, own } of unmarked) {
|
|
364
|
+
if (!(id > exportedNotes) && !allStand)
|
|
365
|
+
continue;
|
|
366
|
+
const chars = [];
|
|
367
|
+
for (const t of own) {
|
|
368
|
+
if (t.t === 'char')
|
|
369
|
+
chars.push(t);
|
|
370
|
+
else if (t.t === 'para' && chars.length)
|
|
371
|
+
chars.push({ ch: ' ', flags: '' });
|
|
372
|
+
}
|
|
373
|
+
if (chars.some((c) => c.ch.trim()))
|
|
374
|
+
newNotes.set(key, chars);
|
|
375
|
+
}
|
|
376
|
+
// The bookmarks an editor took away with a text replaced whole.
|
|
377
|
+
const { absent, foreign, furniture, written } = options;
|
|
378
|
+
const restored = restoreLost(tokens, map, { noteBoxes, owners: noteOwners(tokens, map, boxOf), ...(absent ? { absent } : {}), ...(foreign ? { foreign } : {}), ...(furniture ? { furniture } : {}), ...(written ? { written } : {}) });
|
|
379
|
+
const { fragments, added, strays, marks } = assign(restored.tokens, map, options.foreign);
|
|
380
|
+
for (const id of restored.put)
|
|
381
|
+
if (fragments.has(id))
|
|
382
|
+
fragments.get(id).replaced = true;
|
|
244
383
|
const holders = map.holders === true && noProof;
|
|
245
|
-
return {
|
|
384
|
+
return {
|
|
385
|
+
map, fragments, added, strays, unpaired: restored.unpaired, placed: restored.placed, newNotes, styles: readParaStyles(files, (path) => xmlOf(files, path)), comments: readComments(files, marks), holders,
|
|
386
|
+
...(looks ? { caps: looks.caps } : {}),
|
|
387
|
+
};
|
|
246
388
|
}
|
|
247
389
|
//# sourceMappingURL=read.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../src/word/roundtrip/read.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../src/word/roundtrip/read.ts"],"names":[],"mappings":"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"}
|