postext 1.70.5 → 1.70.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/__tests__/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/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/inline.d.ts.map +1 -1
- package/dist/paint/displayList/inline.js +4 -2
- 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 +5 -2
- package/dist/paint/displayList/lines.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 +21 -0
- package/dist/paint/displayList/types.d.ts.map +1 -1
- package/dist/parse/inlineFormatting/markup.d.ts +10 -0
- package/dist/parse/inlineFormatting/markup.d.ts.map +1 -1
- package/dist/parse/inlineFormatting/markup.js +22 -0
- package/dist/parse/inlineFormatting/markup.js.map +1 -1
- package/dist/parse/inlineFormatting/parse.d.ts.map +1 -1
- package/dist/parse/inlineFormatting/parse.js +7 -5
- package/dist/parse/inlineFormatting/parse.js.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 +109 -22
- 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/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 +136 -10
- 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 +50 -0
- package/dist/word/semantic/prose/paragraphStyle.d.ts.map +1 -0
- package/dist/word/semantic/prose/paragraphStyle.js +106 -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/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 +1 -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
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"asteriskFlanking.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/parse/asteriskFlanking.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { parseInlineFormatting, stripInlineFormatting } from '../../parse/inlineFormatting.js';
|
|
3
|
+
import { parseInline } from '../../word/inline.js';
|
|
4
|
+
const text = (spans) => spans.map((s) => s.text).join('');
|
|
5
|
+
const italics = (spans) => spans.filter((s) => s.italic).map((s) => s.text);
|
|
6
|
+
const bolds = (spans) => spans.filter((s) => s.bold).map((s) => s.text);
|
|
7
|
+
// CommonMark's flanking rules for `*` (#1444): a `*` after a word and
|
|
8
|
+
// before a space or punctuation can only close emphasis, so a star name
|
|
9
|
+
// such as "Sgr A*" or "M87*" is text, not the start of italics.
|
|
10
|
+
describe('asterisks open and close by CommonMark flanking', () => {
|
|
11
|
+
it('keeps a trailing star of a name as text', () => {
|
|
12
|
+
const src = 'The first image of Sgr A* at press conferences, the M87 black hole (M87*), and Sgr A*. Then more text.';
|
|
13
|
+
const spans = parseInlineFormatting(src);
|
|
14
|
+
expect(text(spans)).toBe(src);
|
|
15
|
+
expect(italics(spans)).toEqual([]);
|
|
16
|
+
expect(stripInlineFormatting(src)).toBe(src);
|
|
17
|
+
});
|
|
18
|
+
it('still closes emphasis after a word', () => {
|
|
19
|
+
// CommonMark reads this as emphasis up to `A`: the star after a word
|
|
20
|
+
// closes the one before `Along`; the last one has no partner.
|
|
21
|
+
const spans = parseInlineFormatting('“*Along with Sgr A* having a structure.*”');
|
|
22
|
+
expect(italics(spans)).toEqual(['Along with Sgr A']);
|
|
23
|
+
expect(text(spans)).toBe('“Along with Sgr A having a structure.*”');
|
|
24
|
+
});
|
|
25
|
+
it('reads emphasis that starts or ends beside punctuation', () => {
|
|
26
|
+
expect(italics(parseInlineFormatting('“*What we see,*” said she.'))).toEqual(['What we see,']);
|
|
27
|
+
expect(italics(parseInlineFormatting('(*aside*) and *word*.'))).toEqual(['aside', 'word']);
|
|
28
|
+
expect(italics(parseInlineFormatting('un*believ*able'))).toEqual(['believ']);
|
|
29
|
+
});
|
|
30
|
+
it('does not open before a space nor close after one', () => {
|
|
31
|
+
const spans = parseInlineFormatting('a * b * c and *x *y');
|
|
32
|
+
expect(italics(spans)).toEqual([]);
|
|
33
|
+
expect(text(spans)).toBe('a * b * c and *x *y');
|
|
34
|
+
});
|
|
35
|
+
it('applies the same rules to bold and bold italics', () => {
|
|
36
|
+
expect(bolds(parseInlineFormatting('**bold** and **A** B** C'))).toEqual(['bold', 'A']);
|
|
37
|
+
const spans = parseInlineFormatting('x ***both*** y');
|
|
38
|
+
expect(spans.filter((s) => s.bold && s.italic).map((s) => s.text)).toEqual(['both']);
|
|
39
|
+
});
|
|
40
|
+
it('judges a run of stars as a whole', () => {
|
|
41
|
+
// Neither star of a `**` before a space opens, so no italic starts
|
|
42
|
+
// inside a bold marker that failed to open.
|
|
43
|
+
for (const src of ['** foo**', 'foo ** bar', 'a **']) {
|
|
44
|
+
const spans = parseInlineFormatting(src);
|
|
45
|
+
expect(text(spans)).toBe(src);
|
|
46
|
+
expect(spans.some((s) => s.italic || s.bold)).toBe(false);
|
|
47
|
+
}
|
|
48
|
+
const nested = parseInlineFormatting('**bold *it***');
|
|
49
|
+
expect(bolds(nested)).toEqual(['bold ', 'it']);
|
|
50
|
+
expect(italics(nested)).toEqual(['it']);
|
|
51
|
+
const run = parseInlineFormatting('***Abstract***—Text');
|
|
52
|
+
expect(run.filter((s) => s.bold && s.italic).map((s) => s.text)).toEqual(['Abstract']);
|
|
53
|
+
expect(text(run)).toBe('Abstract—Text');
|
|
54
|
+
});
|
|
55
|
+
it('keeps emphasis between CJK letters and punctuation', () => {
|
|
56
|
+
expect(bolds(parseInlineFormatting('中文**粗体。**中文'))).toEqual(['粗体。']);
|
|
57
|
+
expect(italics(parseInlineFormatting('中文*强调*中文'))).toEqual(['强调']);
|
|
58
|
+
expect(bolds(parseInlineFormatting('第3.0回GDP**粗**'))).toEqual(['粗']);
|
|
59
|
+
expect(bolds(parseInlineFormatting('是 **《**officer**》** x'))).toEqual(['《', '》']);
|
|
60
|
+
});
|
|
61
|
+
it('reads the same in the Word importer’s parser', () => {
|
|
62
|
+
const runs = parseInline('Sgr A* at the centre, and *italic* text.');
|
|
63
|
+
expect(runs.filter((r) => r.italic).map((r) => r.text)).toEqual(['italic']);
|
|
64
|
+
expect(runs.map((r) => r.text).join('')).toBe('Sgr A* at the centre, and italic text.');
|
|
65
|
+
});
|
|
66
|
+
});
|
|
67
|
+
//# sourceMappingURL=asteriskFlanking.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"asteriskFlanking.test.js","sourceRoot":"","sources":["../../../src/__tests__/parse/asteriskFlanking.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comic.d.ts","sourceRoot":"","sources":["../../../src/paint/displayList/comic.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAgC,YAAY,EAAiB,MAAM,0BAA0B,CAAC;AAM1G,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,YAAY,CAAC;AAqE3D,oEAAoE;AACpE,wBAAgB,eAAe,CAAC,KAAK,EAAE,YAAY,GAAG,WAAW,EAAE,CAUlE;AAqBD;2CAC2C;AAC3C,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,GAAG,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"comic.d.ts","sourceRoot":"","sources":["../../../src/paint/displayList/comic.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAgC,YAAY,EAAiB,MAAM,0BAA0B,CAAC;AAM1G,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,YAAY,CAAC;AAqE3D,oEAAoE;AACpE,wBAAgB,eAAe,CAAC,KAAK,EAAE,YAAY,GAAG,WAAW,EAAE,CAUlE;AAqBD;2CAC2C;AAC3C,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,GAAG,WAAW,EAAE,CAyBnF"}
|
|
@@ -127,14 +127,15 @@ export function comicLetteringItems(comic, key) {
|
|
|
127
127
|
// Lettering turns with a sound effect; its lean has no Word or
|
|
128
128
|
// display-list form (the outline keeps it).
|
|
129
129
|
const frame = comicBalloonMatrix({ bbox: balloon.bbox, ...(balloon.rotate ? { rotate: balloon.rotate } : {}) }) ?? IDENTITY;
|
|
130
|
-
|
|
130
|
+
const halo = balloon.halo && balloon.halo.width > 0 ? { color: balloon.halo.color, widthPx: balloon.halo.width } : undefined;
|
|
131
|
+
items.push(...(slotItems({ bbox: balloon.bbox, blocks: balloon.text }, {
|
|
131
132
|
frame,
|
|
132
133
|
uprightPictures: false,
|
|
133
134
|
role: 'balloon',
|
|
134
135
|
generated: false,
|
|
135
136
|
blockKey: `${key}:${balloon.elementId ?? balloon.id}`,
|
|
136
137
|
blockType: balloon.kind,
|
|
137
|
-
}));
|
|
138
|
+
})).map((it) => (halo && it.kind === 'text' ? { ...it, halo } : it)));
|
|
138
139
|
}
|
|
139
140
|
}
|
|
140
141
|
return items;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comic.js","sourceRoot":"","sources":["../../../src/paint/displayList/comic.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"comic.js","sourceRoot":"","sources":["../../../src/paint/displayList/comic.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"design.d.ts","sourceRoot":"","sources":["../../../src/paint/displayList/design.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAyC,MAAM,qBAAqB,CAAC;AAChG,OAAO,EAAuD,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAI7F,OAAO,KAAK,EAAE,WAAW,EAA0C,MAAM,YAAY,CAAC;AAEtF,KAAK,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/D;gDACgD;AAChD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,KAAK,CAAC;IACb;uBACmB;IACnB,eAAe,EAAE,OAAO,CAAC;IACzB,IAAI,EAAE,QAAQ,CAAC;IACf,2DAA2D;IAC3D,SAAS,EAAE,OAAO,CAAC;IACnB;sBACkB;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAgHD,yEAAyE;AACzE,wBAAgB,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,WAAW,GAAG,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"design.d.ts","sourceRoot":"","sources":["../../../src/paint/displayList/design.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAyC,MAAM,qBAAqB,CAAC;AAChG,OAAO,EAAuD,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAI7F,OAAO,KAAK,EAAE,WAAW,EAA0C,MAAM,YAAY,CAAC;AAEtF,KAAK,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/D;gDACgD;AAChD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,KAAK,CAAC;IACb;uBACmB;IACnB,eAAe,EAAE,OAAO,CAAC;IACzB,IAAI,EAAE,QAAQ,CAAC;IACf,2DAA2D;IAC3D,SAAS,EAAE,OAAO,CAAC;IACnB;sBACkB;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAgHD,yEAAyE;AACzE,wBAAgB,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,WAAW,GAAG,WAAW,EAAE,CAiD9E"}
|
|
@@ -178,6 +178,8 @@ export function slotItems(slot, ctx) {
|
|
|
178
178
|
const path = { kind: 'path', bbox: { ...block.bbox }, subpaths: block.subpaths };
|
|
179
179
|
if (block.fill)
|
|
180
180
|
path.fill = block.fill;
|
|
181
|
+
if (block.fillRule === 'evenodd')
|
|
182
|
+
path.fillRule = 'evenodd';
|
|
181
183
|
if (block.stroke)
|
|
182
184
|
path.stroke = block.stroke;
|
|
183
185
|
items.push(placeShape(ctx.frame, path));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"design.js","sourceRoot":"","sources":["../../../src/paint/displayList/design.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"design.js","sourceRoot":"","sources":["../../../src/paint/displayList/design.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline.d.ts","sourceRoot":"","sources":["../../../src/paint/displayList/inline.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE5E;mDACmD;AACnD,wBAAgB,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,SAAI,GAAG,cAAc,CAUpE;AAED;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,SAAI,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,MAAM,GAAG,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"inline.d.ts","sourceRoot":"","sources":["../../../src/paint/displayList/inline.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE5E;mDACmD;AACnD,wBAAgB,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,SAAI,GAAG,cAAc,CAUpE;AAED;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,SAAI,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,MAAM,GAAG,UAAU,EAAE,CAiCxH;AAED,4DAA4D;AAC5D,wBAAgB,WAAW,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa,CASrF"}
|
|
@@ -28,8 +28,10 @@ export function chipRuns(run, chip, inkOffset = 0, inkFor) {
|
|
|
28
28
|
const inline = { kind: 'chip', widthPx: run.width, heightPx: chip.ascent + chip.descent, ascentPx: chip.ascent, box: chipBox(chip, inkOffset) };
|
|
29
29
|
const parts = chip.runs.filter((r) => r.text.length > 0);
|
|
30
30
|
const joined = parts.map((r) => r.text).join('');
|
|
31
|
+
// A blank's answer is laid out, never painted (#1227): every run says so.
|
|
32
|
+
const blank = chip.blank ? { blank: true } : {};
|
|
31
33
|
if (parts.length === 0 || joined !== run.text)
|
|
32
|
-
return [{ ...run, ...(chip.color ? { color: chip.color } : {}), inline }];
|
|
34
|
+
return [{ ...run, ...(chip.color ? { color: chip.color } : {}), inline, ...blank }];
|
|
33
35
|
const lead = inkOffset + chip.marginLeft + chip.borderWidth + chip.paddingX;
|
|
34
36
|
const out = [];
|
|
35
37
|
let x = run.x;
|
|
@@ -37,7 +39,7 @@ export function chipRuns(run, chip, inkOffset = 0, inkFor) {
|
|
|
37
39
|
parts.forEach((r, i) => {
|
|
38
40
|
const last = i === parts.length - 1;
|
|
39
41
|
const width = last ? run.x + run.width - x : r.width + (i === 0 ? lead : 0);
|
|
40
|
-
const part = { ...run, text: r.text, x, width, fontString: r.fontString, color: chip.color ?? inkFor?.(r) ?? run.color, textStart };
|
|
42
|
+
const part = { ...run, text: r.text, x, width, fontString: r.fontString, color: chip.color ?? inkFor?.(r) ?? run.color, textStart, ...blank };
|
|
41
43
|
// Emphasis stays the segment's: a bold or italic face the chip style
|
|
42
44
|
// or its own words set is the run's face (`fontString`), which writers
|
|
43
45
|
// set as a face, not as markup to read back.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline.js","sourceRoot":"","sources":["../../../src/paint/displayList/inline.ts"],"names":[],"mappings":"AAMA;mDACmD;AACnD,MAAM,UAAU,OAAO,CAAC,IAAa,EAAE,SAAS,GAAG,CAAC;IAClD,MAAM,GAAG,GAAmB,EAAE,EAAE,EAAE,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;IAClI,IAAI,IAAI,CAAC,UAAU;QAAE,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC;IAChD,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC;QAC7C,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC;QAC9B,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC;IACvC,CAAC;IACD,IAAI,IAAI,CAAC,YAAY,GAAG,CAAC;QAAE,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC;IAC1D,IAAI,IAAI,CAAC,SAAS;QAAE,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IACnD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,QAAQ,CAAC,GAAe,EAAE,IAAa,EAAE,SAAS,GAAG,CAAC,EAAE,MAAkC;IACxG,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,MAAe,EAAE,OAAO,EAAE,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC;IACzJ,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,KAAK,GAAG,CAAC,IAAI;QAAE,OAAO,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"inline.js","sourceRoot":"","sources":["../../../src/paint/displayList/inline.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { ResolvedResourceBlock } from '../../vdt/resources.js';
|
|
2
|
+
import type { VDTPathMarker } from '../../vdt/design.js';
|
|
3
|
+
import { type Frame } from './frame.js';
|
|
4
|
+
import type { BlockContext } from './blocks.js';
|
|
5
|
+
import type { DisplayItem } from './types.js';
|
|
6
|
+
type PathItem = Extract<DisplayItem, {
|
|
7
|
+
kind: 'path';
|
|
8
|
+
}>;
|
|
9
|
+
/** A leader's end mark as a path: a dot or an arrowhead filled, a ring
|
|
10
|
+
* or a bar stroked. */
|
|
11
|
+
export declare function markerPath(m: VDTPathMarker): PathItem;
|
|
12
|
+
/** The items of a figure's drawn labels (a reference in a label in the
|
|
13
|
+
* figure's link colour, as the canvas and the PDF paint it), its body's top-left corner at
|
|
14
|
+
* (`bx`, `by`) in `frame`. A label's words are the figure's own text in
|
|
15
|
+
* the Markdown but are drawn here as furniture (generated): only the
|
|
16
|
+
* semantic export carries them back. Vertical labels are left out. */
|
|
17
|
+
export declare function figureLabelItems(rb: ResolvedResourceBlock, bx: number, by: number, frame: Frame, ctx: BlockContext): DisplayItem[];
|
|
18
|
+
export {};
|
|
19
|
+
//# sourceMappingURL=labels.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"labels.d.ts","sourceRoot":"","sources":["../../../src/paint/displayList/labels.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAkB,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzE,OAAO,EAAkC,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAExE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,YAAY,CAAC;AAE3D,KAAK,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAiBvD;wBACwB;AACxB,wBAAgB,UAAU,CAAC,CAAC,EAAE,aAAa,GAAG,QAAQ,CAuBrD;AAED;;;;uEAIuE;AACvE,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,qBAAqB,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,GAAG,WAAW,EAAE,CAwClI"}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
import { figureLabelLeaderPaths, figureLabelMatrix, labelPlateBox } from '../../composed/labels.js';
|
|
2
|
+
import { compose, placeShape, placeText } from './frame.js';
|
|
3
|
+
import { placeResourceLine } from './lines.js';
|
|
4
|
+
/** Bézier handle length of a quarter circle, radius 1. */
|
|
5
|
+
const KAPPA = 0.5523;
|
|
6
|
+
function circle(cx, cy, r) {
|
|
7
|
+
const k = KAPPA * r;
|
|
8
|
+
return [
|
|
9
|
+
{ op: 'M', x: cx + r, y: cy },
|
|
10
|
+
{ op: 'C', x1: cx + r, y1: cy + k, x2: cx + k, y2: cy + r, x: cx, y: cy + r },
|
|
11
|
+
{ op: 'C', x1: cx - k, y1: cy + r, x2: cx - r, y2: cy + k, x: cx - r, y: cy },
|
|
12
|
+
{ op: 'C', x1: cx - r, y1: cy - k, x2: cx - k, y2: cy - r, x: cx, y: cy - r },
|
|
13
|
+
{ op: 'C', x1: cx + k, y1: cy - r, x2: cx + r, y2: cy - k, x: cx + r, y: cy },
|
|
14
|
+
{ op: 'Z' },
|
|
15
|
+
];
|
|
16
|
+
}
|
|
17
|
+
/** A leader's end mark as a path: a dot or an arrowhead filled, a ring
|
|
18
|
+
* or a bar stroked. */
|
|
19
|
+
export function markerPath(m) {
|
|
20
|
+
const s = m.sizePx;
|
|
21
|
+
const bbox = { x: m.x - s, y: m.y - s, width: 2 * s, height: 2 * s };
|
|
22
|
+
const stroke = { color: m.color, widthPx: m.widthPx ?? Math.max(1, s / 6) };
|
|
23
|
+
const cos = Math.cos(m.angle);
|
|
24
|
+
const sin = Math.sin(m.angle);
|
|
25
|
+
switch (m.kind) {
|
|
26
|
+
case 'dot':
|
|
27
|
+
return { kind: 'path', bbox, subpaths: [circle(m.x, m.y, s / 2)], fill: m.color };
|
|
28
|
+
case 'ring':
|
|
29
|
+
return { kind: 'path', bbox, subpaths: [circle(m.x, m.y, s / 2)], stroke };
|
|
30
|
+
case 'bar':
|
|
31
|
+
return { kind: 'path', bbox, subpaths: [[{ op: 'M', x: m.x + (sin * s) / 2, y: m.y - (cos * s) / 2 }, { op: 'L', x: m.x - (sin * s) / 2, y: m.y + (cos * s) / 2 }]], stroke };
|
|
32
|
+
case 'arrow': {
|
|
33
|
+
// The tip on the point, the base a size back along the line.
|
|
34
|
+
const bx = m.x - cos * s;
|
|
35
|
+
const by = m.y - sin * s;
|
|
36
|
+
return {
|
|
37
|
+
kind: 'path', bbox, fill: m.color,
|
|
38
|
+
subpaths: [[{ op: 'M', x: m.x, y: m.y }, { op: 'L', x: bx - (sin * s) / 2, y: by + (cos * s) / 2 }, { op: 'L', x: bx + (sin * s) / 2, y: by - (cos * s) / 2 }, { op: 'Z' }]],
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
/** The items of a figure's drawn labels (a reference in a label in the
|
|
44
|
+
* figure's link colour, as the canvas and the PDF paint it), its body's top-left corner at
|
|
45
|
+
* (`bx`, `by`) in `frame`. A label's words are the figure's own text in
|
|
46
|
+
* the Markdown but are drawn here as furniture (generated): only the
|
|
47
|
+
* semantic export carries them back. Vertical labels are left out. */
|
|
48
|
+
export function figureLabelItems(rb, bx, by, frame, ctx) {
|
|
49
|
+
const drawn = (rb.labels ?? []).filter((l) => l.layout && !l.layout.vertical);
|
|
50
|
+
if (drawn.length === 0)
|
|
51
|
+
return [];
|
|
52
|
+
const items = [];
|
|
53
|
+
for (const path of figureLabelLeaderPaths(rb, bx, by)) {
|
|
54
|
+
const item = { kind: 'path', bbox: { ...path.bbox }, subpaths: path.subpaths };
|
|
55
|
+
if (path.fill)
|
|
56
|
+
item.fill = path.fill;
|
|
57
|
+
if (path.stroke)
|
|
58
|
+
item.stroke = path.stroke;
|
|
59
|
+
items.push(placeShape(frame, item));
|
|
60
|
+
for (const mark of path.markers ?? [])
|
|
61
|
+
items.push(placeShape(frame, markerPath(mark)));
|
|
62
|
+
}
|
|
63
|
+
const key = `r${rb.resource.id}`;
|
|
64
|
+
for (const label of drawn) {
|
|
65
|
+
const layout = label.layout;
|
|
66
|
+
const m = compose(frame, figureLabelMatrix(layout, bx, by));
|
|
67
|
+
const plate = layout.background;
|
|
68
|
+
if (plate) {
|
|
69
|
+
const box = labelPlateBox(plate);
|
|
70
|
+
items.push(placeShape(m, {
|
|
71
|
+
kind: 'rect', rect: { ...plate.rect },
|
|
72
|
+
...(plate.color ? { fill: plate.color } : {}),
|
|
73
|
+
...(plate.border ? { stroke: plate.border.color, strokeWidthPx: plate.border.widthPx } : {}),
|
|
74
|
+
...(plate.radiusPx ? { radius: plate.radiusPx } : {}),
|
|
75
|
+
box,
|
|
76
|
+
}));
|
|
77
|
+
}
|
|
78
|
+
const style = { fontString: layout.fontString, boldFontString: layout.boldFontString, italicFontString: layout.italicFontString, boldItalicFontString: layout.boldItalicFontString, color: layout.color, refColor: rb.linkColor };
|
|
79
|
+
const lines = layout.lines.map((l) => placeResourceLine(l, style, false, ctx.options).line);
|
|
80
|
+
if (lines.length === 0)
|
|
81
|
+
continue;
|
|
82
|
+
for (const line of lines)
|
|
83
|
+
line.map = new Array(line.text.length).fill(-1);
|
|
84
|
+
const text = {
|
|
85
|
+
kind: 'text', role: 'label', blockType: 'resource',
|
|
86
|
+
bbox: { x: layout.box.x, y: layout.box.y, width: layout.box.width, height: layout.box.height },
|
|
87
|
+
lines,
|
|
88
|
+
source: { blockKey: key, map: lines.flatMap((l) => l.map), generated: true },
|
|
89
|
+
...(layout.halo && layout.halo.widthPx > 0 ? { halo: { color: layout.halo.color, widthPx: layout.halo.widthPx } } : {}),
|
|
90
|
+
};
|
|
91
|
+
items.push(placeText(m, text));
|
|
92
|
+
}
|
|
93
|
+
return items;
|
|
94
|
+
}
|
|
95
|
+
//# sourceMappingURL=labels.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"labels.js","sourceRoot":"","sources":["../../../src/paint/displayList/labels.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"labels.test.d.ts","sourceRoot":"","sources":["../../../src/paint/displayList/labels.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { buildDocument } from '../../pipeline/build.js';
|
|
3
|
+
import { createMeasurementCache } from '../../measure/index.js';
|
|
4
|
+
import { mapPartsFixture } from '../../__tests__/composed/fixtures/mapParts.js';
|
|
5
|
+
import { markerPath } from './labels.js';
|
|
6
|
+
import { pageDisplayList } from './page.js';
|
|
7
|
+
class StubCtx {
|
|
8
|
+
font = '';
|
|
9
|
+
measureText(s) {
|
|
10
|
+
const m = /(\d+(?:\.\d+)?)px/.exec(this.font);
|
|
11
|
+
return { width: [...s].length * (m ? Number(m[1]) : 10) * 0.5 };
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
globalThis.OffscreenCanvas = class {
|
|
15
|
+
getContext() {
|
|
16
|
+
return new StubCtx();
|
|
17
|
+
}
|
|
18
|
+
};
|
|
19
|
+
describe('figure labels in the display list (#1444)', () => {
|
|
20
|
+
it('draws a figure\'s labels over its picture: leaders, plates, then words', () => {
|
|
21
|
+
const f = mapPartsFixture('en');
|
|
22
|
+
const doc = buildDocument({ markdown: f.markdown, resources: f.resources }, f.config, createMeasurementCache());
|
|
23
|
+
const index = doc.pages.findIndex((p) => (p.floats ?? []).some((b) => b.resourceBlock?.labels?.length));
|
|
24
|
+
expect(index).toBeGreaterThanOrEqual(0);
|
|
25
|
+
const page = pageDisplayList(doc, index);
|
|
26
|
+
const labels = page.items.filter((i) => i.kind === 'text' && i.role === 'label');
|
|
27
|
+
const words = labels.map((i) => (i.kind === 'text' ? i.lines.map((l) => l.text).join(' ') : ''));
|
|
28
|
+
expect(words).toEqual(expect.arrayContaining(['VARENIA', 'Grey Peaks', 'Lake Orla']));
|
|
29
|
+
// Drawn, never read back: the semantic export carries the words.
|
|
30
|
+
for (const l of labels)
|
|
31
|
+
if (l.kind === 'text')
|
|
32
|
+
expect(l.source?.generated).toBe(true);
|
|
33
|
+
// After the picture they lie on.
|
|
34
|
+
const picture = page.items.findIndex((i) => i.kind === 'image');
|
|
35
|
+
expect(page.items.findIndex((i) => i.kind === 'text' && i.role === 'label')).toBeGreaterThan(picture);
|
|
36
|
+
});
|
|
37
|
+
it('paints a reference in a label in the figure\'s link colour', () => {
|
|
38
|
+
const f = mapPartsFixture('en');
|
|
39
|
+
const doc = buildDocument({ markdown: f.markdown, resources: f.resources }, f.config, createMeasurementCache());
|
|
40
|
+
const index = doc.pages.findIndex((p) => (p.floats ?? []).some((b) => b.resourceBlock?.labels?.length));
|
|
41
|
+
const rb = doc.pages[index].floats.find((b) => b.resourceBlock?.labels?.length).resourceBlock;
|
|
42
|
+
rb.linkColor = '#c00000';
|
|
43
|
+
const label = rb.labels.find((l) => l.layout && !l.layout.vertical && l.layout.lines.length > 0);
|
|
44
|
+
const seg = label.layout.lines[0].segments.find((s) => s.text.trim());
|
|
45
|
+
seg.refResourceId = 'elsewhere';
|
|
46
|
+
const page = pageDisplayList(doc, index);
|
|
47
|
+
const runs = page.items.flatMap((i) => (i.kind === 'text' && i.role === 'label' ? i.lines.flatMap((l) => l.runs) : []));
|
|
48
|
+
expect(runs.some((r) => r.text.includes(seg.text.trim()) && r.color === '#c00000')).toBe(true);
|
|
49
|
+
expect(runs.some((r) => r.color !== '#c00000')).toBe(true);
|
|
50
|
+
});
|
|
51
|
+
it('draws a leader\'s end marks as paths', () => {
|
|
52
|
+
const dot = markerPath({ kind: 'dot', x: 10, y: 10, angle: 0, sizePx: 4, color: '#000' });
|
|
53
|
+
expect(dot.fill).toBe('#000');
|
|
54
|
+
expect(dot.subpaths[0][0]).toEqual({ op: 'M', x: 12, y: 10 });
|
|
55
|
+
const arrow = markerPath({ kind: 'arrow', x: 10, y: 10, angle: 0, sizePx: 4, color: '#000' });
|
|
56
|
+
expect(arrow.subpaths[0]).toEqual([{ op: 'M', x: 10, y: 10 }, { op: 'L', x: 6, y: 12 }, { op: 'L', x: 6, y: 8 }, { op: 'Z' }]);
|
|
57
|
+
expect(markerPath({ kind: 'ring', x: 0, y: 0, angle: 0, sizePx: 4, color: '#000', widthPx: 1 }).stroke).toEqual({ color: '#000', widthPx: 1 });
|
|
58
|
+
});
|
|
59
|
+
});
|
|
60
|
+
//# sourceMappingURL=labels.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"labels.test.js","sourceRoot":"","sources":["../../../src/paint/displayList/labels.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lines.d.ts","sourceRoot":"","sources":["../../../src/paint/displayList/lines.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAMlD,OAAO,EAAgC,KAAK,IAAI,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAExF,OAAO,KAAK,EAAqB,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAyB,MAAM,YAAY,CAAC;AAEzH,yDAAyD;AACzD,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0DAA0D;IAC1D,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,MAAM,CAKjF;AAWD,sEAAsE;AACtE,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,6EAA6E;IAC7E,OAAO,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC5E;AAWD,iBAAS,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAG1C;
|
|
1
|
+
{"version":3,"file":"lines.d.ts","sourceRoot":"","sources":["../../../src/paint/displayList/lines.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAMlD,OAAO,EAAgC,KAAK,IAAI,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAExF,OAAO,KAAK,EAAqB,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAyB,MAAM,YAAY,CAAC;AAEzH,yDAAyD;AACzD,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0DAA0D;IAC1D,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,MAAM,CAKjF;AAWD,sEAAsE;AACtE,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,6EAA6E;IAC7E,OAAO,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC5E;AAWD,iBAAS,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAG1C;AA0ID;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,GAAG,eAAe,GAAG,WAAW,CAAC,GAAG,WAAW,GAAG,SAAS,EACrG,QAAQ,EAAE,OAAO,EACjB,OAAO,EAAE,kBAAkB,GAAG,SAAS;AACvC,yEAAyE;AACzE,OAAO,UAAQ,GACd,UAAU,CAMZ;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,kBAAkB,GAAG,SAAS,GAAG,UAAU,CAMzI;AA0CD;qDACqD;AACrD,wBAAgB,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAItG;AAED;;;gDAGgD;AAChD,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,EAAE,CAOtF;AAED,OAAO,EAAE,MAAM,EAAE,CAAC"}
|
|
@@ -86,7 +86,7 @@ function annotate(run, seg) {
|
|
|
86
86
|
const ann = (a) => ({ text: a.text, dx: a.dx, dy: a.dy, fontString: a.fontString, ...(a.color ? { color: a.color } : {}) });
|
|
87
87
|
if (seg.ruby) {
|
|
88
88
|
const r = seg.ruby;
|
|
89
|
-
run.ruby = { text: r.text, fontString: r.fontString, position: r.position, ...(r.group ? { group: true } : {}), ...(r.id !== undefined ? { id: r.id } : {}), ...(r.color ? { color: r.color } : {}), ...(r.runs[0] ? { raise: -r.runs[0].dy } : {}) };
|
|
89
|
+
run.ruby = { text: r.text, fontString: r.fontString, position: r.position, ...(r.group ? { group: true } : {}), ...(r.id !== undefined ? { id: r.id } : {}), ...(r.color ? { color: r.color } : {}), ...(r.runs[0] ? { raise: -r.runs[0].dy, runs: r.runs.map(ann) } : {}) };
|
|
90
90
|
}
|
|
91
91
|
if (seg.tcy)
|
|
92
92
|
run.tcy = true;
|
|
@@ -155,7 +155,10 @@ function runsOf(setting, composed, style, tracking, leaders) {
|
|
|
155
155
|
}
|
|
156
156
|
else if (seg.kind === 'score' && seg.scoreSystem) {
|
|
157
157
|
const s = seg.scoreSystem;
|
|
158
|
-
|
|
158
|
+
// Scaled to the segment's width and standing wholly on the baseline,
|
|
159
|
+
// as the painters draw a system (canvas-backend/scoreRender.ts).
|
|
160
|
+
const k = s.widthPx > 0 ? seg.width / s.widthPx : 1;
|
|
161
|
+
run.inline = { kind: 'score', ...(s.svg ? { svg: s.svg } : {}), widthPx: seg.width, heightPx: s.heightPx * k, ascentPx: s.heightPx * k };
|
|
159
162
|
}
|
|
160
163
|
else if (seg.kind === 'swatch') {
|
|
161
164
|
// The ink is the block's text colour, as the painters outline it.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lines.js","sourceRoot":"","sources":["../../../src/paint/displayList/lines.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"lines.js","sourceRoot":"","sources":["../../../src/paint/displayList/lines.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAA+B,MAAM,aAAa,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAiBpD,MAAM,UAAU,QAAQ,CAAC,KAAgB,EAAE,IAAa,EAAE,MAAe;IACvE,IAAI,IAAI,IAAI,MAAM,IAAI,KAAK,CAAC,oBAAoB;QAAE,OAAO,KAAK,CAAC,oBAAoB,CAAC;IACpF,IAAI,IAAI,IAAI,KAAK,CAAC,cAAc;QAAE,OAAO,KAAK,CAAC,cAAc,CAAC;IAC9D,IAAI,MAAM,IAAI,KAAK,CAAC,gBAAgB;QAAE,OAAO,KAAK,CAAC,gBAAgB,CAAC;IACpE,OAAO,KAAK,CAAC,UAAU,CAAC;AAC1B,CAAC;AAED,SAAS,SAAS,CAAC,KAAgB,EAAE,GAAmB;IACtD,IAAI,GAAG,CAAC,KAAK;QAAE,OAAO,GAAG,CAAC,KAAK,CAAC;IAChC,IAAI,CAAC,GAAG,CAAC,aAAa,KAAK,SAAS,IAAI,GAAG,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAC,QAAQ,CAAC;IAChG,IAAI,GAAG,CAAC,YAAY,IAAI,KAAK,CAAC,UAAU;QAAE,OAAO,KAAK,CAAC,UAAU,CAAC;IAClE,IAAI,GAAG,CAAC,IAAI,IAAI,KAAK,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC,SAAS,CAAC;IACxD,IAAI,GAAG,CAAC,MAAM,IAAI,KAAK,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC,WAAW,CAAC;IAC9D,OAAO,KAAK,CAAC,KAAK,CAAC;AACrB,CAAC;AAmBD,SAAS,MAAM,CAAC,UAAkB;IAChC,MAAM,CAAC,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC1C,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACjC,CAAC;AAED;0DAC0D;AAC1D,SAAS,WAAW,CAAC,IAAa,EAAE,QAAiB,EAAE,KAAgB,EAAE,QAAgB,EAAE,OAAuC;IAChI,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC;IACjC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC3B,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;IACxG,CAAC;IACD,OAAO,uBAAuB,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,UAAU,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;AACtJ,CAAC;AAED,6EAA6E;AAC7E,SAAS,WAAW,CAAC,IAAa,EAAE,KAA2C,EAAE,QAAiB,EAAE,QAAgB,EAAE,QAAsC,EAAE,KAAoC;IAChM,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;IAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1C,MAAM,cAAc,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACrF,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IACnD,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrE,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YAC3B,IAAI,QAAQ,IAAI,GAAG,CAAC,KAAK;gBAAE,SAAS;YACpC,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,QAAQ,IAAI,GAAG,CAAC,SAAS,CAAC;gBAAE,UAAU,EAAE,CAAC;;gBAClE,SAAS,IAAI,GAAG,CAAC,KAAK,CAAC;YAC5B,YAAY,IAAI,GAAG,CAAC,KAAK,CAAC;QAC5B,CAAC;QACD,IAAI,UAAU,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,YAAY,GAAG,cAAc,CAAC,EAAE,CAAC;YAC5G,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,cAAc,GAAG,SAAS,CAAC,GAAG,UAAU,EAAE,CAAC;QACrH,CAAC;IACH,CAAC;IACD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACtD,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,OAAO,CAAC,IAAI,QAAQ,EAAE,CAAC;QAC1D,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,KAAK,MAAM,GAAG,IAAI,QAAQ;YAAE,IAAI,CAAC,CAAC,QAAQ,IAAI,GAAG,CAAC,KAAK,CAAC;gBAAE,YAAY,IAAI,GAAG,CAAC,KAAK,CAAC;QACpF,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,cAAc,GAAG,CAAC,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC;QACtE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC;IAC9F,CAAC;IACD,uEAAuE;IACvE,MAAM,KAAK,GAAc,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAE,KAAmB,CAAC;IAC7E,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,cAAc,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC;QACzE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAC7H,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AAC1D,CAAC;AAED;0EAC0E;AAC1E,SAAS,QAAQ,CAAC,GAAe,EAAE,GAAmB;IACpD,MAAM,GAAG,GAAG,CAAC,CAAmB,EAAqB,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACjK,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;QACb,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC;QACnB,GAAG,CAAC,IAAI,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IAC/Q,CAAC;IACD,IAAI,GAAG,CAAC,GAAG;QAAE,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC;IAC5B,IAAI,GAAG,CAAC,WAAW;QAAE,GAAG,CAAC,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC;IACvD,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,MAAM,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC;QACtB,GAAG,CAAC,OAAO,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IACrH,CAAC;IACD,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QACf,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC;QACrB,GAAG,CAAC,MAAM,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IAC9J,CAAC;AACH,CAAC;AAED;gEACgE;AAChE,SAAS,MAAM,CAAC,OAAgB,EAAE,QAAiB,EAAE,KAAgB,EAAE,QAAgB,EAAE,OAA8B;IACrH,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,CAAC,GAAmB,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACxJ,MAAM,EAAE,GAAG,IAAI,KAAK,CAAS,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IACvB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAChG,KAAK,MAAM,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;QACrC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACV,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,CAAC;IACzB,CAAC;IACD,MAAM,IAAI,GAAiB,EAAE,CAAC;IAC9B,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QACtB,MAAM,IAAI,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC/E,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACpC,MAAM,GAAG,GAAe,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAE,EAAE,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;QAC/F,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC;QACzB,IAAI,GAAG,CAAC,IAAI;YAAE,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;QAC9B,IAAI,GAAG,CAAC,MAAM;YAAE,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC;QAClC,IAAI,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC;YAAE,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC;QAC5D,MAAM,CAAC,GAAG,QAAQ,GAAG,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO;YAAE,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC;QACtD,IAAI,GAAG,CAAC,MAAM;YAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;QACxC,IAAI,GAAG,CAAC,aAAa;YAAE,GAAG,CAAC,aAAa,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC;QAC9D,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS;YAAE,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QAChD,IAAI,GAAG,CAAC,UAAU,KAAK,SAAS;YAAE,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;QAClE,IAAI,GAAG,CAAC,aAAa,KAAK,SAAS;YAAE,GAAG,CAAC,SAAS,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,aAAa,EAAE,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;QAC3H,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS;YAAE,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;QAC5D,IAAI,GAAG,CAAC,GAAG;YAAE,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC;QAC5B,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACnB,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACzB,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS,IAAI,CAAC,CAAC,QAAQ,IAAI,GAAG,CAAC,SAAS,CAAC;gBAAE,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC;QACzF,CAAC;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YACjD,MAAM,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC;YACzB,GAAG,CAAC,MAAM,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QAClI,CAAC;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;YACnD,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,CAAC;YAC1B,qEAAqE;YACrE,iEAAiE;YACjE,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YACpD,GAAG,CAAC,MAAM,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,GAAG,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC;QAC3I,CAAC;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACjC,kEAAkE;YAClE,GAAG,CAAC,MAAM,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,IAAI,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7I,CAAC;aAAM,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;YACpB,2DAA2D;YAC3D,qEAAqE;YACrE,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YAC/H,OAAO;QACT,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC1B,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;QAClE,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,KAAK,CAAC,IAAa,EAAE,GAAgB;IAC5C,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,UAAU;QAAE,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC;IAChE,IAAI,IAAI,CAAC,cAAc;QAAE,GAAG,CAAC,cAAc,GAAG,IAAI,CAAC;IACnD,IAAI,IAAI,CAAC,UAAU;QAAE,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;IACrC,IAAI,IAAI,CAAC,SAAS;QAAE,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC;IACzC,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAC3B,IAAa,EACb,KAAqG,EACrG,QAAiB,EACjB,OAAuC;AACvC,yEAAyE;AACzE,OAAO,GAAG,KAAK;IAEf,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,KAAK,IAAI,IAAI,QAAQ,CAAC;IACvD,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAClE,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IACtF,OAAO,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,KAAK,KAAK,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC,SAAS,KAAK,KAAK,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;AAC1K,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAa,EAAE,KAAgB,EAAE,QAAiB,EAAE,OAAuC;IAC3H,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,IAAI,CAAC,CAAC;IACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,KAAK,IAAI,IAAI,QAAQ,CAAC;IACvD,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAClE,MAAM,OAAO,GAAY,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAC1G,OAAO,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;AAC3H,CAAC;AAED,SAAS,MAAM,CACb,IAAa,EACb,KAAkB,EAClB,OAAgB,EAChB,QAAiB,EACjB,KAAgB,EAChB,QAAgB,EAChB,QAAiB,EACjB,QAAiB,EACjB,OAAqC;IAErC,MAAM,OAAO,GAA0B,EAAE,CAAC;IAC1C,MAAM,GAAG,GAAG,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACpC,IAAI,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC/D,iEAAiE;IACjE,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChD,IAAI,OAAO,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,IAAI,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,CAAC;QAC9D,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;QACnB,IAAI,GAAG,MAAM,CAAC,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC3K,CAAC;IACD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9C,sDAAsD;QACtD,IAAI,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC7K,CAAC;IACD,MAAM,GAAG,GAAgB;QACvB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,CAAC,EAAE,OAAO,CAAC,CAAC;QACZ,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;QAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,IAAI;QACJ,GAAG,EAAE,GAAG,CAAC,GAAG;KACb,CAAC;IACF,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS;QAAE,GAAG,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAC1E,IAAI,QAAQ;QAAE,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC;IAC7B,IAAI,QAAQ;QAAE,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC;IAClC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC;AAC/D,CAAC;AAED;qDACqD;AACrD,MAAM,UAAU,WAAW,CAAC,IAAa,EAAE,KAA6B;IACtE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;IAC1B,IAAI,IAAI;QAAE,OAAO,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;IAClD,OAAO,EAAE,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;AACpF,CAAC;AAED;;;gDAGgD;AAChD,MAAM,UAAU,cAAc,CAAC,IAAa;IAC1C,OAAO,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACzC,IAAI,EAAE,MAAe;QACrB,IAAI,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;QACxF,IAAI,EAAE,CAAC,CAAC,KAAK;QACb,GAAG,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC5F,CAAC,CAAC,CAAC;AACN,CAAC;AAED,OAAO,EAAE,MAAM,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../../src/paint/displayList/resource.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../../src/paint/displayList/resource.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AASpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAA2C,MAAM,YAAY,CAAC;AA6HvF,8DAA8D;AAC9D,wBAAgB,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,YAAY,GAAG,WAAW,EAAE,CA4D/E"}
|