postext 1.70.5 → 1.71.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 -0
- package/dist/__tests__/exports.test.js +6 -0
- package/dist/__tests__/exports.test.js.map +1 -1
- package/dist/__tests__/fonts/strikeout.test.d.ts +2 -0
- package/dist/__tests__/fonts/strikeout.test.d.ts.map +1 -0
- package/dist/__tests__/fonts/strikeout.test.js +106 -0
- package/dist/__tests__/fonts/strikeout.test.js.map +1 -0
- package/dist/__tests__/paint/canvasFormFields.test.d.ts +2 -0
- package/dist/__tests__/paint/canvasFormFields.test.d.ts.map +1 -0
- package/dist/__tests__/paint/canvasFormFields.test.js +89 -0
- package/dist/__tests__/paint/canvasFormFields.test.js.map +1 -0
- package/dist/__tests__/paint/strikethrough.test.d.ts +2 -0
- package/dist/__tests__/paint/strikethrough.test.d.ts.map +1 -0
- package/dist/__tests__/paint/strikethrough.test.js +177 -0
- package/dist/__tests__/paint/strikethrough.test.js.map +1 -0
- package/dist/__tests__/parse/asteriskFlanking.test.d.ts +2 -0
- package/dist/__tests__/parse/asteriskFlanking.test.d.ts.map +1 -0
- package/dist/__tests__/parse/asteriskFlanking.test.js +67 -0
- package/dist/__tests__/parse/asteriskFlanking.test.js.map +1 -0
- package/dist/__tests__/parse/formFields.test.d.ts +2 -0
- package/dist/__tests__/parse/formFields.test.d.ts.map +1 -0
- package/dist/__tests__/parse/formFields.test.js +107 -0
- package/dist/__tests__/parse/formFields.test.js.map +1 -0
- package/dist/__tests__/parse/strikethrough.test.d.ts +2 -0
- package/dist/__tests__/parse/strikethrough.test.d.ts.map +1 -0
- package/dist/__tests__/parse/strikethrough.test.js +97 -0
- package/dist/__tests__/parse/strikethrough.test.js.map +1 -0
- package/dist/__tests__/pipeline/callouts/calloutHangingIndent.test.d.ts +2 -0
- package/dist/__tests__/pipeline/callouts/calloutHangingIndent.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/callouts/calloutHangingIndent.test.js +139 -0
- package/dist/__tests__/pipeline/callouts/calloutHangingIndent.test.js.map +1 -0
- package/dist/canvas-backend/chip.d.ts +4 -0
- package/dist/canvas-backend/chip.d.ts.map +1 -1
- package/dist/canvas-backend/chip.js +33 -1
- package/dist/canvas-backend/chip.js.map +1 -1
- package/dist/canvas-backend/index.d.ts +5 -0
- package/dist/canvas-backend/index.d.ts.map +1 -1
- package/dist/canvas-backend/index.js +5 -1
- package/dist/canvas-backend/index.js.map +1 -1
- package/dist/defaults/boxes/calloutStyles/resolve.d.ts.map +1 -1
- package/dist/defaults/boxes/calloutStyles/resolve.js +4 -0
- package/dist/defaults/boxes/calloutStyles/resolve.js.map +1 -1
- package/dist/defaults/boxes/calloutStyles/strip.d.ts.map +1 -1
- package/dist/defaults/boxes/calloutStyles/strip.js +2 -0
- package/dist/defaults/boxes/calloutStyles/strip.js.map +1 -1
- package/dist/fonts/glyphFallback.d.ts +2 -1
- package/dist/fonts/glyphFallback.d.ts.map +1 -1
- package/dist/fonts/glyphFallback.js +6 -1
- package/dist/fonts/glyphFallback.js.map +1 -1
- package/dist/fonts/strikeout.d.ts +22 -0
- package/dist/fonts/strikeout.d.ts.map +1 -0
- package/dist/fonts/strikeout.js +95 -0
- package/dist/fonts/strikeout.js.map +1 -0
- package/dist/html-backend/lines.d.ts.map +1 -1
- package/dist/html-backend/lines.js +8 -0
- package/dist/html-backend/lines.js.map +1 -1
- package/dist/html-backend/resources.js +3 -3
- package/dist/html-backend/resources.js.map +1 -1
- package/dist/html-backend/segmentText.d.ts +5 -0
- package/dist/html-backend/segmentText.d.ts.map +1 -1
- package/dist/html-backend/segmentText.js +7 -0
- package/dist/html-backend/segmentText.js.map +1 -1
- package/dist/html-backend/segments.js +3 -3
- package/dist/html-backend/segments.js.map +1 -1
- package/dist/html-backend/vertical.d.ts.map +1 -1
- package/dist/html-backend/vertical.js +3 -1
- package/dist/html-backend/vertical.js.map +1 -1
- package/dist/hyphenation/locale.d.ts +5 -0
- package/dist/hyphenation/locale.d.ts.map +1 -1
- package/dist/hyphenation/locale.js +8 -0
- package/dist/hyphenation/locale.js.map +1 -1
- package/dist/idml/colours.d.ts +14 -0
- package/dist/idml/colours.d.ts.map +1 -0
- package/dist/idml/colours.js +53 -0
- package/dist/idml/colours.js.map +1 -0
- package/dist/idml/fields.d.ts +19 -0
- package/dist/idml/fields.d.ts.map +1 -0
- package/dist/idml/fields.js +76 -0
- package/dist/idml/fields.js.map +1 -0
- package/dist/idml/fonts.d.ts +12 -0
- package/dist/idml/fonts.d.ts.map +1 -0
- package/dist/idml/fonts.js +19 -0
- package/dist/idml/fonts.js.map +1 -0
- package/dist/idml/geometry.d.ts +25 -0
- package/dist/idml/geometry.d.ts.map +1 -0
- package/dist/idml/geometry.js +37 -0
- package/dist/idml/geometry.js.map +1 -0
- package/dist/idml/idml.test.d.ts +2 -0
- package/dist/idml/idml.test.d.ts.map +1 -0
- package/dist/idml/idml.test.js +494 -0
- package/dist/idml/idml.test.js.map +1 -0
- package/dist/idml/images.d.ts +6 -0
- package/dist/idml/images.d.ts.map +1 -0
- package/dist/idml/images.js +75 -0
- package/dist/idml/images.js.map +1 -0
- package/dist/idml/index.d.ts +5 -0
- package/dist/idml/index.d.ts.map +1 -0
- package/dist/idml/index.js +100 -0
- package/dist/idml/index.js.map +1 -0
- package/dist/idml/paragraphs.d.ts +33 -0
- package/dist/idml/paragraphs.d.ts.map +1 -0
- package/dist/idml/paragraphs.js +203 -0
- package/dist/idml/paragraphs.js.map +1 -0
- package/dist/idml/parts.d.ts +89 -0
- package/dist/idml/parts.d.ts.map +1 -0
- package/dist/idml/parts.js +136 -0
- package/dist/idml/parts.js.map +1 -0
- package/dist/idml/shapes.d.ts +21 -0
- package/dist/idml/shapes.d.ts.map +1 -0
- package/dist/idml/shapes.js +146 -0
- package/dist/idml/shapes.js.map +1 -0
- package/dist/idml/spreads.d.ts +5 -0
- package/dist/idml/spreads.d.ts.map +1 -0
- package/dist/idml/spreads.js +154 -0
- package/dist/idml/spreads.js.map +1 -0
- package/dist/idml/story.d.ts +13 -0
- package/dist/idml/story.d.ts.map +1 -0
- package/dist/idml/story.js +238 -0
- package/dist/idml/story.js.map +1 -0
- package/dist/idml/writer.d.ts +86 -0
- package/dist/idml/writer.d.ts.map +1 -0
- package/dist/idml/writer.js +8 -0
- package/dist/idml/writer.js.map +1 -0
- package/dist/index.d.ts +4 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/marks/strikeGeometry.d.ts +9 -0
- package/dist/marks/strikeGeometry.d.ts.map +1 -0
- package/dist/marks/strikeGeometry.js +9 -0
- package/dist/marks/strikeGeometry.js.map +1 -0
- package/dist/marks/strikethrough.d.ts +41 -0
- package/dist/marks/strikethrough.d.ts.map +1 -0
- package/dist/marks/strikethrough.js +189 -0
- package/dist/marks/strikethrough.js.map +1 -0
- package/dist/measure/cache.d.ts.map +1 -1
- package/dist/measure/cache.js +8 -2
- package/dist/measure/cache.js.map +1 -1
- package/dist/measure/links.d.ts.map +1 -1
- package/dist/measure/links.js +46 -5
- package/dist/measure/links.js.map +1 -1
- package/dist/measure/rich/chips.d.ts.map +1 -1
- package/dist/measure/rich/chips.js +64 -0
- package/dist/measure/rich/chips.js.map +1 -1
- package/dist/paint/displayList/blocks.d.ts.map +1 -1
- package/dist/paint/displayList/blocks.js +2 -0
- package/dist/paint/displayList/blocks.js.map +1 -1
- package/dist/paint/displayList/comic.d.ts.map +1 -1
- package/dist/paint/displayList/comic.js +3 -2
- package/dist/paint/displayList/comic.js.map +1 -1
- package/dist/paint/displayList/design.d.ts.map +1 -1
- package/dist/paint/displayList/design.js +2 -0
- package/dist/paint/displayList/design.js.map +1 -1
- package/dist/paint/displayList/displayList.test.js +22 -0
- package/dist/paint/displayList/displayList.test.js.map +1 -1
- package/dist/paint/displayList/inline.d.ts.map +1 -1
- package/dist/paint/displayList/inline.js +6 -3
- package/dist/paint/displayList/inline.js.map +1 -1
- package/dist/paint/displayList/labels.d.ts +19 -0
- package/dist/paint/displayList/labels.d.ts.map +1 -0
- package/dist/paint/displayList/labels.js +95 -0
- package/dist/paint/displayList/labels.js.map +1 -0
- package/dist/paint/displayList/labels.test.d.ts +2 -0
- package/dist/paint/displayList/labels.test.d.ts.map +1 -0
- package/dist/paint/displayList/labels.test.js +60 -0
- package/dist/paint/displayList/labels.test.js.map +1 -0
- package/dist/paint/displayList/lines.d.ts.map +1 -1
- package/dist/paint/displayList/lines.js +23 -2
- package/dist/paint/displayList/lines.js.map +1 -1
- package/dist/paint/displayList/page.d.ts.map +1 -1
- package/dist/paint/displayList/page.js +6 -2
- package/dist/paint/displayList/page.js.map +1 -1
- package/dist/paint/displayList/resource.d.ts.map +1 -1
- package/dist/paint/displayList/resource.js +8 -0
- package/dist/paint/displayList/resource.js.map +1 -1
- package/dist/paint/displayList/types.d.ts +43 -3
- package/dist/paint/displayList/types.d.ts.map +1 -1
- package/dist/parse/formFields.d.ts +118 -0
- package/dist/parse/formFields.d.ts.map +1 -0
- package/dist/parse/formFields.js +156 -0
- package/dist/parse/formFields.js.map +1 -0
- package/dist/parse/index.d.ts +2 -0
- package/dist/parse/index.d.ts.map +1 -1
- package/dist/parse/index.js +1 -0
- package/dist/parse/index.js.map +1 -1
- package/dist/parse/injectSpans.d.ts +2 -1
- package/dist/parse/injectSpans.d.ts.map +1 -1
- package/dist/parse/injectSpans.js +16 -2
- package/dist/parse/injectSpans.js.map +1 -1
- package/dist/parse/inlineFormatting/inlineDirectives.d.ts +3 -0
- package/dist/parse/inlineFormatting/inlineDirectives.d.ts.map +1 -1
- package/dist/parse/inlineFormatting/inlineDirectives.js +6 -1
- package/dist/parse/inlineFormatting/inlineDirectives.js.map +1 -1
- package/dist/parse/inlineFormatting/markup.d.ts +31 -1
- package/dist/parse/inlineFormatting/markup.d.ts.map +1 -1
- package/dist/parse/inlineFormatting/markup.js +47 -1
- package/dist/parse/inlineFormatting/markup.js.map +1 -1
- package/dist/parse/inlineFormatting/parse.d.ts +1 -1
- package/dist/parse/inlineFormatting/parse.d.ts.map +1 -1
- package/dist/parse/inlineFormatting/parse.js +44 -10
- package/dist/parse/inlineFormatting/parse.js.map +1 -1
- package/dist/parse/types/inlineSpan.d.ts +13 -1
- package/dist/parse/types/inlineSpan.d.ts.map +1 -1
- package/dist/pipeline/build/drivers.d.ts.map +1 -1
- package/dist/pipeline/build/drivers.js +3 -0
- package/dist/pipeline/build/drivers.js.map +1 -1
- package/dist/pipeline/callouts/calloutLayout/plan.d.ts.map +1 -1
- package/dist/pipeline/callouts/calloutLayout/plan.js +14 -1
- package/dist/pipeline/callouts/calloutLayout/plan.js.map +1 -1
- package/dist/pipeline/references/linkNotes.js +1 -1
- package/dist/pipeline/references/linkNotes.js.map +1 -1
- package/dist/pipeline/styles.d.ts.map +1 -1
- package/dist/pipeline/styles.js +20 -12
- package/dist/pipeline/styles.js.map +1 -1
- package/dist/pipeline/text/tabs.js +1 -1
- package/dist/pipeline/text/tabs.js.map +1 -1
- package/dist/types/boxes/calloutParts.d.ts +21 -0
- package/dist/types/boxes/calloutParts.d.ts.map +1 -1
- package/dist/types/boxes/callouts.d.ts +6 -0
- package/dist/types/boxes/callouts.d.ts.map +1 -1
- package/dist/types/text/bodyText/resolved.d.ts +6 -0
- package/dist/types/text/bodyText/resolved.d.ts.map +1 -1
- package/dist/vdt/segments.d.ts +31 -0
- package/dist/vdt/segments.d.ts.map +1 -1
- package/dist/vdt.d.ts +1 -1
- package/dist/vdt.d.ts.map +1 -1
- package/dist/word/docxRead/body.d.ts.map +1 -1
- package/dist/word/docxRead/body.js +7 -3
- package/dist/word/docxRead/body.js.map +1 -1
- package/dist/word/docxRead/equations.d.ts +6 -0
- package/dist/word/docxRead/equations.d.ts.map +1 -0
- package/dist/word/docxRead/equations.js +56 -0
- package/dist/word/docxRead/equations.js.map +1 -0
- package/dist/word/formatted/display.test.d.ts +2 -0
- package/dist/word/formatted/display.test.d.ts.map +1 -0
- package/dist/word/formatted/display.test.js +106 -0
- package/dist/word/formatted/display.test.js.map +1 -0
- package/dist/word/formatted/displayRoundTrip.test.js +10 -2
- package/dist/word/formatted/displayRoundTrip.test.js.map +1 -1
- package/dist/word/formatted/drawing.d.ts +39 -9
- package/dist/word/formatted/drawing.d.ts.map +1 -1
- package/dist/word/formatted/drawing.js +84 -17
- package/dist/word/formatted/drawing.js.map +1 -1
- package/dist/word/formatted/eastAsian.d.ts +9 -0
- package/dist/word/formatted/eastAsian.d.ts.map +1 -1
- package/dist/word/formatted/eastAsian.js +15 -0
- package/dist/word/formatted/eastAsian.js.map +1 -1
- package/dist/word/formatted/floats.d.ts +26 -0
- package/dist/word/formatted/floats.d.ts.map +1 -0
- package/dist/word/formatted/floats.js +55 -0
- package/dist/word/formatted/floats.js.map +1 -0
- package/dist/word/formatted/formatted.test.js +4 -5
- package/dist/word/formatted/formatted.test.js.map +1 -1
- package/dist/word/formatted/googleDocs.test.d.ts +2 -0
- package/dist/word/formatted/googleDocs.test.d.ts.map +1 -0
- package/dist/word/formatted/googleDocs.test.js +160 -0
- package/dist/word/formatted/googleDocs.test.js.map +1 -0
- package/dist/word/formatted/graphics.test.js +30 -8
- package/dist/word/formatted/graphics.test.js.map +1 -1
- package/dist/word/formatted/halo.d.ts +28 -0
- package/dist/word/formatted/halo.d.ts.map +1 -0
- package/dist/word/formatted/halo.js +107 -0
- package/dist/word/formatted/halo.js.map +1 -0
- package/dist/word/formatted/index.d.ts +1 -1
- package/dist/word/formatted/index.d.ts.map +1 -1
- package/dist/word/formatted/index.js +1 -1
- package/dist/word/formatted/index.js.map +1 -1
- package/dist/word/formatted/inline.test.js +3 -3
- package/dist/word/formatted/inline.test.js.map +1 -1
- package/dist/word/formatted/inlineShapes.d.ts +2 -0
- package/dist/word/formatted/inlineShapes.d.ts.map +1 -1
- package/dist/word/formatted/inlineShapes.js +4 -0
- package/dist/word/formatted/inlineShapes.js.map +1 -1
- package/dist/word/formatted/layers.d.ts +25 -0
- package/dist/word/formatted/layers.d.ts.map +1 -0
- package/dist/word/formatted/layers.js +74 -0
- package/dist/word/formatted/layers.js.map +1 -0
- package/dist/word/formatted/ligatures.d.ts +28 -0
- package/dist/word/formatted/ligatures.d.ts.map +1 -0
- package/dist/word/formatted/ligatures.js +154 -0
- package/dist/word/formatted/ligatures.js.map +1 -0
- package/dist/word/formatted/metrics.d.ts +8 -7
- package/dist/word/formatted/metrics.d.ts.map +1 -1
- package/dist/word/formatted/metrics.js +23 -22
- package/dist/word/formatted/metrics.js.map +1 -1
- package/dist/word/formatted/page.d.ts +14 -4
- package/dist/word/formatted/page.d.ts.map +1 -1
- package/dist/word/formatted/page.js +57 -22
- package/dist/word/formatted/page.js.map +1 -1
- package/dist/word/formatted/paragraphs.d.ts +25 -16
- package/dist/word/formatted/paragraphs.d.ts.map +1 -1
- package/dist/word/formatted/paragraphs.js +106 -68
- package/dist/word/formatted/paragraphs.js.map +1 -1
- package/dist/word/formatted/pictures.d.ts +10 -1
- package/dist/word/formatted/pictures.d.ts.map +1 -1
- package/dist/word/formatted/pictures.js +41 -7
- package/dist/word/formatted/pictures.js.map +1 -1
- package/dist/word/formatted/review.test.js +1 -1
- package/dist/word/formatted/review.test.js.map +1 -1
- package/dist/word/formatted/round3.test.d.ts +2 -0
- package/dist/word/formatted/round3.test.d.ts.map +1 -0
- package/dist/word/formatted/round3.test.js +144 -0
- package/dist/word/formatted/round3.test.js.map +1 -0
- package/dist/word/formatted/round4.test.d.ts +2 -0
- package/dist/word/formatted/round4.test.d.ts.map +1 -0
- package/dist/word/formatted/round4.test.js +200 -0
- package/dist/word/formatted/round4.test.js.map +1 -0
- package/dist/word/formatted/runs.d.ts +33 -3
- package/dist/word/formatted/runs.d.ts.map +1 -1
- package/dist/word/formatted/runs.js +112 -23
- package/dist/word/formatted/runs.js.map +1 -1
- package/dist/word/formatted/scripts.test.js +32 -20
- package/dist/word/formatted/scripts.test.js.map +1 -1
- package/dist/word/formatted/shapes.d.ts +7 -3
- package/dist/word/formatted/shapes.d.ts.map +1 -1
- package/dist/word/formatted/shapes.js +54 -10
- package/dist/word/formatted/shapes.js.map +1 -1
- package/dist/word/formatted/symbols.d.ts +12 -0
- package/dist/word/formatted/symbols.d.ts.map +1 -0
- package/dist/word/formatted/symbols.js +43 -0
- package/dist/word/formatted/symbols.js.map +1 -0
- package/dist/word/formatted/tableFills.d.ts +20 -0
- package/dist/word/formatted/tableFills.d.ts.map +1 -0
- package/dist/word/formatted/tableFills.js +116 -0
- package/dist/word/formatted/tableFills.js.map +1 -0
- package/dist/word/formatted/tables.d.ts +37 -0
- package/dist/word/formatted/tables.d.ts.map +1 -1
- package/dist/word/formatted/tables.js +87 -24
- package/dist/word/formatted/tables.js.map +1 -1
- package/dist/word/formatted/tables.test.d.ts +2 -0
- package/dist/word/formatted/tables.test.d.ts.map +1 -0
- package/dist/word/formatted/tables.test.js +32 -0
- package/dist/word/formatted/tables.test.js.map +1 -0
- package/dist/word/formatted/tabs.d.ts +33 -0
- package/dist/word/formatted/tabs.d.ts.map +1 -0
- package/dist/word/formatted/tabs.js +125 -0
- package/dist/word/formatted/tabs.js.map +1 -0
- package/dist/word/formatted/text.d.ts +25 -2
- package/dist/word/formatted/text.d.ts.map +1 -1
- package/dist/word/formatted/text.js +153 -8
- package/dist/word/formatted/text.js.map +1 -1
- package/dist/word/formatted/types.d.ts +13 -0
- package/dist/word/formatted/types.d.ts.map +1 -1
- package/dist/word/formatted/widths.test.js +2 -10
- package/dist/word/formatted/widths.test.js.map +1 -1
- package/dist/word/formatted/zorder.test.d.ts +2 -0
- package/dist/word/formatted/zorder.test.d.ts.map +1 -0
- package/dist/word/formatted/zorder.test.js +107 -0
- package/dist/word/formatted/zorder.test.js.map +1 -0
- package/dist/word/index.d.ts +1 -1
- package/dist/word/index.d.ts.map +1 -1
- package/dist/word/index.js +1 -1
- package/dist/word/index.js.map +1 -1
- package/dist/word/inline/parse.d.ts.map +1 -1
- package/dist/word/inline/parse.js +3 -2
- package/dist/word/inline/parse.js.map +1 -1
- package/dist/word/ommlWrite/index.d.ts +10 -0
- package/dist/word/ommlWrite/index.d.ts.map +1 -1
- package/dist/word/ommlWrite/index.js +20 -0
- package/dist/word/ommlWrite/index.js.map +1 -1
- package/dist/word/ommlWrite/ommlWrite.test.js +53 -1
- package/dist/word/ommlWrite/ommlWrite.test.js.map +1 -1
- package/dist/word/ommlWrite/runs.d.ts +3 -0
- package/dist/word/ommlWrite/runs.d.ts.map +1 -1
- package/dist/word/ommlWrite/runs.js +3 -1
- package/dist/word/ommlWrite/runs.js.map +1 -1
- package/dist/word/ommlWrite/tables.d.ts.map +1 -1
- package/dist/word/ommlWrite/tables.js +9 -3
- package/dist/word/ommlWrite/tables.js.map +1 -1
- package/dist/word/ommlWrite/tags.d.ts +11 -0
- package/dist/word/ommlWrite/tags.d.ts.map +1 -0
- package/dist/word/ommlWrite/tags.js +37 -0
- package/dist/word/ommlWrite/tags.js.map +1 -0
- package/dist/word/ooxml/package.d.ts.map +1 -1
- package/dist/word/ooxml/package.js +3 -2
- package/dist/word/ooxml/package.js.map +1 -1
- package/dist/word/ooxml/parts.d.ts +4 -2
- package/dist/word/ooxml/parts.d.ts.map +1 -1
- package/dist/word/ooxml/parts.js +6 -3
- package/dist/word/ooxml/parts.js.map +1 -1
- package/dist/word/ooxml/types.d.ts +6 -0
- package/dist/word/ooxml/types.d.ts.map +1 -1
- package/dist/word/roundtrip/added.test.js +3 -1
- package/dist/word/roundtrip/added.test.js.map +1 -1
- package/dist/word/roundtrip/apply.d.ts.map +1 -1
- package/dist/word/roundtrip/apply.js +37 -0
- package/dist/word/roundtrip/apply.js.map +1 -1
- package/dist/word/roundtrip/edits.d.ts.map +1 -1
- package/dist/word/roundtrip/edits.js +25 -7
- package/dist/word/roundtrip/edits.js.map +1 -1
- package/dist/word/roundtrip/math.d.ts +6 -0
- package/dist/word/roundtrip/math.d.ts.map +1 -1
- package/dist/word/roundtrip/math.js +19 -4
- package/dist/word/roundtrip/math.js.map +1 -1
- package/dist/word/roundtrip/math.test.js +62 -0
- package/dist/word/roundtrip/math.test.js.map +1 -1
- package/dist/word/roundtrip/walk.d.ts.map +1 -1
- package/dist/word/roundtrip/walk.js +59 -7
- package/dist/word/roundtrip/walk.js.map +1 -1
- package/dist/word/semantic/atoms.d.ts +16 -3
- package/dist/word/semantic/atoms.d.ts.map +1 -1
- package/dist/word/semantic/atoms.js +45 -9
- package/dist/word/semantic/atoms.js.map +1 -1
- package/dist/word/semantic/blocks.d.ts +23 -1
- package/dist/word/semantic/blocks.d.ts.map +1 -1
- package/dist/word/semantic/blocks.js +102 -38
- package/dist/word/semantic/blocks.js.map +1 -1
- package/dist/word/semantic/boxHangingIndent.test.d.ts +2 -0
- package/dist/word/semantic/boxHangingIndent.test.d.ts.map +1 -0
- package/dist/word/semantic/boxHangingIndent.test.js +38 -0
- package/dist/word/semantic/boxHangingIndent.test.js.map +1 -0
- package/dist/word/semantic/chapter.d.ts.map +1 -1
- package/dist/word/semantic/chapter.js +25 -12
- package/dist/word/semantic/chapter.js.map +1 -1
- package/dist/word/semantic/constructs.test.js +37 -13
- package/dist/word/semantic/constructs.test.js.map +1 -1
- package/dist/word/semantic/containers.d.ts +10 -0
- package/dist/word/semantic/containers.d.ts.map +1 -1
- package/dist/word/semantic/containers.js +228 -16
- package/dist/word/semantic/containers.js.map +1 -1
- package/dist/word/semantic/context.d.ts +27 -1
- 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 +42 -0
- package/dist/word/semantic/design/bands.d.ts.map +1 -0
- package/dist/word/semantic/design/bands.js +140 -0
- package/dist/word/semantic/design/bands.js.map +1 -0
- package/dist/word/semantic/design/columns.d.ts +32 -0
- package/dist/word/semantic/design/columns.d.ts.map +1 -0
- package/dist/word/semantic/design/columns.js +108 -0
- package/dist/word/semantic/design/columns.js.map +1 -0
- package/dist/word/semantic/design/design.test.d.ts +2 -0
- package/dist/word/semantic/design/design.test.d.ts.map +1 -0
- package/dist/word/semantic/design/design.test.js +141 -0
- package/dist/word/semantic/design/design.test.js.map +1 -0
- package/dist/word/semantic/design/geometry.d.ts +36 -0
- package/dist/word/semantic/design/geometry.d.ts.map +1 -0
- package/dist/word/semantic/design/geometry.js +108 -0
- package/dist/word/semantic/design/geometry.js.map +1 -0
- package/dist/word/semantic/design/heading.d.ts +24 -0
- package/dist/word/semantic/design/heading.d.ts.map +1 -0
- package/dist/word/semantic/design/heading.js +108 -0
- package/dist/word/semantic/design/heading.js.map +1 -0
- package/dist/word/semantic/design/hide.d.ts +3 -0
- package/dist/word/semantic/design/hide.d.ts.map +1 -0
- package/dist/word/semantic/design/hide.js +20 -0
- package/dist/word/semantic/design/hide.js.map +1 -0
- package/dist/word/semantic/design/ink.d.ts +6 -0
- package/dist/word/semantic/design/ink.d.ts.map +1 -0
- package/dist/word/semantic/design/ink.js +16 -0
- package/dist/word/semantic/design/ink.js.map +1 -0
- package/dist/word/semantic/design/part.d.ts +13 -0
- package/dist/word/semantic/design/part.d.ts.map +1 -0
- package/dist/word/semantic/design/part.js +69 -0
- package/dist/word/semantic/design/part.js.map +1 -0
- package/dist/word/semantic/design/partBody.d.ts +23 -0
- package/dist/word/semantic/design/partBody.d.ts.map +1 -0
- package/dist/word/semantic/design/partBody.js +62 -0
- package/dist/word/semantic/design/partBody.js.map +1 -0
- package/dist/word/semantic/design/partColor.d.ts +42 -0
- package/dist/word/semantic/design/partColor.d.ts.map +1 -0
- package/dist/word/semantic/design/partColor.js +93 -0
- package/dist/word/semantic/design/partColor.js.map +1 -0
- package/dist/word/semantic/design/pictures.d.ts +23 -0
- package/dist/word/semantic/design/pictures.d.ts.map +1 -0
- package/dist/word/semantic/design/pictures.js +99 -0
- package/dist/word/semantic/design/pictures.js.map +1 -0
- package/dist/word/semantic/design/placedPicture.d.ts +15 -0
- package/dist/word/semantic/design/placedPicture.d.ts.map +1 -0
- package/dist/word/semantic/design/placedPicture.js +53 -0
- package/dist/word/semantic/design/placedPicture.js.map +1 -0
- package/dist/word/semantic/design/round3.test.d.ts +2 -0
- package/dist/word/semantic/design/round3.test.d.ts.map +1 -0
- package/dist/word/semantic/design/round3.test.js +249 -0
- package/dist/word/semantic/design/round3.test.js.map +1 -0
- package/dist/word/semantic/design/round4.test.d.ts +2 -0
- package/dist/word/semantic/design/round4.test.d.ts.map +1 -0
- package/dist/word/semantic/design/round4.test.js +201 -0
- package/dist/word/semantic/design/round4.test.js.map +1 -0
- package/dist/word/semantic/design/round4b.test.d.ts +2 -0
- package/dist/word/semantic/design/round4b.test.d.ts.map +1 -0
- package/dist/word/semantic/design/round4b.test.js +128 -0
- package/dist/word/semantic/design/round4b.test.js.map +1 -0
- package/dist/word/semantic/design/rows.d.ts +34 -0
- package/dist/word/semantic/design/rows.d.ts.map +1 -0
- package/dist/word/semantic/design/rows.js +115 -0
- package/dist/word/semantic/design/rows.js.map +1 -0
- package/dist/word/semantic/design/text.d.ts +38 -0
- package/dist/word/semantic/design/text.d.ts.map +1 -0
- package/dist/word/semantic/design/text.js +193 -0
- package/dist/word/semantic/design/text.js.map +1 -0
- package/dist/word/semantic/design/values.d.ts +24 -0
- package/dist/word/semantic/design/values.d.ts.map +1 -0
- package/dist/word/semantic/design/values.js +143 -0
- package/dist/word/semantic/design/values.js.map +1 -0
- package/dist/word/semantic/design/write.d.ts +39 -0
- package/dist/word/semantic/design/write.d.ts.map +1 -0
- package/dist/word/semantic/design/write.js +366 -0
- package/dist/word/semantic/design/write.js.map +1 -0
- package/dist/word/semantic/directives.d.ts +13 -0
- package/dist/word/semantic/directives.d.ts.map +1 -0
- package/dist/word/semantic/directives.js +104 -0
- package/dist/word/semantic/directives.js.map +1 -0
- package/dist/word/semantic/directives.test.d.ts +2 -0
- package/dist/word/semantic/directives.test.d.ts.map +1 -0
- package/dist/word/semantic/directives.test.js +157 -0
- package/dist/word/semantic/directives.test.js.map +1 -0
- package/dist/word/semantic/engineNumbers.d.ts +12 -4
- package/dist/word/semantic/engineNumbers.d.ts.map +1 -1
- package/dist/word/semantic/engineNumbers.js +16 -5
- package/dist/word/semantic/engineNumbers.js.map +1 -1
- package/dist/word/semantic/exercises/exerciseBody.d.ts +48 -0
- package/dist/word/semantic/exercises/exerciseBody.d.ts.map +1 -0
- package/dist/word/semantic/exercises/exerciseBody.js +339 -0
- package/dist/word/semantic/exercises/exerciseBody.js.map +1 -0
- package/dist/word/semantic/exercises/exercises.d.ts +26 -0
- package/dist/word/semantic/exercises/exercises.d.ts.map +1 -0
- package/dist/word/semantic/exercises/exercises.js +245 -0
- package/dist/word/semantic/exercises/exercises.js.map +1 -0
- package/dist/word/semantic/exercises/exercises.test.d.ts +2 -0
- package/dist/word/semantic/exercises/exercises.test.d.ts.map +1 -0
- package/dist/word/semantic/exercises/exercises.test.js +96 -0
- package/dist/word/semantic/exercises/exercises.test.js.map +1 -0
- package/dist/word/semantic/fields.d.ts +15 -0
- package/dist/word/semantic/fields.d.ts.map +1 -0
- package/dist/word/semantic/fields.js +211 -0
- package/dist/word/semantic/fields.js.map +1 -0
- package/dist/word/semantic/fixtures/harness.d.ts +5 -0
- package/dist/word/semantic/fixtures/harness.d.ts.map +1 -1
- package/dist/word/semantic/fixtures/harness.js +10 -0
- package/dist/word/semantic/fixtures/harness.js.map +1 -1
- package/dist/word/semantic/generated.d.ts +21 -0
- package/dist/word/semantic/generated.d.ts.map +1 -0
- package/dist/word/semantic/generated.js +43 -0
- package/dist/word/semantic/generated.js.map +1 -0
- package/dist/word/semantic/index.d.ts +6 -0
- package/dist/word/semantic/index.d.ts.map +1 -1
- package/dist/word/semantic/index.js +43 -10
- package/dist/word/semantic/index.js.map +1 -1
- package/dist/word/semantic/inline.d.ts +11 -0
- package/dist/word/semantic/inline.d.ts.map +1 -1
- package/dist/word/semantic/inline.js +140 -11
- package/dist/word/semantic/inline.js.map +1 -1
- package/dist/word/semantic/inspect.d.ts.map +1 -1
- package/dist/word/semantic/inspect.js +24 -1
- package/dist/word/semantic/inspect.js.map +1 -1
- package/dist/word/semantic/layout/breaks.d.ts +17 -0
- package/dist/word/semantic/layout/breaks.d.ts.map +1 -0
- package/dist/word/semantic/layout/breaks.js +80 -0
- package/dist/word/semantic/layout/breaks.js.map +1 -0
- package/dist/word/semantic/layout/layout.test.d.ts +2 -0
- package/dist/word/semantic/layout/layout.test.d.ts.map +1 -0
- package/dist/word/semantic/layout/layout.test.js +171 -0
- package/dist/word/semantic/layout/layout.test.js.map +1 -0
- package/dist/word/semantic/layout/pageSpan.d.ts +35 -0
- package/dist/word/semantic/layout/pageSpan.d.ts.map +1 -0
- package/dist/word/semantic/layout/pageSpan.js +217 -0
- package/dist/word/semantic/layout/pageSpan.js.map +1 -0
- package/dist/word/semantic/layout/review.test.d.ts +2 -0
- package/dist/word/semantic/layout/review.test.d.ts.map +1 -0
- package/dist/word/semantic/layout/review.test.js +113 -0
- package/dist/word/semantic/layout/review.test.js.map +1 -0
- package/dist/word/semantic/math.d.ts +7 -0
- package/dist/word/semantic/math.d.ts.map +1 -0
- package/dist/word/semantic/math.js +44 -0
- package/dist/word/semantic/math.js.map +1 -0
- package/dist/word/semantic/media/bottomBoxes.d.ts +6 -0
- package/dist/word/semantic/media/bottomBoxes.d.ts.map +1 -0
- package/dist/word/semantic/media/bottomBoxes.js +69 -0
- package/dist/word/semantic/media/bottomBoxes.js.map +1 -0
- package/dist/word/semantic/media/captions.d.ts +31 -0
- package/dist/word/semantic/media/captions.d.ts.map +1 -0
- package/dist/word/semantic/media/captions.js +143 -0
- package/dist/word/semantic/media/captions.js.map +1 -0
- package/dist/word/semantic/media/code.d.ts +6 -0
- package/dist/word/semantic/media/code.d.ts.map +1 -0
- package/dist/word/semantic/media/code.js +76 -0
- package/dist/word/semantic/media/code.js.map +1 -0
- package/dist/word/semantic/media/comics.d.ts +18 -0
- package/dist/word/semantic/media/comics.d.ts.map +1 -0
- package/dist/word/semantic/media/comics.js +152 -0
- package/dist/word/semantic/media/comics.js.map +1 -0
- package/dist/word/semantic/media/figures.d.ts +26 -0
- package/dist/word/semantic/media/figures.d.ts.map +1 -0
- package/dist/word/semantic/media/figures.js +246 -0
- package/dist/word/semantic/media/figures.js.map +1 -0
- package/dist/word/semantic/media/floated.d.ts +19 -0
- package/dist/word/semantic/media/floated.d.ts.map +1 -0
- package/dist/word/semantic/media/floated.js +81 -0
- package/dist/word/semantic/media/floated.js.map +1 -0
- package/dist/word/semantic/media/floated.test.d.ts +2 -0
- package/dist/word/semantic/media/floated.test.d.ts.map +1 -0
- package/dist/word/semantic/media/floated.test.js +175 -0
- package/dist/word/semantic/media/floated.test.js.map +1 -0
- package/dist/word/semantic/media/frames.d.ts +32 -0
- package/dist/word/semantic/media/frames.d.ts.map +1 -0
- package/dist/word/semantic/media/frames.js +138 -0
- package/dist/word/semantic/media/frames.js.map +1 -0
- package/dist/word/semantic/media/media.test.d.ts +2 -0
- package/dist/word/semantic/media/media.test.d.ts.map +1 -0
- package/dist/word/semantic/media/media.test.js +156 -0
- package/dist/word/semantic/media/media.test.js.map +1 -0
- package/dist/word/semantic/media/pageOpener.d.ts +18 -0
- package/dist/word/semantic/media/pageOpener.d.ts.map +1 -0
- package/dist/word/semantic/media/pageOpener.js +207 -0
- package/dist/word/semantic/media/pageOpener.js.map +1 -0
- package/dist/word/semantic/media/pages.d.ts +36 -0
- package/dist/word/semantic/media/pages.d.ts.map +1 -0
- package/dist/word/semantic/media/pages.js +256 -0
- package/dist/word/semantic/media/pages.js.map +1 -0
- package/dist/word/semantic/media/pages.test.d.ts +2 -0
- package/dist/word/semantic/media/pages.test.d.ts.map +1 -0
- package/dist/word/semantic/media/pages.test.js +189 -0
- package/dist/word/semantic/media/pages.test.js.map +1 -0
- package/dist/word/semantic/media/round4.test.d.ts +2 -0
- package/dist/word/semantic/media/round4.test.d.ts.map +1 -0
- package/dist/word/semantic/media/round4.test.js +187 -0
- package/dist/word/semantic/media/round4.test.js.map +1 -0
- package/dist/word/semantic/media/scores.d.ts +10 -0
- package/dist/word/semantic/media/scores.d.ts.map +1 -0
- package/dist/word/semantic/media/scores.js +71 -0
- package/dist/word/semantic/media/scores.js.map +1 -0
- package/dist/word/semantic/media/strip.d.ts +10 -0
- package/dist/word/semantic/media/strip.d.ts.map +1 -0
- package/dist/word/semantic/media/strip.js +80 -0
- package/dist/word/semantic/media/strip.js.map +1 -0
- package/dist/word/semantic/media/video.d.ts +9 -0
- package/dist/word/semantic/media/video.d.ts.map +1 -0
- package/dist/word/semantic/media/video.js +51 -0
- package/dist/word/semantic/media/video.js.map +1 -0
- package/dist/word/semantic/numbering.d.ts +21 -4
- package/dist/word/semantic/numbering.d.ts.map +1 -1
- package/dist/word/semantic/numbering.js +136 -23
- package/dist/word/semantic/numbering.js.map +1 -1
- package/dist/word/semantic/page/composed.d.ts +16 -0
- package/dist/word/semantic/page/composed.d.ts.map +1 -0
- package/dist/word/semantic/page/composed.js +28 -0
- package/dist/word/semantic/page/composed.js.map +1 -0
- package/dist/word/semantic/page/furniture.d.ts +37 -0
- package/dist/word/semantic/page/furniture.d.ts.map +1 -0
- package/dist/word/semantic/page/furniture.js +328 -0
- package/dist/word/semantic/page/furniture.js.map +1 -0
- package/dist/word/semantic/page/margin.d.ts +14 -0
- package/dist/word/semantic/page/margin.d.ts.map +1 -0
- package/dist/word/semantic/page/margin.js +64 -0
- package/dist/word/semantic/page/margin.js.map +1 -0
- package/dist/word/semantic/page/notes.d.ts +16 -0
- package/dist/word/semantic/page/notes.d.ts.map +1 -0
- package/dist/word/semantic/page/notes.js +72 -0
- package/dist/word/semantic/page/notes.js.map +1 -0
- package/dist/word/semantic/page/page.test.d.ts +2 -0
- package/dist/word/semantic/page/page.test.d.ts.map +1 -0
- package/dist/word/semantic/page/page.test.js +142 -0
- package/dist/word/semantic/page/page.test.js.map +1 -0
- package/dist/word/semantic/page/paragraph.d.ts +35 -0
- package/dist/word/semantic/page/paragraph.d.ts.map +1 -0
- package/dist/word/semantic/page/paragraph.js +103 -0
- package/dist/word/semantic/page/paragraph.js.map +1 -0
- package/dist/word/semantic/page/place.d.ts +35 -0
- package/dist/word/semantic/page/place.d.ts.map +1 -0
- package/dist/word/semantic/page/place.js +89 -0
- package/dist/word/semantic/page/place.js.map +1 -0
- package/dist/word/semantic/page/round4.test.d.ts +2 -0
- package/dist/word/semantic/page/round4.test.d.ts.map +1 -0
- package/dist/word/semantic/page/round4.test.js +202 -0
- package/dist/word/semantic/page/round4.test.js.map +1 -0
- package/dist/word/semantic/page/settings.d.ts +11 -0
- package/dist/word/semantic/page/settings.d.ts.map +1 -0
- package/dist/word/semantic/page/settings.js +39 -0
- package/dist/word/semantic/page/settings.js.map +1 -0
- package/dist/word/semantic/prose/caption.d.ts +13 -0
- package/dist/word/semantic/prose/caption.d.ts.map +1 -0
- package/dist/word/semantic/prose/caption.js +39 -0
- package/dist/word/semantic/prose/caption.js.map +1 -0
- package/dist/word/semantic/prose/chips.d.ts +13 -0
- package/dist/word/semantic/prose/chips.d.ts.map +1 -0
- package/dist/word/semantic/prose/chips.js +60 -0
- package/dist/word/semantic/prose/chips.js.map +1 -0
- package/dist/word/semantic/prose/flush.d.ts +14 -0
- package/dist/word/semantic/prose/flush.d.ts.map +1 -0
- package/dist/word/semantic/prose/flush.js +34 -0
- package/dist/word/semantic/prose/flush.js.map +1 -0
- package/dist/word/semantic/prose/listSpacing.d.ts +7 -0
- package/dist/word/semantic/prose/listSpacing.d.ts.map +1 -0
- package/dist/word/semantic/prose/listSpacing.js +29 -0
- package/dist/word/semantic/prose/listSpacing.js.map +1 -0
- package/dist/word/semantic/prose/paragraphStyle.d.ts +57 -0
- package/dist/word/semantic/prose/paragraphStyle.d.ts.map +1 -0
- package/dist/word/semantic/prose/paragraphStyle.js +125 -0
- package/dist/word/semantic/prose/paragraphStyle.js.map +1 -0
- package/dist/word/semantic/prose/prose.test.d.ts +2 -0
- package/dist/word/semantic/prose/prose.test.d.ts.map +1 -0
- package/dist/word/semantic/prose/prose.test.js +124 -0
- package/dist/word/semantic/prose/prose.test.js.map +1 -0
- package/dist/word/semantic/prose/tabs.d.ts +7 -0
- package/dist/word/semantic/prose/tabs.d.ts.map +1 -0
- package/dist/word/semantic/prose/tabs.js +25 -0
- package/dist/word/semantic/prose/tabs.js.map +1 -0
- package/dist/word/semantic/prose/text4.test.d.ts +2 -0
- package/dist/word/semantic/prose/text4.test.d.ts.map +1 -0
- package/dist/word/semantic/prose/text4.test.js +174 -0
- package/dist/word/semantic/prose/text4.test.js.map +1 -0
- package/dist/word/semantic/prose/tocEntry.d.ts +32 -0
- package/dist/word/semantic/prose/tocEntry.d.ts.map +1 -0
- package/dist/word/semantic/prose/tocEntry.js +68 -0
- package/dist/word/semantic/prose/tocEntry.js.map +1 -0
- package/dist/word/semantic/review.test.js +4 -1
- package/dist/word/semantic/review.test.js.map +1 -1
- package/dist/word/semantic/sections.d.ts +48 -3
- package/dist/word/semantic/sections.d.ts.map +1 -1
- package/dist/word/semantic/sections.js +133 -33
- package/dist/word/semantic/sections.js.map +1 -1
- package/dist/word/semantic/snippet.d.ts +2 -2
- package/dist/word/semantic/snippet.d.ts.map +1 -1
- package/dist/word/semantic/snippet.js +3 -2
- package/dist/word/semantic/snippet.js.map +1 -1
- package/dist/word/semantic/strikethrough.test.d.ts +2 -0
- package/dist/word/semantic/strikethrough.test.d.ts.map +1 -0
- package/dist/word/semantic/strikethrough.test.js +17 -0
- package/dist/word/semantic/strikethrough.test.js.map +1 -0
- package/dist/word/semantic/styles.d.ts +84 -7
- package/dist/word/semantic/styles.d.ts.map +1 -1
- package/dist/word/semantic/styles.js +261 -47
- package/dist/word/semantic/styles.js.map +1 -1
- package/dist/word/semantic/styling.test.d.ts +2 -0
- package/dist/word/semantic/styling.test.d.ts.map +1 -0
- package/dist/word/semantic/styling.test.js +283 -0
- package/dist/word/semantic/styling.test.js.map +1 -0
- package/dist/word/semantic/table/rules.d.ts +18 -0
- package/dist/word/semantic/table/rules.d.ts.map +1 -0
- package/dist/word/semantic/table/rules.js +44 -0
- package/dist/word/semantic/table/rules.js.map +1 -0
- package/dist/word/semantic/table/styles.d.ts +16 -0
- package/dist/word/semantic/table/styles.d.ts.map +1 -0
- package/dist/word/semantic/table/styles.js +62 -0
- package/dist/word/semantic/table/styles.js.map +1 -0
- package/dist/word/semantic/table/tables.test.d.ts +2 -0
- package/dist/word/semantic/table/tables.test.d.ts.map +1 -0
- package/dist/word/semantic/table/tables.test.js +286 -0
- package/dist/word/semantic/table/tables.test.js.map +1 -0
- package/dist/word/semantic/table/widths.d.ts +20 -0
- package/dist/word/semantic/table/widths.d.ts.map +1 -0
- package/dist/word/semantic/table/widths.js +72 -0
- package/dist/word/semantic/table/widths.js.map +1 -0
- package/dist/word/semantic/tables.d.ts +3 -0
- package/dist/word/semantic/tables.d.ts.map +1 -1
- package/dist/word/semantic/tables.js +133 -59
- package/dist/word/semantic/tables.js.map +1 -1
- package/dist/word/semantic/verse.d.ts +13 -0
- package/dist/word/semantic/verse.d.ts.map +1 -0
- package/dist/word/semantic/verse.js +142 -0
- package/dist/word/semantic/verse.js.map +1 -0
- package/dist/word/semantic/wml.d.ts +15 -1
- package/dist/word/semantic/wml.d.ts.map +1 -1
- package/dist/word/semantic/wml.js +21 -6
- package/dist/word/semantic/wml.js.map +1 -1
- package/dist/word/svg/glyphs.d.ts +25 -0
- package/dist/word/svg/glyphs.d.ts.map +1 -0
- package/dist/word/svg/glyphs.js +218 -0
- package/dist/word/svg/glyphs.js.map +1 -0
- package/dist/word/svg/svg.test.d.ts +2 -0
- package/dist/word/svg/svg.test.d.ts.map +1 -0
- package/dist/word/svg/svg.test.js +65 -0
- package/dist/word/svg/svg.test.js.map +1 -0
- package/dist/word/svg/text.d.ts +23 -0
- package/dist/word/svg/text.d.ts.map +1 -0
- package/dist/word/svg/text.js +202 -0
- package/dist/word/svg/text.js.map +1 -0
- package/package.json +5 -1
- package/dist/word/semantic/figures.d.ts +0 -8
- package/dist/word/semantic/figures.d.ts.map +0 -1
- package/dist/word/semantic/figures.js +0 -175
- package/dist/word/semantic/figures.js.map +0 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ommlToTex } from '../omml.js';
|
|
2
2
|
import { child, attr, onOff, children, localName, textOf, descendants } from '../xml.js';
|
|
3
3
|
import { runFlags, readTabs, readXml, readRels } from './parts.js';
|
|
4
|
+
import { numberedEquation } from './equations.js';
|
|
4
5
|
/** XE field: `XE "Term:Sub" \b \t "See X"`. */
|
|
5
6
|
function parseIndexField(instr) {
|
|
6
7
|
const m = /^\s*XE\s+"((?:[^"\\]|\\.)*)"(.*)$/i.exec(instr);
|
|
@@ -266,14 +267,17 @@ function readParagraph(p, ctx) {
|
|
|
266
267
|
const runs = [];
|
|
267
268
|
const boxes = [];
|
|
268
269
|
readParagraphContent(p, ctx, runs, undefined, false, boxes);
|
|
270
|
+
// An equation numbered at a tab stop is a display equation with a \tag:
|
|
271
|
+
// its tabs and alignment only placed the number.
|
|
272
|
+
const equation = numberedEquation(runs, styleId);
|
|
269
273
|
const para = {
|
|
270
274
|
type: 'paragraph',
|
|
271
275
|
styleId,
|
|
272
|
-
runs,
|
|
276
|
+
runs: equation ?? runs,
|
|
273
277
|
...(list ? { list } : {}),
|
|
274
278
|
...(onOff(child(pPr, 'pageBreakBefore')) ? { pageBreakBefore: true } : {}),
|
|
275
|
-
...(manualLayout ? { manualLayout } : {}),
|
|
276
|
-
...(child(pPr, 'tabs') ? { tabs: readTabs(pPr) } : {}),
|
|
279
|
+
...(manualLayout && !equation ? { manualLayout } : {}),
|
|
280
|
+
...(child(pPr, 'tabs') && !equation ? { tabs: readTabs(pPr) } : {}),
|
|
277
281
|
...(boxes.length ? { textBoxes: boxes } : {}),
|
|
278
282
|
};
|
|
279
283
|
// A paragraph whose mark is a tracked deletion merges into the next one;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"body.js","sourceRoot":"","sources":["../../../src/word/docxRead/body.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"body.js","sourceRoot":"","sources":["../../../src/word/docxRead/body.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAmB,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC1G,OAAO,EAAqB,QAAQ,EAAE,QAAQ,EAAc,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAClG,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAclD,+CAA+C;AAC/C,SAAS,eAAe,CAAC,KAAa;IACpC,MAAM,CAAC,GAAG,oCAAoC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3D,IAAI,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3F,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACxC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACxB,MAAM,GAAG,GAAG,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACxD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,SAAS,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,yBAAyB,EAAE,EAAE,CAAC,EAAE,CAAC;AAC1H,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACnC,MAAM,CAAC,GAAG,4BAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACtD,CAAC;AAED,SAAS,WAAW,CAAC,GAA2B;IAC9C,IAAI,CAAC,GAAG;QAAE,OAAO,KAAK,CAAC;IACvB,KAAK,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,CAAC;QAChG,MAAM,EAAE,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACzB,IAAI,CAAC,EAAE;YAAE,SAAS;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,MAAM;YAAE,SAAS;QACtD,IAAI,CAAC,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,CAAC,IAAI,IAAI,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC;YAAE,SAAS;QACzG,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,OAAO,CAAC,CAAa,EAAE,GAAgB,EAAE,IAAwB,EAAE,GAAc,EAAE,OAAgB;IAC1G,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5B,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC5B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,IAAI,IAAI,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7F,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,IAAI,SAAS,CAAC;IACxD,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC;IAC7C,2EAA2E;IAC3E,MAAM,MAAM,GAAG,GAAY,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC;IACzE,MAAM,IAAI,GAAG,CAAC,CAAS,EAAQ,EAAE;QAC/B,IAAI,CAAC,CAAC,IAAI,OAAO,IAAI,MAAM,EAAE;YAAE,OAAO;QACtC,MAAM,SAAS,GAAG,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC;QAC9F,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACjC,MAAM,GAAG,GAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QACjH,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC;YAAE,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC;;YACrE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC,CAAC;IACF,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5B,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAChD,QAAQ,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,KAAK,GAAG;gBACN,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;gBAChB,MAAM;YACR,KAAK,SAAS;gBACZ,MAAM;YACR,KAAK,WAAW;gBACd,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,MAAM;oBAAE,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC9D,MAAM;YACR,KAAK,SAAS,CAAC,CAAC,CAAC;gBACf,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;gBACpC,IAAI,IAAI,KAAK,OAAO;oBAAE,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;qBAC/D,IAAI,IAAI,KAAK,UAAU,IAAI,KAAK,EAAE,CAAC;oBACtC,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC;oBACvB,KAAK,CAAC,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC3C,CAAC;qBAAM,IAAI,IAAI,KAAK,KAAK,IAAI,KAAK,EAAE,CAAC;oBACnC,IAAI,KAAK,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;wBAC3B,kEAAkE;wBAClE,MAAM,EAAE,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBACxC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;wBACjB,IAAI,EAAE,IAAI,CAAC,OAAO;4BAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACnC,CAAC;;wBAAM,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;gBAC1B,CAAC;gBACD,MAAM;YACR,CAAC;YACD,KAAK,KAAK,CAAC;YACX,KAAK,MAAM;gBACT,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,EAAE;oBAAE,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;gBACrD,MAAM;YACR,KAAK,IAAI,CAAC;YACV,KAAK,IAAI,CAAC,CAAC,CAAC;gBACV,IAAI,OAAO,IAAI,MAAM,EAAE;oBAAE,MAAM;gBAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;gBAC7B,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;gBACpG,MAAM;YACR,CAAC;YACD,KAAK,eAAe;gBAClB,IAAI,CAAC,GAAG,CAAC,CAAC;gBACV,MAAM;YACR,KAAK,YAAY;gBACf,IAAI,CAAC,GAAG,CAAC,CAAC;gBACV,MAAM;YACR,KAAK,KAAK,CAAC,CAAC,CAAC;gBACX,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;gBAC7B,IAAI,IAAI,EAAE,CAAC;oBACT,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAC7B,kEAAkE;oBAClE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,MAAM,IAAI,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC1E,CAAC;gBACD,MAAM;YACR,CAAC;YACD,KAAK,mBAAmB,CAAC;YACzB,KAAK,kBAAkB,CAAC,CAAC,CAAC;gBACxB,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;gBACzB,IAAI,EAAE,IAAI,CAAC,OAAO;oBAAE,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,mBAAmB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC7H,MAAM;YACR,CAAC;YACD,KAAK,SAAS,CAAC;YACf,KAAK,MAAM,CAAC;YACZ,KAAK,QAAQ;gBACX,IAAI,CAAC,OAAO;oBAAE,WAAW,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;gBAClC,MAAM;YACR,KAAK,kBAAkB,CAAC,CAAC,CAAC;gBACxB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;gBAC1D,IAAI,MAAM,IAAI,CAAC,OAAO;oBAAE,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBACjD,MAAM;YACR,CAAC;YACD;gBACE,MAAM;QACV,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,CAAc,EAAE,CAAc;IAChD,OAAO,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;WACpG,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;AAC1G,CAAC;AAED,SAAS,WAAW,CAAC,EAAc,EAAE,GAAc;IACjD,MAAM,KAAK,GAAG,CAAC,GAAG,WAAW,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,GAAG,WAAW,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC;IAC5E,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,WAAW,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,MAAM,GAAG,GAAG,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QACtE,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,GAAG,CAAC,IAAI,CAAC;YACP,IAAI,EAAE,OAAO;YACb,GAAG;YACH,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI;YACvB,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,SAAS;YAC1D,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;YACtD,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;SACxD,CAAC,CAAC;QACH,MAAM;IACR,CAAC;AACH,CAAC;AAED;8BAC8B;AAC9B,SAAS,eAAe,CAAC,EAAc,EAAE,MAAoB,EAAE;IAC7D,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,IAAI,KAAK,kBAAkB,EAAE,CAAC;YAChC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;YAC1D,IAAI,MAAM;gBAAE,eAAe,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC3C,CAAC;aAAM,IAAI,IAAI,KAAK,aAAa;YAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;;YAC1C,eAAe,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,oBAAoB,CAAC,EAAc,EAAE,GAAgB,EAAE,GAAc,EAAE,IAAwB,EAAE,OAAgB,EAAE,KAAkB;IAC5I,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC/B,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,GAAG;gBACN,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;gBACpC,4DAA4D;gBAC5D,IAAI,CAAC,OAAO;oBAAE,KAAK,MAAM,GAAG,IAAI,eAAe,CAAC,CAAC,CAAC;wBAAE,KAAK,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;gBACxF,MAAM;YACR,KAAK,WAAW,CAAC,CAAC,CAAC;gBACjB,MAAM,GAAG,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC5B,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAChD,oBAAoB,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;gBACrF,MAAM;YACR,CAAC;YACD,KAAK,KAAK,CAAC;YACX,KAAK,QAAQ;gBACX,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;gBAC3B,oBAAoB,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;gBACxD,MAAM;YACR,KAAK,KAAK,CAAC;YACX,KAAK,UAAU;gBACb,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;gBAC1B,oBAAoB,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;gBACrD,MAAM;YACR,KAAK,UAAU,CAAC;YAChB,KAAK,WAAW,CAAC;YACjB,KAAK,KAAK,CAAC;YACX,KAAK,YAAY,CAAC;YAClB,KAAK,WAAW,CAAC,CAAC,CAAC;gBACjB,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;oBACzB,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;oBACrC,MAAM,EAAE,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;oBAClC,IAAI,EAAE,EAAE,CAAC;wBACP,IAAI,CAAC,OAAO;4BAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;wBAC3B,MAAM;oBACR,CAAC;oBACD,oBAAoB,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,cAAc,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;oBACjF,MAAM;gBACR,CAAC;gBACD,oBAAoB,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;gBACvG,MAAM;YACR,CAAC;YACD,KAAK,WAAW;gBACd,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC;oBAAE,IAAI,CAAC,OAAO;wBAAE,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjH,MAAM;YACR,KAAK,OAAO;gBACV,IAAI,CAAC,OAAO;oBAAE,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;gBAC5E,MAAM;YACR,KAAK,mBAAmB;gBACtB,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;gBACzB,MAAM;YACR;gBACE,MAAM;QACV,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,CAAa,EAAE,GAAgB;IACpD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;IACxD,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAClC,IAAI,IAA2B,CAAC;IAChC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;IACjD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,IAAI,KAAK,KAAK,GAAG;YAAE,IAAI,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;IAC5F,CAAC;SAAM,CAAC;QACN,4DAA4D;QAC5D,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACtD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC;YAC7C,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC1B,IAAI,CAAC,CAAC,KAAK,KAAK,GAAG;oBAAE,IAAI,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC;gBAClE,MAAM;YACR,CAAC;YACD,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACxD,CAAC;IACH,CAAC;IACD,MAAM,YAAY,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,IAAI,SAAS,CAAC;IAC7G,MAAM,IAAI,GAAc,EAAE,CAAC;IAC3B,MAAM,KAAK,GAAgB,EAAE,CAAC;IAC9B,oBAAoB,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5D,wEAAwE;IACxE,iDAAiD;IACjD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjD,MAAM,IAAI,GAAkB;QAC1B,IAAI,EAAE,WAAW;QACjB,OAAO;QACP,IAAI,EAAE,QAAQ,IAAI,IAAI;QACtB,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzB,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,GAAG,CAAC,YAAY,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9C,CAAC;IACF,yEAAyE;IACzE,qEAAqE;IACrE,OAAO,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED,SAAS,SAAS,CAAC,GAAe,EAAE,GAAgB;IAClD,MAAM,IAAI,GAAiB,EAAE,CAAC;IAC9B,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,SAAS,GAAG,IAAI,CAAC;IACrB,KAAK,MAAM,EAAE,IAAI,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,GAAG,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,KAAK,IAAI,CAAC;QAC1D,IAAI,QAAQ,IAAI,SAAS;YAAE,UAAU,EAAE,CAAC;;YACnC,SAAS,GAAG,KAAK,CAAC;QACvB,MAAM,GAAG,GAAe,EAAE,CAAC;QAC3B,KAAK,MAAM,EAAE,IAAI,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,GAAG,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/D,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACjC,MAAM,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACzF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;YAC9C,GAAG,CAAC,IAAI,CAAC;gBACP,MAAM,EAAE,UAAU,CAAC,EAAE,EAAE,GAAG,CAAC;gBAC3B,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACrD,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7B,GAAG,CAAC,IAAI,IAAI,IAAI,KAAK,MAAM,IAAI,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC9I,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAChG,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;AACjH,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,SAAqB,EAAE,GAAgB;IAChE,MAAM,GAAG,GAAgB,EAAE,CAAC;IAC5B,MAAM,KAAK,GAAG,CAAC,EAAc,EAAE,OAAO,GAAG,KAAK,EAAQ,EAAE;QACtD,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;YAC7B,QAAQ,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1B,KAAK,GAAG;oBACN,IAAI,CAAC,OAAO;wBAAE,GAAG,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;oBACjD,MAAM;gBACR,KAAK,KAAK;oBACR,IAAI,CAAC,OAAO;wBAAE,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;oBAC1C,MAAM;gBACR,KAAK,KAAK;oBACR,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;oBAC5C,MAAM;gBACR,KAAK,WAAW,CAAC;gBACjB,KAAK,YAAY;oBACf,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;oBAClB,MAAM;gBACR,KAAK,KAAK,CAAC;gBACX,KAAK,QAAQ;oBACX,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;oBAClB,MAAM;gBACR,KAAK,KAAK,CAAC;gBACX,KAAK,UAAU;oBACb,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;oBACf,MAAM;gBACR,KAAK,kBAAkB;oBACrB,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;oBAChE,MAAM;gBACR;oBACE,MAAM;YACV,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IACF,KAAK,CAAC,SAAS,CAAC,CAAC;IACjB,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,KAAY,EAAE,IAAwB,EAAE,GAAgB,EAAE,KAA6B;IAC/G,MAAM,GAAG,GAAG,IAAI,GAAG,EAAuB,CAAC;IAC3C,IAAI,CAAC,IAAI;QAAE,OAAO,GAAG,CAAC;IACtB,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAClC,IAAI,CAAC,IAAI;QAAE,OAAO,GAAG,CAAC;IACtB,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACnC,MAAM,OAAO,GAAgB,EAAE,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IAC1D,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;QACtC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACzB,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAC7B,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,QAAQ,CAAC;YAAE,SAAS;QACjD,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QACtC,sDAAsD;QACtD,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACtB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { WordRun } from '../model.js';
|
|
2
|
+
/** The paragraph's runs as one numbered display equation, or undefined when
|
|
3
|
+
* they are anything else: optional tabs, one equation, at least one tab,
|
|
4
|
+
* then the number and nothing more. */
|
|
5
|
+
export declare function numberedEquation(runs: readonly WordRun[], styleId: string): WordRun[] | undefined;
|
|
6
|
+
//# sourceMappingURL=equations.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"equations.d.ts","sourceRoot":"","sources":["../../../src/word/docxRead/equations.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAc3C;;wCAEwC;AACxC,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,EAAE,GAAG,SAAS,CAyBjG"}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
// Numbered equations set by hand, the way Word users number them and the
|
|
2
|
+
// way the semantic writer exports `\tag{1}` (#1444): a paragraph holding
|
|
3
|
+
// tabs, one equation and, after a tab, its number. Word sees an inline
|
|
4
|
+
// equation there, so the reader would import `$…$` with tab directives and
|
|
5
|
+
// the number as text. Read as a display equation with its `\tag` instead.
|
|
6
|
+
/** The paragraph style the semantic writer gives equations. */
|
|
7
|
+
const EQUATION_STYLE = 'PostextEquation';
|
|
8
|
+
/** `\tag{…}` for a number as Word shows it: `(1)`, `(2.3a)`. Any other
|
|
9
|
+
* label only in a Postext equation paragraph (`\tag*{A}` exports as `A`). */
|
|
10
|
+
function tagFor(label, styleId) {
|
|
11
|
+
const paren = /^\((.+)\)$/.exec(label);
|
|
12
|
+
if (paren && !/[()]/.test(paren[1]))
|
|
13
|
+
return `\\tag{${paren[1]}}`;
|
|
14
|
+
if (styleId === EQUATION_STYLE && /^\S+$/.test(label))
|
|
15
|
+
return `\\tag*{${label}}`;
|
|
16
|
+
return undefined;
|
|
17
|
+
}
|
|
18
|
+
/** The paragraph's runs as one numbered display equation, or undefined when
|
|
19
|
+
* they are anything else: optional tabs, one equation, at least one tab,
|
|
20
|
+
* then the number and nothing more. */
|
|
21
|
+
export function numberedEquation(runs, styleId) {
|
|
22
|
+
let tex;
|
|
23
|
+
let tabAfter = false;
|
|
24
|
+
let label = '';
|
|
25
|
+
for (const r of runs) {
|
|
26
|
+
if (r.type === 'tab') {
|
|
27
|
+
if (tex !== undefined) {
|
|
28
|
+
if (label.trim())
|
|
29
|
+
return undefined;
|
|
30
|
+
tabAfter = true;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
else if (r.type === 'math') {
|
|
34
|
+
if (tex !== undefined)
|
|
35
|
+
return undefined;
|
|
36
|
+
tex = r.tex;
|
|
37
|
+
}
|
|
38
|
+
else if (r.type === 'text') {
|
|
39
|
+
if (tex === undefined || !tabAfter) {
|
|
40
|
+
if (r.text.trim())
|
|
41
|
+
return undefined;
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
44
|
+
label += r.text;
|
|
45
|
+
}
|
|
46
|
+
else
|
|
47
|
+
return undefined;
|
|
48
|
+
}
|
|
49
|
+
if (tex === undefined || !tabAfter)
|
|
50
|
+
return undefined;
|
|
51
|
+
const tag = tagFor(label.trim(), styleId);
|
|
52
|
+
if (!tag)
|
|
53
|
+
return undefined;
|
|
54
|
+
return [{ type: 'math', tex: `${tex.trim()} ${tag}`, display: true }];
|
|
55
|
+
}
|
|
56
|
+
//# sourceMappingURL=equations.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"equations.js","sourceRoot":"","sources":["../../../src/word/docxRead/equations.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,yEAAyE;AACzE,uEAAuE;AACvE,2EAA2E;AAC3E,0EAA0E;AAI1E,+DAA+D;AAC/D,MAAM,cAAc,GAAG,iBAAiB,CAAC;AAEzC;8EAC8E;AAC9E,SAAS,MAAM,CAAC,KAAa,EAAE,OAAe;IAC5C,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvC,IAAI,KAAK,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC;QAAE,OAAO,SAAS,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;IAClE,IAAI,OAAO,KAAK,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,UAAU,KAAK,GAAG,CAAC;IACjF,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;wCAEwC;AACxC,MAAM,UAAU,gBAAgB,CAAC,IAAwB,EAAE,OAAe;IACxE,IAAI,GAAuB,CAAC;IAC5B,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QACrB,IAAI,CAAC,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YACrB,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACtB,IAAI,KAAK,CAAC,IAAI,EAAE;oBAAE,OAAO,SAAS,CAAC;gBACnC,QAAQ,GAAG,IAAI,CAAC;YAClB,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC7B,IAAI,GAAG,KAAK,SAAS;gBAAE,OAAO,SAAS,CAAC;YACxC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC;QACd,CAAC;aAAM,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC7B,IAAI,GAAG,KAAK,SAAS,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE;oBAAE,OAAO,SAAS,CAAC;gBACpC,SAAS;YACX,CAAC;YACD,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC;QAClB,CAAC;;YAAM,OAAO,SAAS,CAAC;IAC1B,CAAC;IACD,IAAI,GAAG,KAAK,SAAS,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IACrD,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAC1C,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAC3B,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AACxE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"display.test.d.ts","sourceRoot":"","sources":["../../../src/word/formatted/display.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { CHIP_PLACEHOLDER } from '../../parse/inlineFormatting.js';
|
|
3
|
+
import { createDocxPackage } from '../ooxml/package.js';
|
|
4
|
+
import { MetricsCache } from './metrics.js';
|
|
5
|
+
import { chunkBox, emitGroups, italicRoom, planChunks, planLines } from './paragraphs.js';
|
|
6
|
+
import { HOLDER, emitRun, wordText } from './runs.js';
|
|
7
|
+
import { SYMBOL_FACE } from './symbols.js';
|
|
8
|
+
import { hasItalicRoom, measuredMarker } from './text.js';
|
|
9
|
+
// A face of 1000 units: letters 500, spaces 250.
|
|
10
|
+
const FACE = (() => {
|
|
11
|
+
const cmap = new Map();
|
|
12
|
+
const advances = [0];
|
|
13
|
+
const add = (cp, adv) => {
|
|
14
|
+
cmap.set(cp, advances.length);
|
|
15
|
+
advances.push(adv);
|
|
16
|
+
};
|
|
17
|
+
for (let c = 0x21; c < 0x7f; c++)
|
|
18
|
+
add(c, 500);
|
|
19
|
+
add(0x20, 250);
|
|
20
|
+
add(0xa0, 250);
|
|
21
|
+
return { unitsPerEm: 1000, cmap, advances };
|
|
22
|
+
})();
|
|
23
|
+
class FakeMetrics extends MetricsCache {
|
|
24
|
+
constructor() {
|
|
25
|
+
super(undefined);
|
|
26
|
+
}
|
|
27
|
+
faceAdvances() {
|
|
28
|
+
return FACE;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
const plan = { faces: [], map: new Map(), warnings: [], altNames: new Map() };
|
|
32
|
+
function context() {
|
|
33
|
+
return {
|
|
34
|
+
pkg: createDocxPackage(), dpi: 72, plan, lang: 'en', metrics: new FakeMetrics(), chapters: [{ id: 'a', markdown: '' }],
|
|
35
|
+
docIndex: 0, fragments: [], nextFragment: 0, parts: new Map(), referenced: new Set(), z: 0,
|
|
36
|
+
warn: () => undefined, resourceBytes: undefined, rasterizeSvg: undefined, media: new Map(),
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
const run = (text, x, width, font = '12px "Lora"', over = {}) => ({ text, x, width, fontString: font, color: '#000', textStart: 0, ...over });
|
|
40
|
+
function lineOf(runs, over = {}) {
|
|
41
|
+
const text = runs.map((r) => r.text).join('');
|
|
42
|
+
const x = runs[0].x;
|
|
43
|
+
const end = Math.max(...runs.map((r) => r.x + r.width));
|
|
44
|
+
return { text, x, width: end - x, baseline: 30, lineHeight: 14, align: 'left', runs, map: [...text].map(() => -1), ...over };
|
|
45
|
+
}
|
|
46
|
+
const item = (role, lines) => ({ kind: 'text', role, bbox: { x: lines[0].x, y: 10, width: lines[0].width, height: 30 }, lines, source: { blockKey: 'b', map: [], generated: true } });
|
|
47
|
+
/** `w:spacing` values of the runs in `xml`. */
|
|
48
|
+
const spacings = (xml) => [...xml.matchAll(/<w:spacing w:val="(-?\d+)"\/>/g)].map((m) => Number(m[1]));
|
|
49
|
+
describe('formatted Word display lines (#1444)', () => {
|
|
50
|
+
it('sets a list marker at its face\'s widths, not letter-spaced to an estimate', () => {
|
|
51
|
+
const ctx = context();
|
|
52
|
+
// The display list gives a marker's runs 0.55 em a character, wider
|
|
53
|
+
// than the face sets them: "ii" (12 px) took 13.2 px, ")" 6.6 px.
|
|
54
|
+
const marker = item('marker', [lineOf([run('ii', 100, 13.2), run(')', 112, 6.6)])]);
|
|
55
|
+
const fixed = measuredMarker(ctx, marker);
|
|
56
|
+
expect(fixed.lines[0].runs.map((r) => r.width)).toEqual([12, 6]);
|
|
57
|
+
expect(fixed.lines[0].width).toBe(18);
|
|
58
|
+
const line = fixed.lines[0];
|
|
59
|
+
const plans = planLines(ctx, [line]);
|
|
60
|
+
const [chunk] = planChunks([line], plans);
|
|
61
|
+
const box = chunkBox(ctx, [line], chunk, plans);
|
|
62
|
+
const out = emitGroups(ctx, fixed, chunk.groups, box.x, box.x + box.width, { offsets: [0] });
|
|
63
|
+
// No letter spacing beyond the twip the run fit rounds away.
|
|
64
|
+
expect(spacings(out.xml).every((s) => Math.abs(s) <= 1)).toBe(true);
|
|
65
|
+
// Other roles keep the engine's widths.
|
|
66
|
+
expect(measuredMarker(ctx, item('body', marker.lines))).toEqual(item('body', marker.lines));
|
|
67
|
+
});
|
|
68
|
+
it('gives an italic display line room for its overhang on both sides', () => {
|
|
69
|
+
const ctx = context();
|
|
70
|
+
const italic = lineOf([run('The Awakening', 50, 300, 'italic 48px "Cormorant"')]);
|
|
71
|
+
expect(italicRoom([italic])).toBe(12);
|
|
72
|
+
expect(italicRoom([lineOf([run('Upright', 50, 100, '48px "Cormorant"')])])).toBe(0);
|
|
73
|
+
const plans = planLines(ctx, [italic]);
|
|
74
|
+
const [chunk] = planChunks([italic], plans);
|
|
75
|
+
const display = chunkBox(ctx, [italic], chunk, plans, true);
|
|
76
|
+
expect(display.x).toBe(50 - 12);
|
|
77
|
+
expect(display.width).toBe(300 + 24);
|
|
78
|
+
// A body line keeps the 2 pt slack.
|
|
79
|
+
const body = chunkBox(ctx, [italic], chunk, plans);
|
|
80
|
+
expect(body.width).toBe(304);
|
|
81
|
+
});
|
|
82
|
+
it('gives a figure label the italic room of a title, not a body line', () => {
|
|
83
|
+
expect(hasItalicRoom('label')).toBe(true);
|
|
84
|
+
expect(hasItalicRoom('heading')).toBe(true);
|
|
85
|
+
expect(hasItalicRoom('body')).toBe(false);
|
|
86
|
+
expect(hasItalicRoom('caption')).toBe(false);
|
|
87
|
+
});
|
|
88
|
+
it('writes an empty chip\'s placeholder as a no-break space, one for one', () => {
|
|
89
|
+
expect(wordText(`end${CHIP_PLACEHOLDER}`)).toBe(`end${HOLDER}`);
|
|
90
|
+
expect(wordText(`a\tb`)).toBe('a b');
|
|
91
|
+
});
|
|
92
|
+
it('sets a symbol the embedded face lacks in a symbol face', () => {
|
|
93
|
+
const ctx = context();
|
|
94
|
+
const r = run('\u2318 Z', 10, 30);
|
|
95
|
+
const out = emitRun(ctx, r, lineOf([r]));
|
|
96
|
+
expect(out.text).toBe('\u2318 Z');
|
|
97
|
+
expect(out.pieces?.map((p) => p.text)).toEqual(['\u2318', ' Z']);
|
|
98
|
+
expect(out.pieces[0].rPr).toContain(`w:ascii="${SYMBOL_FACE}"`);
|
|
99
|
+
expect(out.pieces[1].rPr).not.toContain(SYMBOL_FACE);
|
|
100
|
+
// Fitted from the face's advances: no pair kerning on top of the fit.
|
|
101
|
+
expect(out.pieces[1].rPr).toContain('<w:kern w:val="0"/>');
|
|
102
|
+
// Letters the face lacks are left to the renderer's own fallback.
|
|
103
|
+
expect(emitRun(ctx, run('\u00e9t\u00e9', 10, 30), lineOf([run('\u00e9t\u00e9', 10, 30)])).rPr).not.toContain(SYMBOL_FACE);
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
//# sourceMappingURL=display.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"display.test.js","sourceRoot":"","sources":["../../../src/word/formatted/display.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,10 +40,18 @@ describe('display-list content round-trips through the formatted export (#1406)'
|
|
|
40
40
|
const enter = xml.match(/<w:r>(<w:rPr>(?:(?!<\/w:rPr>).)*<\/w:rPr>)<w:t xml:space="preserve">Ente/);
|
|
41
41
|
expect(enter).not.toBeNull();
|
|
42
42
|
expect(enter[1]).not.toContain('<w:b/>');
|
|
43
|
-
// Its box,
|
|
44
|
-
expect(xml).toMatch(
|
|
43
|
+
// Its box, a plain shape (#1444), and the room before its words.
|
|
44
|
+
expect(xml).toMatch(/<wps:cNvSpPr\/><wps:spPr>(?:(?!<\/wps:spPr>).)*EEEEEE/);
|
|
45
45
|
expect(xml).toMatch(/<w:spacing w:val="\d+"\/>(?:(?!<\/w:r>).)*<w:t xml:space="preserve"> <\/w:t><\/w:r><w:r><w:rPr>(?:(?!<\/w:rPr>).)*<\/w:rPr><w:t xml:space="preserve">Ente/);
|
|
46
46
|
});
|
|
47
|
+
it('an empty chip (an end mark) as a no-break space over its box (#1444)', async () => {
|
|
48
|
+
const cfg = config({ chipStyles: [{ id: 'end', paddingX: pt(4), background: { hex: '#1d5470', model: 'hex' } }] });
|
|
49
|
+
const md = `${LOREM} :chip[ ]{style="end"}\n`;
|
|
50
|
+
const xml = await roundTrip(md, cfg);
|
|
51
|
+
// The engine's private-use stand-in never reaches a run.
|
|
52
|
+
expect(xml).not.toContain('\ue1a0');
|
|
53
|
+
expect(xml).toContain('1D5470');
|
|
54
|
+
});
|
|
47
55
|
it('a word retyped in a chip stays inside its brackets', async () => {
|
|
48
56
|
const cfg = config({ chipStyles: [{ id: 'w', paddingX: pt(2) }] });
|
|
49
57
|
const md = `:::paragraphs\n:chip[GOGGLES]{style="w"} :chip[TOWEL]{style="w"} :chip[BALL]{style="w"}\n:::\n`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"displayRoundTrip.test.js","sourceRoot":"","sources":["../../../src/word/formatted/displayRoundTrip.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"displayRoundTrip.test.js","sourceRoot":"","sources":["../../../src/word/formatted/displayRoundTrip.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,15 @@ export interface AnchorBox {
|
|
|
8
8
|
behind?: boolean;
|
|
9
9
|
name: string;
|
|
10
10
|
descr?: string;
|
|
11
|
+
/** A text box's inked bands (its lines, without the slack around
|
|
12
|
+
* them), px: what a drawing painted later covers only where it lies on
|
|
13
|
+
* them. Absent: the whole box. */
|
|
14
|
+
ink?: DisplayRect[];
|
|
15
|
+
/** A picture's graphic as a shape filled with it, written instead when
|
|
16
|
+
* a shape is later drawn over the picture behind the text
|
|
17
|
+
* (`shapesOverPictures`). Absent for a turned or flipped picture,
|
|
18
|
+
* whose fill LibreOffice would not turn. */
|
|
19
|
+
asShape?: (id: number, cx: number, cy: number) => string;
|
|
11
20
|
}
|
|
12
21
|
/** The point `p` of a frame turned by `deg` clockwise about `c`. */
|
|
13
22
|
export declare function turnPoint(p: {
|
|
@@ -28,27 +37,48 @@ export declare function turnedBox(rect: DisplayRect, c: {
|
|
|
28
37
|
y: number;
|
|
29
38
|
}, deg: number | undefined): DisplayRect;
|
|
30
39
|
/** One `w:r` holding a page-anchored drawing around `graphic` (the
|
|
31
|
-
* `a:graphic` element).
|
|
40
|
+
* `a:graphic` element).
|
|
41
|
+
*
|
|
42
|
+
* Text boxes stand in front of the text layer; every drawing without
|
|
43
|
+
* text (a shape, a picture) goes behind it, in paint order among the
|
|
44
|
+
* others behind (Word and LibreOffice keep `relativeHeight` order there),
|
|
45
|
+
* unless it lies on the ink of text painted before it (a formula over its
|
|
46
|
+
* holder, a mark over a word) or on a drawing kept in front for that
|
|
47
|
+
* reason. LibreOffice imports plain shapes and text boxes as two kinds of
|
|
48
|
+
* frame, loses their `relativeHeight` order and paints a plain shape in
|
|
49
|
+
* front over every text box, so a balloon's fill, a chip's ground or a
|
|
50
|
+
* band in front hid the words written on it (#1406, #1444). */
|
|
32
51
|
export declare function anchorRun(ctx: WriterContext, box: AnchorBox, graphic: (id: number, cx: number, cy: number) => string): string;
|
|
33
52
|
export declare function xfrm(cx: number, cy: number, rotate?: number, flipH?: boolean, flipV?: boolean): string;
|
|
34
|
-
/**
|
|
35
|
-
*
|
|
36
|
-
*
|
|
37
|
-
*
|
|
38
|
-
*
|
|
39
|
-
|
|
40
|
-
/** A Word shape (`wps:wsp`) with its `spPr` children and its text box
|
|
41
|
-
* (empty when `text` is absent) and body properties. */
|
|
53
|
+
/** A Word shape (`wps:wsp`) with its `spPr` children, and its text box
|
|
54
|
+
* and body properties when it holds `text`. A shape with nothing to say
|
|
55
|
+
* is a plain shape, not an empty text box: Word for the web and Word's
|
|
56
|
+
* PDF export hand the text of the boxes on every page after the first to
|
|
57
|
+
* the wrong boxes once empty ones sit among them (chips and callout fills
|
|
58
|
+
* showed a body column's words, columns stood empty, #1444). */
|
|
42
59
|
export declare function shapeGraphic(spPr: string, text?: {
|
|
43
60
|
content: string;
|
|
44
61
|
vert?: 'horz' | 'eaVert';
|
|
45
62
|
}): string;
|
|
46
63
|
/** A text box: no fill, no line, zero insets, no autofit. */
|
|
47
64
|
export declare function textBoxRun(ctx: WriterContext, box: AnchorBox, content: string, vert?: 'horz' | 'eaVert'): string;
|
|
65
|
+
/** The page's runs with every picture a shape covers behind the text
|
|
66
|
+
* written as a shape filled with the picture. LibreOffice paints the
|
|
67
|
+
* pictures behind the text over the shapes behind it, whatever their
|
|
68
|
+
* `relativeHeight` (a balloon or a caption box vanished under its
|
|
69
|
+
* panel); a shape filled with a picture keeps the order. Pictures nothing
|
|
70
|
+
* covers stay pictures, which every reader takes. */
|
|
71
|
+
export declare function shapesOverPictures(ctx: WriterContext, runs: string[]): string[];
|
|
48
72
|
export interface BlipRefs {
|
|
49
73
|
blip: string;
|
|
50
74
|
svg?: string;
|
|
51
75
|
}
|
|
76
|
+
/** A shape filled with a picture: the crop is a fill rectangle reaching
|
|
77
|
+
* past the shape (`fillRect`, 1/1000 % of the shape per side), which
|
|
78
|
+
* LibreOffice honours in a shape's fill where it drops `srcRect`. */
|
|
79
|
+
export declare function pictureShapeGraphic(cx: number, cy: number, refs: BlipRefs, opts: {
|
|
80
|
+
fillRect?: string;
|
|
81
|
+
}): string;
|
|
52
82
|
/** A picture (`pic:pic`) stretched over the box, cropped by `srcRect`
|
|
53
83
|
* (1/1000 % of the picture per side). */
|
|
54
84
|
export declare function pictureGraphic(id: number, cx: number, cy: number, refs: BlipRefs, opts: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drawing.d.ts","sourceRoot":"","sources":["../../../src/word/formatted/drawing.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAOhD,MAAM,WAAW,SAAS;IACxB,qCAAqC;IACrC,IAAI,EAAE,WAAW,CAAC;IAClB,8CAA8C;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"drawing.d.ts","sourceRoot":"","sources":["../../../src/word/formatted/drawing.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,40 +28,66 @@ export function turnedBox(rect, c, deg) {
|
|
|
28
28
|
const centre = turnPoint({ x: rect.x + rect.width / 2, y: rect.y + rect.height / 2 }, c, deg);
|
|
29
29
|
return { x: centre.x - rect.width / 2, y: centre.y - rect.height / 2, width: rect.width, height: rect.height };
|
|
30
30
|
}
|
|
31
|
+
/** Whether two boxes share more than a pixel each way. */
|
|
32
|
+
function overlaps(a, b) {
|
|
33
|
+
return Math.min(a.x + a.width, b.x + b.width) - Math.max(a.x, b.x) > 1 && Math.min(a.y + a.height, b.y + b.height) - Math.max(a.y, b.y) > 1;
|
|
34
|
+
}
|
|
31
35
|
/** One `w:r` holding a page-anchored drawing around `graphic` (the
|
|
32
|
-
* `a:graphic` element).
|
|
36
|
+
* `a:graphic` element).
|
|
37
|
+
*
|
|
38
|
+
* Text boxes stand in front of the text layer; every drawing without
|
|
39
|
+
* text (a shape, a picture) goes behind it, in paint order among the
|
|
40
|
+
* others behind (Word and LibreOffice keep `relativeHeight` order there),
|
|
41
|
+
* unless it lies on the ink of text painted before it (a formula over its
|
|
42
|
+
* holder, a mark over a word) or on a drawing kept in front for that
|
|
43
|
+
* reason. LibreOffice imports plain shapes and text boxes as two kinds of
|
|
44
|
+
* frame, loses their `relativeHeight` order and paints a plain shape in
|
|
45
|
+
* front over every text box, so a balloon's fill, a chip's ground or a
|
|
46
|
+
* band in front hid the words written on it (#1406, #1444). */
|
|
33
47
|
export function anchorRun(ctx, box, graphic) {
|
|
34
48
|
const id = ctx.pkg.nextDrawingId();
|
|
35
49
|
const cx = Math.max(0, emu(box.rect.width, ctx.dpi));
|
|
36
50
|
const cy = Math.max(0, emu(box.rect.height, ctx.dpi));
|
|
37
51
|
const z = Z_BASE + ++ctx.z;
|
|
52
|
+
const body = graphic(id, cx, cy);
|
|
53
|
+
const text = body.includes('txBox="1"');
|
|
54
|
+
const front = (ctx.front ??= []);
|
|
55
|
+
const behind = box.behind ?? (!text && !front.some((r) => overlaps(r, box.rect)));
|
|
56
|
+
if (!behind)
|
|
57
|
+
front.push(...(text ? (box.ink ?? [box.rect]) : [box.rect]));
|
|
58
|
+
const pictures = (ctx.pictures ??= []);
|
|
59
|
+
if (behind && box.asShape)
|
|
60
|
+
pictures.push({ rect: box.rect, pic: body, shape: box.asShape(id, cx, cy) });
|
|
61
|
+
else if (behind && !text)
|
|
62
|
+
for (const p of pictures)
|
|
63
|
+
if (!p.covered && overlaps(p.rect, box.rect))
|
|
64
|
+
p.covered = true;
|
|
38
65
|
const descr = box.descr ? ` descr="${escapeAttr(box.descr)}"` : '';
|
|
39
66
|
return ('<w:r><w:rPr><w:noProof/><w:sz w:val="2"/><w:szCs w:val="2"/></w:rPr><w:drawing>' +
|
|
40
|
-
`<wp:anchor distT="0" distB="0" distL="0" distR="0" simplePos="0" relativeHeight="${z}" behindDoc="${
|
|
67
|
+
`<wp:anchor distT="0" distB="0" distL="0" distR="0" simplePos="0" relativeHeight="${z}" behindDoc="${behind ? 1 : 0}" locked="1" layoutInCell="1" allowOverlap="1">` +
|
|
41
68
|
'<wp:simplePos x="0" y="0"/>' +
|
|
42
69
|
`<wp:positionH relativeFrom="page"><wp:posOffset>${emu(box.rect.x, ctx.dpi)}</wp:posOffset></wp:positionH>` +
|
|
43
70
|
`<wp:positionV relativeFrom="page"><wp:posOffset>${emu(box.rect.y, ctx.dpi)}</wp:posOffset></wp:positionV>` +
|
|
44
71
|
`<wp:extent cx="${cx}" cy="${cy}"/><wp:effectExtent l="0" t="0" r="0" b="0"/><wp:wrapNone/>` +
|
|
45
72
|
`<wp:docPr id="${id}" name="${escapeAttr(box.name)} ${id}"${descr}/><wp:cNvGraphicFramePr/>` +
|
|
46
|
-
|
|
73
|
+
body +
|
|
47
74
|
'</wp:anchor></w:drawing></w:r>');
|
|
48
75
|
}
|
|
49
76
|
export function xfrm(cx, cy, rotate, flipH, flipV) {
|
|
50
77
|
const rot = rotate ? ` rot="${angle(rotate)}"` : '';
|
|
51
78
|
return `<a:xfrm${rot}${flipH ? ' flipH="1"' : ''}${flipV ? ' flipV="1"' : ''}><a:off x="0" y="0"/><a:ext cx="${cx}" cy="${cy}"/></a:xfrm>`;
|
|
52
79
|
}
|
|
53
|
-
/**
|
|
54
|
-
*
|
|
55
|
-
*
|
|
56
|
-
*
|
|
57
|
-
*
|
|
58
|
-
|
|
59
|
-
/** A Word shape (`wps:wsp`) with its `spPr` children and its text box
|
|
60
|
-
* (empty when `text` is absent) and body properties. */
|
|
80
|
+
/** A Word shape (`wps:wsp`) with its `spPr` children, and its text box
|
|
81
|
+
* and body properties when it holds `text`. A shape with nothing to say
|
|
82
|
+
* is a plain shape, not an empty text box: Word for the web and Word's
|
|
83
|
+
* PDF export hand the text of the boxes on every page after the first to
|
|
84
|
+
* the wrong boxes once empty ones sit among them (chips and callout fills
|
|
85
|
+
* showed a body column's words, columns stood empty, #1444). */
|
|
61
86
|
export function shapeGraphic(spPr, text) {
|
|
87
|
+
const box = text !== undefined;
|
|
62
88
|
return (`<a:graphic><a:graphicData uri="${WPS_URI}"><wps:wsp>` +
|
|
63
|
-
`<wps:cNvSpPr txBox="1"/><wps:spPr>${spPr}</wps:spPr>` +
|
|
64
|
-
`<wps:txbx><w:txbxContent>${text
|
|
89
|
+
`<wps:cNvSpPr${box ? ' txBox="1"' : ''}/><wps:spPr>${spPr}</wps:spPr>` +
|
|
90
|
+
(box ? `<wps:txbx><w:txbxContent>${text.content}</w:txbxContent></wps:txbx>` : '') +
|
|
65
91
|
`<wps:bodyPr rot="0" vert="${text?.vert ?? 'horz'}" wrap="square" lIns="0" tIns="0" rIns="0" bIns="0" anchor="t" anchorCtr="0" upright="0"><a:noAutofit/></wps:bodyPr>` +
|
|
66
92
|
'</wps:wsp></a:graphicData></a:graphic>');
|
|
67
93
|
}
|
|
@@ -69,16 +95,57 @@ export function shapeGraphic(spPr, text) {
|
|
|
69
95
|
export function textBoxRun(ctx, box, content, vert) {
|
|
70
96
|
return anchorRun(ctx, box, (_id, cx, cy) => shapeGraphic(`${xfrm(cx, cy, box.rotate)}<a:prstGeom prst="rect"><a:avLst/></a:prstGeom><a:noFill/><a:ln><a:noFill/></a:ln>`, { content, ...(vert ? { vert } : {}) }));
|
|
71
97
|
}
|
|
72
|
-
/**
|
|
73
|
-
*
|
|
74
|
-
|
|
98
|
+
/** The page's runs with every picture a shape covers behind the text
|
|
99
|
+
* written as a shape filled with the picture. LibreOffice paints the
|
|
100
|
+
* pictures behind the text over the shapes behind it, whatever their
|
|
101
|
+
* `relativeHeight` (a balloon or a caption box vanished under its
|
|
102
|
+
* panel); a shape filled with a picture keeps the order. Pictures nothing
|
|
103
|
+
* covers stay pictures, which every reader takes. */
|
|
104
|
+
export function shapesOverPictures(ctx, runs) {
|
|
105
|
+
const all = ctx.pictures ?? [];
|
|
106
|
+
ctx.pictures = [];
|
|
107
|
+
// A picture written as a shape would sink under any earlier picture it
|
|
108
|
+
// lies on, so those are written as shapes too, down the stack.
|
|
109
|
+
for (let i = all.length - 1; i >= 0; i--) {
|
|
110
|
+
if (!all[i].covered)
|
|
111
|
+
continue;
|
|
112
|
+
for (let j = 0; j < i; j++)
|
|
113
|
+
if (overlaps(all[j].rect, all[i].rect))
|
|
114
|
+
all[j].covered = true;
|
|
115
|
+
}
|
|
116
|
+
const covered = all.filter((p) => p.covered);
|
|
117
|
+
if (covered.length === 0)
|
|
118
|
+
return runs;
|
|
119
|
+
return runs.map((r) => {
|
|
120
|
+
for (const p of covered)
|
|
121
|
+
if (r.includes(p.pic))
|
|
122
|
+
return r.replace(p.pic, p.shape);
|
|
123
|
+
return r;
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
function blipXml(refs) {
|
|
75
127
|
const ext = refs.svg
|
|
76
128
|
? `<a:extLst><a:ext uri="{96DAC541-7B7A-43D3-8B79-37D633B846F1}"><asvg:svgBlip r:embed="${refs.svg}"/></a:ext></a:extLst>`
|
|
77
129
|
: '';
|
|
130
|
+
return `<a:blip r:embed="${refs.blip}">${ext}</a:blip>`;
|
|
131
|
+
}
|
|
132
|
+
/** A shape filled with a picture: the crop is a fill rectangle reaching
|
|
133
|
+
* past the shape (`fillRect`, 1/1000 % of the shape per side), which
|
|
134
|
+
* LibreOffice honours in a shape's fill where it drops `srcRect`. */
|
|
135
|
+
export function pictureShapeGraphic(cx, cy, refs, opts) {
|
|
136
|
+
return (`<a:graphic><a:graphicData uri="${WPS_URI}"><wps:wsp><wps:cNvSpPr/><wps:spPr>` +
|
|
137
|
+
`${xfrm(cx, cy)}<a:prstGeom prst="rect"><a:avLst/></a:prstGeom>` +
|
|
138
|
+
`<a:blipFill rotWithShape="1">${blipXml(refs)}<a:stretch>${opts.fillRect ?? '<a:fillRect/>'}</a:stretch></a:blipFill><a:ln><a:noFill/></a:ln></wps:spPr>` +
|
|
139
|
+
'<wps:bodyPr rot="0" vert="horz" wrap="square" lIns="0" tIns="0" rIns="0" bIns="0" anchor="t" anchorCtr="0" upright="0"><a:noAutofit/></wps:bodyPr>' +
|
|
140
|
+
'</wps:wsp></a:graphicData></a:graphic>');
|
|
141
|
+
}
|
|
142
|
+
/** A picture (`pic:pic`) stretched over the box, cropped by `srcRect`
|
|
143
|
+
* (1/1000 % of the picture per side). */
|
|
144
|
+
export function pictureGraphic(id, cx, cy, refs, opts) {
|
|
78
145
|
const descr = opts.descr ? ` descr="${escapeAttr(opts.descr)}"` : '';
|
|
79
146
|
return (`<a:graphic><a:graphicData uri="${PIC_URI}"><pic:pic>` +
|
|
80
147
|
`<pic:nvPicPr><pic:cNvPr id="${id}" name="${escapeAttr(opts.name)}"${descr}/><pic:cNvPicPr><a:picLocks noChangeAspect="1"/></pic:cNvPicPr></pic:nvPicPr>` +
|
|
81
|
-
`<pic:blipFill
|
|
148
|
+
`<pic:blipFill>${blipXml(refs)}${opts.srcRect ?? ''}<a:stretch><a:fillRect/></a:stretch></pic:blipFill>` +
|
|
82
149
|
`<pic:spPr>${xfrm(cx, cy, opts.rotate, opts.flipH)}<a:prstGeom prst="rect"><a:avLst/></a:prstGeom></pic:spPr>` +
|
|
83
150
|
'</pic:pic></a:graphicData></a:graphic>');
|
|
84
151
|
}
|