postext 1.70.6 → 1.72.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 +7 -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__/paint/underline.test.d.ts +2 -0
- package/dist/__tests__/paint/underline.test.d.ts.map +1 -0
- package/dist/__tests__/paint/underline.test.js +140 -0
- package/dist/__tests__/paint/underline.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__/parse/underline.test.d.ts +2 -0
- package/dist/__tests__/parse/underline.test.d.ts.map +1 -0
- package/dist/__tests__/parse/underline.test.js +161 -0
- package/dist/__tests__/parse/underline.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/annotations.d.ts.map +1 -1
- package/dist/canvas-backend/annotations.js +4 -0
- package/dist/canvas-backend/annotations.js.map +1 -1
- package/dist/canvas-backend/blockRender/linkPaint.d.ts +3 -0
- package/dist/canvas-backend/blockRender/linkPaint.d.ts.map +1 -1
- package/dist/canvas-backend/blockRender/linkPaint.js +5 -0
- package/dist/canvas-backend/blockRender/linkPaint.js.map +1 -1
- 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/defaults/text/bodyText/resolve.d.ts.map +1 -1
- package/dist/defaults/text/bodyText/resolve.js +2 -0
- package/dist/defaults/text/bodyText/resolve.js.map +1 -1
- package/dist/defaults/text/bodyText/strip.d.ts.map +1 -1
- package/dist/defaults/text/bodyText/strip.js +5 -0
- package/dist/defaults/text/bodyText/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 +30 -0
- package/dist/fonts/strikeout.d.ts.map +1 -0
- package/dist/fonts/strikeout.js +127 -0
- package/dist/fonts/strikeout.js.map +1 -0
- package/dist/html-backend/htmlAnnotations.d.ts.map +1 -1
- package/dist/html-backend/htmlAnnotations.js +3 -1
- package/dist/html-backend/htmlAnnotations.js.map +1 -1
- 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/linkPaint.d.ts +3 -0
- package/dist/html-backend/linkPaint.d.ts.map +1 -1
- package/dist/html-backend/linkPaint.js +5 -0
- package/dist/html-backend/linkPaint.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 +8 -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 +5 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -3
- package/dist/index.js.map +1 -1
- package/dist/marks/strikeGeometry.d.ts +14 -0
- package/dist/marks/strikeGeometry.d.ts.map +1 -0
- package/dist/marks/strikeGeometry.js +14 -0
- package/dist/marks/strikeGeometry.js.map +1 -0
- package/dist/marks/strikethrough.d.ts +57 -0
- package/dist/marks/strikethrough.d.ts.map +1 -0
- package/dist/marks/strikethrough.js +222 -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 +71 -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 +70 -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/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 +2 -1
- package/dist/paint/displayList/inline.js.map +1 -1
- package/dist/paint/displayList/lines.d.ts.map +1 -1
- package/dist/paint/displayList/lines.js +21 -0
- 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/types.d.ts +24 -3
- package/dist/paint/displayList/types.d.ts.map +1 -1
- package/dist/parse/blockParser/headingLines.d.ts +3 -0
- package/dist/parse/blockParser/headingLines.d.ts.map +1 -1
- package/dist/parse/blockParser/headingLines.js +2 -2
- package/dist/parse/blockParser/headingLines.js.map +1 -1
- package/dist/parse/blockParser/verse.d.ts +3 -0
- package/dist/parse/blockParser/verse.d.ts.map +1 -1
- package/dist/parse/blockParser/verse.js +5 -5
- package/dist/parse/blockParser/verse.js.map +1 -1
- package/dist/parse/blockParser.d.ts.map +1 -1
- package/dist/parse/blockParser.js +6 -3
- package/dist/parse/blockParser.js.map +1 -1
- package/dist/parse/exerciseGaps.d.ts +4 -3
- package/dist/parse/exerciseGaps.d.ts.map +1 -1
- package/dist/parse/exerciseGaps.js +6 -6
- package/dist/parse/exerciseGaps.js.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 +4 -0
- package/dist/parse/index.d.ts.map +1 -1
- package/dist/parse/index.js +2 -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 +22 -2
- package/dist/parse/injectSpans.js.map +1 -1
- package/dist/parse/inlineFormatting/inlineDirectives.d.ts +5 -1
- package/dist/parse/inlineFormatting/inlineDirectives.d.ts.map +1 -1
- package/dist/parse/inlineFormatting/inlineDirectives.js +8 -3
- package/dist/parse/inlineFormatting/inlineDirectives.js.map +1 -1
- package/dist/parse/inlineFormatting/markup.d.ts +82 -1
- package/dist/parse/inlineFormatting/markup.d.ts.map +1 -1
- package/dist/parse/inlineFormatting/markup.js +140 -4
- package/dist/parse/inlineFormatting/markup.js.map +1 -1
- package/dist/parse/inlineFormatting/parse.d.ts +8 -4
- package/dist/parse/inlineFormatting/parse.d.ts.map +1 -1
- package/dist/parse/inlineFormatting/parse.js +75 -10
- package/dist/parse/inlineFormatting/parse.js.map +1 -1
- package/dist/parse/inlineFormatting.d.ts +2 -1
- package/dist/parse/inlineFormatting.d.ts.map +1 -1
- package/dist/parse/inlineFormatting.js +1 -1
- package/dist/parse/inlineFormatting.js.map +1 -1
- package/dist/parse/inlineSnippet.d.ts +7 -4
- package/dist/parse/inlineSnippet.d.ts.map +1 -1
- package/dist/parse/inlineSnippet.js +8 -5
- package/dist/parse/inlineSnippet.js.map +1 -1
- package/dist/parse/sourceMapping.d.ts.map +1 -1
- package/dist/parse/sourceMapping.js +14 -4
- package/dist/parse/sourceMapping.js.map +1 -1
- package/dist/parse/types/contentBlock.d.ts +3 -0
- package/dist/parse/types/contentBlock.d.ts.map +1 -1
- package/dist/parse/types/inlineSpan.d.ts +20 -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/code/codeBlocks.d.ts +3 -2
- package/dist/pipeline/code/codeBlocks.d.ts.map +1 -1
- package/dist/pipeline/code/codeBlocks.js +7 -4
- package/dist/pipeline/code/codeBlocks.js.map +1 -1
- package/dist/pipeline/contentWarnings/sourceWarnings.d.ts.map +1 -1
- package/dist/pipeline/contentWarnings/sourceWarnings.js +3 -2
- package/dist/pipeline/contentWarnings/sourceWarnings.js.map +1 -1
- package/dist/pipeline/references/linkNotes.js +1 -1
- package/dist/pipeline/references/linkNotes.js.map +1 -1
- package/dist/pipeline/resources/resourceLayout/captions.js +1 -1
- package/dist/pipeline/resources/resourceLayout/captions.js.map +1 -1
- package/dist/pipeline/resources/resourceLayout/resourceBlock/captionNotes.js +1 -1
- package/dist/pipeline/resources/resourceLayout/resourceBlock/captionNotes.js.map +1 -1
- package/dist/pipeline/resources/resourceLayout/resourceBlock.js +1 -0
- package/dist/pipeline/resources/resourceLayout/resourceBlock.js.map +1 -1
- package/dist/pipeline/resources/resourceLayout/tableLayout.d.ts +2 -0
- package/dist/pipeline/resources/resourceLayout/tableLayout.d.ts.map +1 -1
- package/dist/pipeline/resources/resourceLayout/tableLayout.js +1 -1
- package/dist/pipeline/resources/resourceLayout/tableLayout.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/config.d.ts +9 -0
- package/dist/types/text/bodyText/config.d.ts.map +1 -1
- package/dist/types/text/bodyText/resolved.d.ts +9 -0
- package/dist/types/text/bodyText/resolved.d.ts.map +1 -1
- package/dist/vdt/lines.d.ts +4 -0
- package/dist/vdt/lines.d.ts.map +1 -1
- package/dist/vdt/segments.d.ts +34 -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/formatted/runs.d.ts.map +1 -1
- package/dist/word/formatted/runs.js +6 -2
- package/dist/word/formatted/runs.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/index.js +1 -1
- package/dist/word/semantic/index.js.map +1 -1
- package/dist/word/semantic/inline.d.ts.map +1 -1
- package/dist/word/semantic/inline.js +8 -3
- package/dist/word/semantic/inline.js.map +1 -1
- package/dist/word/semantic/prose/paragraphStyle.d.ts +8 -1
- package/dist/word/semantic/prose/paragraphStyle.d.ts.map +1 -1
- package/dist/word/semantic/prose/paragraphStyle.js +19 -0
- package/dist/word/semantic/prose/paragraphStyle.js.map +1 -1
- package/dist/word/semantic/snippet.js +1 -1
- 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.map +1 -1
- package/dist/word/semantic/styles.js +2 -2
- package/dist/word/semantic/styles.js.map +1 -1
- package/package.json +5 -1
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
import { afterEach, describe, expect, it } from 'vitest';
|
|
2
|
+
// @ts-expect-error -- a Node built-in: the package compiles without @types/node.
|
|
3
|
+
import { readFileSync as readFile } from 'node:fs';
|
|
4
|
+
import { buildDocument } from '../../pipeline/index.js';
|
|
5
|
+
import { createMeasurementCache } from '../../measure/index.js';
|
|
6
|
+
import { forgetFontCoverage, registerFontCoverage } from '../../fonts/glyphFallback.js';
|
|
7
|
+
import { readUnderline, underlineOf } from '../../fonts/strikeout.js';
|
|
8
|
+
import { STRIKE_AT, UNDERLINE_AT, UNDERLINE_STROKE } from '../../marks/strikeGeometry.js';
|
|
9
|
+
import { CENTRAL } from '../../measure/cjk/cjkAnnotate.js';
|
|
10
|
+
import { LINE_AT } from '../../marks/cjkMarks/geometry.js';
|
|
11
|
+
import { renderToHtml } from '../../html-backend/html-backend.js';
|
|
12
|
+
import { documentDisplayList } from '../../paint/displayList/index.js';
|
|
13
|
+
// Underlined text (`:underline[…]`, `++…++` with `bodyText.plusUnderline`): the layout is the one without the line, and
|
|
14
|
+
// each line holding underlined words gets a `VDTLine.marks` line under them,
|
|
15
|
+
// where the face puts its underline (`post`), else the fallback.
|
|
16
|
+
const readFileSync = readFile;
|
|
17
|
+
const LORA = new Uint8Array(readFileSync(new URL('../../../../../apps/web/public/fonts/Lora-Regular.ttf', import.meta.url)));
|
|
18
|
+
class StubCtx {
|
|
19
|
+
font = '';
|
|
20
|
+
measureText(s) {
|
|
21
|
+
const size = parseFloat(/(\d*\.?\d+)px/.exec(this.font)?.[1] ?? '16');
|
|
22
|
+
return { width: s.length * size * 0.5 };
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
globalThis.OffscreenCanvas = class {
|
|
26
|
+
getContext() {
|
|
27
|
+
return new StubCtx();
|
|
28
|
+
}
|
|
29
|
+
};
|
|
30
|
+
const pt = (value) => ({ value, unit: 'pt' });
|
|
31
|
+
const config = (fontFamily) => ({
|
|
32
|
+
page: { dpi: 72, width: pt(400), height: pt(300), margins: { top: pt(20), bottom: pt(20), left: pt(20), right: pt(20) } },
|
|
33
|
+
layout: { layoutType: 'single' },
|
|
34
|
+
// `++…++` reads with `bodyText.plusUnderline` on (#1465).
|
|
35
|
+
bodyText: { fontFamily, fontSize: pt(20), lineHeight: pt(26), textAlign: 'left', plusUnderline: true },
|
|
36
|
+
header: { elements: [] },
|
|
37
|
+
footer: { elements: [] },
|
|
38
|
+
});
|
|
39
|
+
const build = (markdown, family = 'Test Serif', extra = {}) => buildDocument({ markdown }, { ...config(family), ...extra }, createMeasurementCache());
|
|
40
|
+
const firstLine = (doc) => doc.blocks.flatMap((b) => b.lines)[0];
|
|
41
|
+
const rules = (line) => (line.marks ?? []).filter((m) => m.kind === 'line');
|
|
42
|
+
afterEach(() => forgetFontCoverage(['Test Serif']));
|
|
43
|
+
describe('underline lines', () => {
|
|
44
|
+
it('draws the same line for :underline[…], and none for ++…++ with the shorthand off (#1465)', () => {
|
|
45
|
+
const plus = rules(firstLine(build('a ++b c++ d')));
|
|
46
|
+
const directive = rules(firstLine(build('a :underline[b c] d')));
|
|
47
|
+
expect(directive.length).toBeGreaterThan(0);
|
|
48
|
+
expect(directive).toEqual(plus);
|
|
49
|
+
const off = build('a ++b c++ d', 'Test Serif', { bodyText: { ...config('Test Serif').bodyText, plusUnderline: false } });
|
|
50
|
+
expect(rules(firstLine(off))).toEqual([]);
|
|
51
|
+
expect(off.blocks[0].lines.map((l) => l.text).join('')).toContain('++b c++');
|
|
52
|
+
});
|
|
53
|
+
it('reads the face’s underline from the post table, as the middle of the line', () => {
|
|
54
|
+
// Lora: top of the line 100 units under the baseline, 50 thick.
|
|
55
|
+
expect(readUnderline(LORA)).toEqual({ position: -0.125, size: 0.05 });
|
|
56
|
+
expect(readUnderline(new Uint8Array([1, 2, 3]))).toBeUndefined();
|
|
57
|
+
registerFontCoverage('Test Serif', 400, 'normal', LORA);
|
|
58
|
+
expect(underlineOf('20px "Test Serif", serif')).toEqual({ position: -0.125, size: 0.05 });
|
|
59
|
+
});
|
|
60
|
+
it('draws one line under the underlined words and the space between them, the layout unchanged', () => {
|
|
61
|
+
const doc = build('Please ++sign here++ and return.');
|
|
62
|
+
const plain = build('Please sign here and return.');
|
|
63
|
+
const line = firstLine(doc);
|
|
64
|
+
expect(line.segments.map((s) => s.width)).toEqual(firstLine(plain).segments.map((s) => s.width));
|
|
65
|
+
const marks = rules(line);
|
|
66
|
+
expect(marks).toHaveLength(1);
|
|
67
|
+
const segs = line.segments;
|
|
68
|
+
const under = segs.filter((s) => s.underline);
|
|
69
|
+
expect(under.map((s) => s.text)).toEqual(['sign', 'here']);
|
|
70
|
+
const before = segs.slice(0, segs.indexOf(under[0])).reduce((w, s) => w + s.width, 0);
|
|
71
|
+
const across = segs.slice(segs.indexOf(under[0]), segs.indexOf(under[1]) + 1).reduce((w, s) => w + s.width, 0);
|
|
72
|
+
expect(marks[0].x).toBeCloseTo(before, 3);
|
|
73
|
+
expect(marks[0].length).toBeCloseTo(across, 3);
|
|
74
|
+
// Unknown face: the fallback, under the baseline.
|
|
75
|
+
expect(marks[0].y).toBeCloseTo(-UNDERLINE_AT * 20, 5);
|
|
76
|
+
expect(marks[0].y).toBeGreaterThan(0);
|
|
77
|
+
expect(marks[0].thickness).toBeCloseTo(UNDERLINE_STROKE * 20, 5);
|
|
78
|
+
});
|
|
79
|
+
it('sits where a registered face puts its underline', () => {
|
|
80
|
+
registerFontCoverage('Test Serif', 400, 'normal', LORA);
|
|
81
|
+
const marks = rules(firstLine(build('a ++b++ c')));
|
|
82
|
+
expect(marks[0].y).toBeCloseTo(0.125 * 20, 5);
|
|
83
|
+
expect(marks[0].thickness).toBeCloseTo(0.05 * 20, 5);
|
|
84
|
+
});
|
|
85
|
+
it('draws both lines on text struck through and underlined, and leaves a full stop out', () => {
|
|
86
|
+
const marks = rules(firstLine(build('a ~~++both++~~ c ++under++.')));
|
|
87
|
+
expect(marks).toHaveLength(3);
|
|
88
|
+
expect(marks.filter((m) => m.y < 0).map((m) => m.y)).toEqual([-STRIKE_AT * 20]);
|
|
89
|
+
const line = firstLine(build('++under++.'));
|
|
90
|
+
const seg = line.segments.find((s) => s.underline);
|
|
91
|
+
expect(seg.underline).toEqual({ id: 0, from: 0, to: 5 });
|
|
92
|
+
expect(rules(line)[0].length).toBeCloseTo(5 * 10, 3);
|
|
93
|
+
});
|
|
94
|
+
it('flags whole runs in the display list and wraps the words in <u> in HTML', () => {
|
|
95
|
+
const doc = build('Please ++sign++ here.');
|
|
96
|
+
const runs = documentDisplayList(doc).flatMap((p) => p.items).flatMap((i) => (i.kind === 'text' ? i.lines.flatMap((l) => l.runs) : []));
|
|
97
|
+
expect(runs.filter((r) => r.underline).map((r) => r.text)).toEqual(['sign']);
|
|
98
|
+
expect(renderToHtml(doc)).toContain('<u style="text-decoration:none;">');
|
|
99
|
+
});
|
|
100
|
+
it('flags the spaces inside an underlined run for the Word export, not those around it', () => {
|
|
101
|
+
const list = documentDisplayList(build('Please ++sign here++ and ++one++ ++two++ now.'));
|
|
102
|
+
const runs = list.flatMap((p) => p.items).flatMap((i) => (i.kind === 'text' ? i.lines.flatMap((l) => l.runs) : []));
|
|
103
|
+
expect(runs.filter((r) => r.underline).map((r) => r.text)).toEqual(['sign', ' ', 'here', 'one', 'two']);
|
|
104
|
+
});
|
|
105
|
+
it('gives way to the line of an underlined link: one line under the link', () => {
|
|
106
|
+
const md = 'Please ++sign [here](https://example.org) now++.';
|
|
107
|
+
const styled = build(md, 'Test Serif', { links: { style: { underline: 'solid', outputs: ['html', 'pdf', 'canvas'] } } });
|
|
108
|
+
const line = firstLine(styled);
|
|
109
|
+
const marks = rules(line);
|
|
110
|
+
// Before the link, under it, after it: pieces that meet.
|
|
111
|
+
expect(marks.map((m) => !!m.underLink)).toEqual([false, true, false]);
|
|
112
|
+
expect(marks[0].x + marks[0].length).toBeCloseTo(marks[1].x, 3);
|
|
113
|
+
expect(marks[1].x + marks[1].length).toBeCloseTo(marks[2].x, 3);
|
|
114
|
+
const link = line.linkUnderlines;
|
|
115
|
+
expect(link).toHaveLength(1);
|
|
116
|
+
expect(marks[1].x).toBeCloseTo(link[0].x, 3);
|
|
117
|
+
expect(marks[1].length).toBeCloseTo(link[0].length, 3);
|
|
118
|
+
// The HTML draws the link's line and the two other pieces, not the
|
|
119
|
+
// underline's piece under the link.
|
|
120
|
+
const ruleSpans = (html) => (html.match(/height:[\d.]+px;background:/g) ?? []).length;
|
|
121
|
+
expect(ruleSpans(renderToHtml(styled))).toBe(2);
|
|
122
|
+
expect(renderToHtml(styled)).toMatch(/border-top:[\d.]+px solid/);
|
|
123
|
+
// An output the style does not list keeps the whole underline.
|
|
124
|
+
expect(ruleSpans(renderToHtml(styled, { output: 'epub' }))).toBe(3);
|
|
125
|
+
// Without a link style: one run, no piece flagged.
|
|
126
|
+
const plain = rules(firstLine(build(md)));
|
|
127
|
+
expect(plain).toHaveLength(1);
|
|
128
|
+
expect(plain[0].underLink).toBeUndefined();
|
|
129
|
+
});
|
|
130
|
+
it('sits as a side line in Chinese text: under the em box, on its right on a vertical page', () => {
|
|
131
|
+
const em = (doc) => parseFloat(/(\d*\.?\d+)px/.exec(doc.blocks[0].fontString)[1]);
|
|
132
|
+
const markOf = (doc) => rules(doc.blocks.flatMap((b) => b.lines).find((l) => l.segments?.some((s) => s.underline)))[0];
|
|
133
|
+
const flat = build('请++在每一页签名++,然后寄回。');
|
|
134
|
+
expect(markOf(flat).y).toBeCloseTo((-CENTRAL + 0.5 + LINE_AT) * em(flat), 3);
|
|
135
|
+
const tall = buildDocument({ markdown: '请++在每一页签名++,然后寄回。' }, { page: { width: pt(300), height: pt(420) }, layout: { writingMode: 'vertical-rl' }, locale: 'zh-Hans', bodyText: { fontSize: pt(12), lineHeight: pt(20), plusUnderline: true } }, createMeasurementCache());
|
|
136
|
+
expect(markOf(tall).y).toBeCloseTo((-CENTRAL - 0.5 - LINE_AT) * em(tall), 3);
|
|
137
|
+
expect(markOf(tall).y).toBeLessThan(0);
|
|
138
|
+
});
|
|
139
|
+
});
|
|
140
|
+
//# sourceMappingURL=underline.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"underline.test.js","sourceRoot":"","sources":["../../../src/__tests__/paint/underline.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"formFields.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/parse/formFields.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { formatFieldNumber, formNumberStyle, numberFieldText, documentLanguageOf } from '../../index.js';
|
|
3
|
+
import { formFieldFromAttrs, formatFieldCalc, parseFieldCalc } from '../../parse/formFields.js';
|
|
4
|
+
// #1445: the number rule every output shares (the PDF's printed values and
|
|
5
|
+
// its widgets' appearance, the canvas preview, writers of the display list).
|
|
6
|
+
const de = formNumberStyle(undefined, 'de-DE');
|
|
7
|
+
const en = formNumberStyle(undefined, 'en-US');
|
|
8
|
+
describe('form field attributes (#1445)', () => {
|
|
9
|
+
it('reads the kind, format, calculation and flags', () => {
|
|
10
|
+
expect(formFieldFromAttrs({ field: 'order.total', format: 'currency', calc: 'sum(a, b)' })).toEqual({
|
|
11
|
+
name: 'order.total', kind: 'number', format: 'currency', calc: { op: 'sum', args: ['a', 'b'], fields: ['a', 'b'] }, readonly: true,
|
|
12
|
+
});
|
|
13
|
+
expect(formFieldFromAttrs({ field: 'size', kind: 'choice', options: 'S | M | L', required: '' })).toEqual({
|
|
14
|
+
name: 'size', kind: 'choice', options: ['S', 'M', 'L'], required: true,
|
|
15
|
+
});
|
|
16
|
+
expect(formFieldFromAttrs({ style: 'field' })).toBeUndefined();
|
|
17
|
+
expect(parseFieldCalc('divide(a, b)')).toBeUndefined();
|
|
18
|
+
});
|
|
19
|
+
it('reads numbers and nested calculations, and every field they read', () => {
|
|
20
|
+
expect(parseFieldCalc('sum(order.a.total, order.b.total, product(order.fee, 161.75), product(order.wrap, order.wrap.price))')).toEqual({
|
|
21
|
+
op: 'sum',
|
|
22
|
+
args: [
|
|
23
|
+
'order.a.total',
|
|
24
|
+
'order.b.total',
|
|
25
|
+
{ op: 'product', args: ['order.fee', 161.75] },
|
|
26
|
+
{ op: 'product', args: ['order.wrap', 'order.wrap.price'] },
|
|
27
|
+
],
|
|
28
|
+
fields: ['order.a.total', 'order.b.total', 'order.fee', 'order.wrap', 'order.wrap.price'],
|
|
29
|
+
});
|
|
30
|
+
// A name that has digits stays a name; a bare number, also negative or
|
|
31
|
+
// with a leading point, is a number. A field read twice is listed once.
|
|
32
|
+
expect(parseFieldCalc('product(pkg.1, -2, .5, pkg.1)')).toEqual({ op: 'product', args: ['pkg.1', -2, 0.5, 'pkg.1'], fields: ['pkg.1'] });
|
|
33
|
+
expect(parseFieldCalc(' MAX( a ,min(b, 3) ) ')?.args).toEqual(['a', { op: 'min', args: ['b', 3] }]);
|
|
34
|
+
// An unknown or empty nested calculation, an unclosed one and trailing
|
|
35
|
+
// text are no calculation.
|
|
36
|
+
for (const bad of ['sum(a, divide(b, 2))', 'sum(a, product())', 'sum(a, product(b, 2)', 'sum(a) b', 'sum(a b(c))', '12.5']) {
|
|
37
|
+
expect(parseFieldCalc(bad)).toBeUndefined();
|
|
38
|
+
}
|
|
39
|
+
});
|
|
40
|
+
it('writes a calculation back as the attribute reads it, numbers and nested calculations in place', () => {
|
|
41
|
+
const calc = parseFieldCalc(' sum( order.a , product(order.fee, 161.75), max(order.b, -2, .5) ) ');
|
|
42
|
+
expect(formatFieldCalc(calc)).toBe('sum(order.a, product(order.fee, 161.75), max(order.b, -2, 0.5))');
|
|
43
|
+
expect(parseFieldCalc(formatFieldCalc(calc))).toEqual(calc);
|
|
44
|
+
// A number JavaScript would write with an exponent is written in digits.
|
|
45
|
+
expect(formatFieldCalc({ op: 'product', args: ['a', 1e-7, 2e21] })).toBe('product(a, 0.0000001, 2000000000000000000000)');
|
|
46
|
+
});
|
|
47
|
+
it('reads the on value of a check box, and of no other kind', () => {
|
|
48
|
+
expect(formFieldFromAttrs({ field: 'order.fee', kind: 'checkbox', on: ' 1 ' })).toEqual({ name: 'order.fee', kind: 'checkbox', on: '1' });
|
|
49
|
+
expect(formFieldFromAttrs({ field: 'order.fee', kind: 'checkbox' })).toEqual({ name: 'order.fee', kind: 'checkbox' });
|
|
50
|
+
expect(formFieldFromAttrs({ field: 'note', on: '1' })).toEqual({ name: 'note', kind: 'text' });
|
|
51
|
+
});
|
|
52
|
+
});
|
|
53
|
+
describe('number style (#1445)', () => {
|
|
54
|
+
it('takes the separators from the document language, options overriding', () => {
|
|
55
|
+
expect(de).toEqual({ currency: '€', currencyBefore: true, separatorStyle: 2 });
|
|
56
|
+
expect(en.separatorStyle).toBe(0);
|
|
57
|
+
expect(formNumberStyle(undefined, undefined).separatorStyle).toBe(0);
|
|
58
|
+
expect(formNumberStyle(undefined, 'de_AT').separatorStyle).toBe(2);
|
|
59
|
+
// A language that only starts like one that writes `1.234,56`.
|
|
60
|
+
expect(formNumberStyle(undefined, 'dsb').separatorStyle).toBe(0);
|
|
61
|
+
expect(formNumberStyle({ separatorStyle: 3, currency: 'CHF', currencyBefore: false }, 'en')).toEqual({ currency: 'CHF', currencyBefore: false, separatorStyle: 3 });
|
|
62
|
+
});
|
|
63
|
+
it('reads the language from the locale, else the hyphenation tag', () => {
|
|
64
|
+
expect(documentLanguageOf({ locale: 'de' })).toBe('de');
|
|
65
|
+
expect(documentLanguageOf({ bodyText: { hyphenation: { locale: 'fr' } } })).toBe('fr');
|
|
66
|
+
expect(documentLanguageOf({ bodyText: { shapingLanguage: 'host', hyphenation: { tag: 'es-ES' } } })).toBe('es-ES');
|
|
67
|
+
expect(documentLanguageOf(undefined)).toBeUndefined();
|
|
68
|
+
});
|
|
69
|
+
});
|
|
70
|
+
describe('formatFieldNumber (#1445)', () => {
|
|
71
|
+
it('writes currency, decimals and integers in the style', () => {
|
|
72
|
+
expect(formatFieldNumber('1234.5', 'currency', de)).toBe('€ 1.234,50');
|
|
73
|
+
expect(formatFieldNumber('1234.5', 'currency', en)).toBe('€ 1,234.50');
|
|
74
|
+
expect(formatFieldNumber('1234.5', 'currency', { ...de, currencyBefore: false })).toBe('1.234,50 €');
|
|
75
|
+
expect(formatFieldNumber('1234,5', 'decimal', de)).toBe('1.234,50');
|
|
76
|
+
expect(formatFieldNumber('1234', 'integer', en)).toBe('1,234');
|
|
77
|
+
expect(formatFieldNumber('1234.56', 'decimal', { ...en, separatorStyle: 1 })).toBe('1234.56');
|
|
78
|
+
expect(formatFieldNumber('1234.56', 'decimal', { ...en, separatorStyle: 3 })).toBe('1234,56');
|
|
79
|
+
});
|
|
80
|
+
it('reads a value written either way', () => {
|
|
81
|
+
for (const raw of ['1234.5', '1234,5', '1.234,50', '1,234.50', ' 1 234,50 ']) {
|
|
82
|
+
expect(formatFieldNumber(raw, 'decimal', de)).toBe('1.234,50');
|
|
83
|
+
}
|
|
84
|
+
// Three digits after the only mark: thousands.
|
|
85
|
+
expect(formatFieldNumber('1.234', 'integer', de)).toBe('1.234');
|
|
86
|
+
expect(formatFieldNumber('-12,5', 'currency', de)).toBe('-€ 12,50');
|
|
87
|
+
expect(formatFieldNumber('-1234', 'decimal', en)).toBe('-1,234.00');
|
|
88
|
+
expect(formatFieldNumber('-0.4', 'integer', en)).toBe('0');
|
|
89
|
+
});
|
|
90
|
+
it('leaves text, an empty value and a percent alone', () => {
|
|
91
|
+
expect(formatFieldNumber('n/a', 'currency', de)).toBeUndefined();
|
|
92
|
+
expect(formatFieldNumber('', 'currency', de)).toBeUndefined();
|
|
93
|
+
expect(formatFieldNumber('12', 'percent', de)).toBeUndefined();
|
|
94
|
+
expect(formatFieldNumber('12', undefined, de)).toBeUndefined();
|
|
95
|
+
});
|
|
96
|
+
});
|
|
97
|
+
describe('numberFieldText (#1445)', () => {
|
|
98
|
+
it('shows a number field formatted, else as typed; other fields not', () => {
|
|
99
|
+
expect(numberFieldText({ name: 'p', kind: 'number', format: 'currency' }, ' 120 ', de)).toBe('€ 120,00');
|
|
100
|
+
expect(numberFieldText({ name: 'q', kind: 'number' }, ' 3 ', de)).toBe('3');
|
|
101
|
+
expect(numberFieldText({ name: 'q', kind: 'number', format: 'currency' }, 'tbd', de)).toBe('tbd');
|
|
102
|
+
expect(numberFieldText({ name: 'q', kind: 'number', format: 'currency' }, ' ', de)).toBeUndefined();
|
|
103
|
+
expect(numberFieldText({ name: 'n', kind: 'text' }, '120', de)).toBeUndefined();
|
|
104
|
+
expect(numberFieldText(undefined, '120', de)).toBeUndefined();
|
|
105
|
+
});
|
|
106
|
+
});
|
|
107
|
+
//# sourceMappingURL=formFields.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"formFields.test.js","sourceRoot":"","sources":["../../../src/__tests__/parse/formFields.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzG,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhG,2EAA2E;AAC3E,6EAA6E;AAE7E,MAAM,EAAE,GAAG,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAC/C,MAAM,EAAE,GAAG,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAE/C,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;IAC7C,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YAClG,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI;SACnI,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YACxG,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,IAAI;SACvE,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QAC/D,MAAM,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,CAAC,cAAc,CAAC,sGAAsG,CAAC,CAAC,CAAC,OAAO,CAAC;YACrI,EAAE,EAAE,KAAK;YACT,IAAI,EAAE;gBACJ,eAAe;gBACf,eAAe;gBACf,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE;gBAC9C,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,YAAY,EAAE,kBAAkB,CAAC,EAAE;aAC5D;YACD,MAAM,EAAE,CAAC,eAAe,EAAE,eAAe,EAAE,WAAW,EAAE,YAAY,EAAE,kBAAkB,CAAC;SAC1F,CAAC,CAAC;QACH,uEAAuE;QACvE,wEAAwE;QACxE,MAAM,CAAC,cAAc,CAAC,+BAA+B,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACzI,MAAM,CAAC,cAAc,CAAC,uBAAuB,CAAC,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpG,uEAAuE;QACvE,2BAA2B;QAC3B,KAAK,MAAM,GAAG,IAAI,CAAC,sBAAsB,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,CAAC;YAC3H,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QAC9C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+FAA+F,EAAE,GAAG,EAAE;QACvG,MAAM,IAAI,GAAG,cAAc,CAAC,qEAAqE,CAAE,CAAC;QACpG,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;QACtG,MAAM,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5D,yEAAyE;QACzE,MAAM,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;IAC5H,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC1I,MAAM,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;QACtH,MAAM,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACjG,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC;QAC/E,MAAM,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACrE,MAAM,CAAC,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnE,+DAA+D;QAC/D,MAAM,CAAC,eAAe,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC;IACtK,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,MAAM,CAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvF,MAAM,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnH,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACxD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,CAAC,iBAAiB,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACvE,MAAM,CAAC,iBAAiB,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACvE,MAAM,CAAC,iBAAiB,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACrG,MAAM,CAAC,iBAAiB,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpE,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/D,MAAM,CAAC,iBAAiB,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9F,MAAM,CAAC,iBAAiB,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAChG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,KAAK,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,CAAC,EAAE,CAAC;YAC7E,MAAM,CAAC,iBAAiB,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjE,CAAC;QACD,+CAA+C;QAC/C,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChE,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpE,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACpE,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QACjE,MAAM,CAAC,iBAAiB,CAAC,EAAE,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QAC9D,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QAC/D,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACjE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACzE,MAAM,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACzG,MAAM,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5E,MAAM,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClG,MAAM,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QACpG,MAAM,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QAChF,MAAM,CAAC,eAAe,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IAChE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"strikethrough.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/parse/strikethrough.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { parseInlineFormatting, stripInlineFormatting } from '../../parse/inlineFormatting.js';
|
|
3
|
+
import { parseMarkdown } from '../../parse/index.js';
|
|
4
|
+
// `~~text~~`: struck-through text (GitHub Flavored Markdown). The text
|
|
5
|
+
// stays ordinary text, its range riding on `InlineSpan.links` with
|
|
6
|
+
// `strike`, as a highlight mark's does; a single `~` pair stays a
|
|
7
|
+
// subscript.
|
|
8
|
+
/** The struck text of `spans`, run by run. */
|
|
9
|
+
function struck(spans) {
|
|
10
|
+
const runs = new Map();
|
|
11
|
+
for (const span of spans) {
|
|
12
|
+
for (const l of span.links ?? []) {
|
|
13
|
+
if (!l.strike)
|
|
14
|
+
continue;
|
|
15
|
+
runs.set(l.strike.id, (runs.get(l.strike.id) ?? '') + span.text.slice(l.start, l.end));
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
return [...runs.values()];
|
|
19
|
+
}
|
|
20
|
+
const text = (spans) => spans.map((s) => s.text).join('');
|
|
21
|
+
describe('~~strikethrough~~', () => {
|
|
22
|
+
it('strikes the text between two tildes on each side, the markers dropped', () => {
|
|
23
|
+
const spans = parseInlineFormatting('Widget A: ~~€ 165,–~~ now € 129,–');
|
|
24
|
+
expect(text(spans)).toBe('Widget A: € 165,– now € 129,–');
|
|
25
|
+
expect(struck(spans)).toEqual(['€ 165,–']);
|
|
26
|
+
// Paint only: the spans are those of the text without the marks.
|
|
27
|
+
expect(spans).toHaveLength(1);
|
|
28
|
+
expect(spans[0].links).toEqual([{ start: 10, end: 17, href: '', strike: { id: 0 } }]);
|
|
29
|
+
});
|
|
30
|
+
it('keeps a single tilde pair a subscript, inside a struck run too', () => {
|
|
31
|
+
const sub = parseInlineFormatting('H~2~O');
|
|
32
|
+
expect(sub.map((s) => s.script)).toEqual([undefined, 'sub', undefined]);
|
|
33
|
+
expect(struck(sub)).toEqual([]);
|
|
34
|
+
const both = parseInlineFormatting('~~H~2~O~~ water');
|
|
35
|
+
expect(text(both)).toBe('H2O water');
|
|
36
|
+
expect(both.map((s) => s.script)).toEqual([undefined, 'sub', undefined]);
|
|
37
|
+
expect(struck(both)).toEqual(['H2O']);
|
|
38
|
+
});
|
|
39
|
+
it('spreads over emphasis, links and soft line breaks, and tells runs apart', () => {
|
|
40
|
+
const spans = parseInlineFormatting('~~old **bold** [link](https://example.org) price~~ and ~~two~~');
|
|
41
|
+
expect(text(spans)).toBe('old bold link price and two');
|
|
42
|
+
expect(struck(spans)).toEqual(['old bold link price', 'two']);
|
|
43
|
+
// The link is still a link, and the strike no link.
|
|
44
|
+
const linked = spans.flatMap((s) => (s.links ?? []).filter((l) => !l.strike).map((l) => [s.text.slice(l.start, l.end), l.href]));
|
|
45
|
+
expect(linked).toEqual([['link', 'https://example.org']]);
|
|
46
|
+
expect(struck(parseInlineFormatting('~~over a\nsoft break~~'))).toEqual(['over a\nsoft break']);
|
|
47
|
+
});
|
|
48
|
+
it('nests in emphasis and holds emphasis', () => {
|
|
49
|
+
const spans = parseInlineFormatting('**~~bold struck~~** and ~~*italic*~~');
|
|
50
|
+
expect(spans.filter((s) => s.bold).map((s) => s.text)).toEqual(['bold struck']);
|
|
51
|
+
expect(struck(spans)).toEqual(['bold struck', 'italic']);
|
|
52
|
+
});
|
|
53
|
+
it('strikes nothing between tildes around spaces, rows of three and lone pairs', () => {
|
|
54
|
+
for (const src of ['~~ not struck ~~', '~~~not struck~~~', 'a ~~ b', '~~~~', 'range 3~~5']) {
|
|
55
|
+
expect(struck(parseInlineFormatting(src))).toEqual([]);
|
|
56
|
+
}
|
|
57
|
+
expect(text(parseInlineFormatting('a ~~ b'))).toBe('a ~~ b');
|
|
58
|
+
});
|
|
59
|
+
it('does not run over a blank line', () => {
|
|
60
|
+
expect(struck(parseInlineFormatting('~~one\n\ntwo~~'))).toEqual([]);
|
|
61
|
+
});
|
|
62
|
+
it('sets escaped tildes literally', () => {
|
|
63
|
+
const spans = parseInlineFormatting('\\~\\~not struck\\~\\~');
|
|
64
|
+
expect(text(spans)).toBe('~~not struck~~');
|
|
65
|
+
expect(struck(spans)).toEqual([]);
|
|
66
|
+
});
|
|
67
|
+
it('leaves tildes in inline code and in a link destination alone', () => {
|
|
68
|
+
const [block] = parseMarkdown('`~~code~~` and [home](https://example.org/~~a~~)');
|
|
69
|
+
expect(struck(block.spans)).toEqual([]);
|
|
70
|
+
expect(block.text).toContain('~~code~~');
|
|
71
|
+
});
|
|
72
|
+
it('stripInlineFormatting drops the markers before the subscripts', () => {
|
|
73
|
+
expect(stripInlineFormatting('~~H~2~O~~ and ~~€ 165,–~~')).toBe('H2O and € 165,–');
|
|
74
|
+
});
|
|
75
|
+
it('maps every character of a block back to its source', () => {
|
|
76
|
+
const md = 'Price ~~€ 165,–~~ now **€ 129,–**.';
|
|
77
|
+
const [block] = parseMarkdown(md);
|
|
78
|
+
expect(block.text).toBe('Price € 165,– now € 129,–.');
|
|
79
|
+
const { text: t, sourceMap } = block;
|
|
80
|
+
for (let i = 0; i < t.length; i++) {
|
|
81
|
+
if (t[i] === ' ')
|
|
82
|
+
continue;
|
|
83
|
+
expect(md[sourceMap[i]]).toBe(t[i]);
|
|
84
|
+
}
|
|
85
|
+
});
|
|
86
|
+
it('strikes the text of a heading and of a table cell', () => {
|
|
87
|
+
const blocks = parseMarkdown('# A ~~struck~~ heading\n\n| Item | Price |\n| --- | --- |\n| Widget A | ~~€ 165~~ € 129 |\n');
|
|
88
|
+
expect(struck(blocks[0].spans)).toEqual(['struck']);
|
|
89
|
+
});
|
|
90
|
+
it('reads two subscripts written together as a strikethrough, as GFM does; a word joiner keeps them subscripts', () => {
|
|
91
|
+
expect(struck(parseInlineFormatting('x~i~~j~ and y~k~~l~'))).toEqual(['j and yk']);
|
|
92
|
+
const spans = parseInlineFormatting('x~i~\u2060~j~ and y~k~\u2060~l~');
|
|
93
|
+
expect(struck(spans)).toEqual([]);
|
|
94
|
+
expect(spans.filter((s) => s.script === 'sub').map((s) => s.text)).toEqual(['i', 'j', 'k', 'l']);
|
|
95
|
+
});
|
|
96
|
+
});
|
|
97
|
+
//# sourceMappingURL=strikethrough.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"strikethrough.test.js","sourceRoot":"","sources":["../../../src/__tests__/parse/strikethrough.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"underline.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/parse/underline.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,161 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { parseInlineFormatting, stripInlineFormatting } from '../../parse/inlineFormatting.js';
|
|
3
|
+
import { parseMarkdown, parseInlineSnippetSpans, underlineRanges } from '../../parse/index.js';
|
|
4
|
+
// Underlined text (#1465): `:underline[text]` always, and `++text++` when
|
|
5
|
+
// `bodyText.plusUnderline` is on. Read like `~~text~~`: the text stays
|
|
6
|
+
// ordinary text, its range riding on `InlineSpan.links` with `underline`.
|
|
7
|
+
function underlined(spans) {
|
|
8
|
+
const runs = new Map();
|
|
9
|
+
for (const span of spans) {
|
|
10
|
+
for (const l of span.links ?? []) {
|
|
11
|
+
if (!l.underline)
|
|
12
|
+
continue;
|
|
13
|
+
runs.set(l.underline.id, (runs.get(l.underline.id) ?? '') + span.text.slice(l.start, l.end));
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
return [...runs.values()];
|
|
17
|
+
}
|
|
18
|
+
const text = (spans) => spans.map((s) => s.text).join('');
|
|
19
|
+
const ON = { plusUnderline: true };
|
|
20
|
+
describe(':underline[text]', () => {
|
|
21
|
+
it('underlines its text, the markup dropped', () => {
|
|
22
|
+
const spans = parseInlineFormatting('Please :underline[sign here] and return.');
|
|
23
|
+
expect(text(spans)).toBe('Please sign here and return.');
|
|
24
|
+
expect(spans).toHaveLength(1);
|
|
25
|
+
expect(spans[0].links).toEqual([{ start: 7, end: 16, href: '', underline: { id: 0 } }]);
|
|
26
|
+
});
|
|
27
|
+
it('holds bold, links and a strikethrough, and keeps runs apart', () => {
|
|
28
|
+
const spans = parseInlineFormatting(':underline[old **bold** [link](https://example.org)] and :underline[two] ~~:underline[both]~~');
|
|
29
|
+
expect(text(spans)).toBe('old bold link and two both');
|
|
30
|
+
expect(underlined(spans)).toEqual(['old bold link', 'two', 'both']);
|
|
31
|
+
expect(spans.find((s) => s.text === 'bold').bold).toBe(true);
|
|
32
|
+
const linked = spans.flatMap((s) => (s.links ?? []).filter((l) => !l.underline && !l.strike).map((l) => l.href));
|
|
33
|
+
expect(linked).toEqual(['https://example.org']);
|
|
34
|
+
expect(spans.some((s) => s.links?.some((l) => l.strike))).toBe(true);
|
|
35
|
+
});
|
|
36
|
+
it('goes inside emphasis and small caps', () => {
|
|
37
|
+
const spans = parseInlineFormatting('**bold :underline[under]** and :smallcaps[:underline[Caps]]');
|
|
38
|
+
expect(underlined(spans)).toEqual(['under', 'Caps']);
|
|
39
|
+
expect(spans.find((s) => s.text === 'Caps').smallCaps).toBe(true);
|
|
40
|
+
});
|
|
41
|
+
it('takes \\] for a literal bracket, and leaves an empty or unclosed one as text', () => {
|
|
42
|
+
expect(underlined(parseInlineFormatting(':underline[a \\] b]'))).toEqual(['a ] b']);
|
|
43
|
+
for (const t of [':underline[] x', ':underline[open', 'a :underline[x\n\ny]']) {
|
|
44
|
+
expect(underlined(parseInlineFormatting(t))).toEqual([]);
|
|
45
|
+
}
|
|
46
|
+
});
|
|
47
|
+
it('is literal in inline code', () => {
|
|
48
|
+
const [block] = parseMarkdown('`:underline[x]` and :underline[y]');
|
|
49
|
+
expect(block.text).toContain(':underline[x]');
|
|
50
|
+
expect(underlined(block.spans)).toEqual(['y']);
|
|
51
|
+
});
|
|
52
|
+
it('reads in captions, cells and headings too', () => {
|
|
53
|
+
expect(underlined(parseInlineSnippetSpans('A :underline[cell]'))).toEqual(['cell']);
|
|
54
|
+
const [h] = parseMarkdown('## A :underline[title]');
|
|
55
|
+
expect(underlined(h.spans)).toEqual(['title']);
|
|
56
|
+
});
|
|
57
|
+
it('maps every character of a block back to its source', () => {
|
|
58
|
+
const md = 'Sign :underline[here **now**] and :underline[[unload](https://x.org)] there.';
|
|
59
|
+
const [block] = parseMarkdown(md);
|
|
60
|
+
expect(block.text).toBe('Sign here now and unload there.');
|
|
61
|
+
const { text: t, sourceMap } = block;
|
|
62
|
+
for (let i = 0; i < t.length; i++) {
|
|
63
|
+
if (t[i] === ' ')
|
|
64
|
+
continue;
|
|
65
|
+
expect(md[sourceMap[i]]).toBe(t[i]);
|
|
66
|
+
}
|
|
67
|
+
// The letters of `underline` never stand for the text's own.
|
|
68
|
+
expect(sourceMap[t.indexOf('unload')]).toBe(md.indexOf('[unload') + 1);
|
|
69
|
+
});
|
|
70
|
+
it('strips the markup for plain text', () => {
|
|
71
|
+
expect(stripInlineFormatting('a :underline[bc **de**] f')).toBe('a bc de f');
|
|
72
|
+
});
|
|
73
|
+
});
|
|
74
|
+
describe('++text++', () => {
|
|
75
|
+
it('is text unless bodyText.plusUnderline is on', () => {
|
|
76
|
+
for (const t of ['Please ++sign here++ and return.', 'use ++i rather than i++ here']) {
|
|
77
|
+
const spans = parseInlineFormatting(t);
|
|
78
|
+
expect(text(spans)).toBe(t);
|
|
79
|
+
expect(underlined(spans)).toEqual([]);
|
|
80
|
+
}
|
|
81
|
+
expect(stripInlineFormatting('a ++bc++ d')).toBe('a ++bc++ d');
|
|
82
|
+
const [block] = parseMarkdown('Sign ++here++.');
|
|
83
|
+
expect(block.text).toBe('Sign ++here++.');
|
|
84
|
+
});
|
|
85
|
+
it('underlines the text between two plus signs on each side when on', () => {
|
|
86
|
+
const spans = parseInlineFormatting('Please ++sign here++ and return.', ON);
|
|
87
|
+
expect(text(spans)).toBe('Please sign here and return.');
|
|
88
|
+
expect(spans[0].links).toEqual([{ start: 7, end: 16, href: '', underline: { id: 0 } }]);
|
|
89
|
+
});
|
|
90
|
+
it('underlines every pair when on, the increment operator included', () => {
|
|
91
|
+
expect(underlined(parseInlineFormatting('use ++i rather than i++ here', ON))).toEqual(['i rather than i']);
|
|
92
|
+
expect(underlined(parseInlineFormatting('++x and y++', ON))).toEqual(['x and y']);
|
|
93
|
+
expect(underlined(parseInlineFormatting('Mark ++x++ here.', ON))).toEqual(['x']);
|
|
94
|
+
});
|
|
95
|
+
it('leaves plus signs that make no pair as text', () => {
|
|
96
|
+
for (const t of ['C++ and C++', '1 ++ 2 ++ 3', '++ a ++', 'a +++b+++ c', 'g++ -O2', 'Notepad++', '++i', 'i++', '用C++编程']) {
|
|
97
|
+
const spans = parseInlineFormatting(t, ON);
|
|
98
|
+
expect(text(spans)).toBe(t);
|
|
99
|
+
expect(underlined(spans)).toEqual([]);
|
|
100
|
+
}
|
|
101
|
+
});
|
|
102
|
+
it('makes no exception for a pair glued to a letter or digit (C++)', () => {
|
|
103
|
+
expect(underlined(parseInlineFormatting('x++y++', ON))).toEqual(['y']);
|
|
104
|
+
expect(underlined(parseInlineFormatting('C++-Kurs und C++-Buch', ON))).toEqual(['-Kurs und C']);
|
|
105
|
+
expect(underlined(parseInlineFormatting('C\\+\\+-Kurs und C\\+\\+-Buch', ON))).toEqual([]);
|
|
106
|
+
});
|
|
107
|
+
it('takes \\+\\+ and \\++ as a literal pair', () => {
|
|
108
|
+
for (const [t, out] of [['\\+\\+not\\+\\+', '++not++'], ['\\++not++', '++not++']]) {
|
|
109
|
+
const spans = parseInlineFormatting(t, ON);
|
|
110
|
+
expect(text(spans)).toBe(out);
|
|
111
|
+
expect(underlined(spans)).toEqual([]);
|
|
112
|
+
}
|
|
113
|
+
});
|
|
114
|
+
it('never underlines in inline code or a code block', () => {
|
|
115
|
+
const [para, code] = parseMarkdown('`++x++` and [home](https://example.org/++a++) ++y++\n\n```\n++z++\n```', ON);
|
|
116
|
+
expect(para.text).toContain('++x++');
|
|
117
|
+
expect(underlined(para.spans)).toEqual(['y']);
|
|
118
|
+
expect(code.type).toBe('code');
|
|
119
|
+
expect(code.text).toBe('++z++');
|
|
120
|
+
});
|
|
121
|
+
it('opens and closes beside a Chinese or Japanese character', () => {
|
|
122
|
+
expect(underlined(parseInlineFormatting('请++在每一页签名++,然后寄回。', ON))).toEqual(['在每一页签名']);
|
|
123
|
+
expect(underlined(parseInlineFormatting('++すべてのページに署名++のうえ', ON))).toEqual(['すべてのページに署名']);
|
|
124
|
+
});
|
|
125
|
+
it('reaches headings, list items, cells and chips through the options', () => {
|
|
126
|
+
const blocks = parseMarkdown('## A ++title++\n\n- an ++item++\n\nA :chip[++word++] here.', ON);
|
|
127
|
+
expect(blocks.map((b) => underlined(b.spans.flatMap((s) => s.chip ? s.chip.spans : [s])))).toEqual([['title'], ['item'], ['word']]);
|
|
128
|
+
expect(underlined(parseInlineSnippetSpans('A ++cell++', ON))).toEqual(['cell']);
|
|
129
|
+
expect(underlined(parseInlineSnippetSpans('A ++cell++'))).toEqual([]);
|
|
130
|
+
});
|
|
131
|
+
it('scans long hostile rows in linear time', () => {
|
|
132
|
+
const rows = ['++a '.repeat(50_000), '字++'.repeat(50_000), 'a++ '.repeat(50_000), '++i x i++ '.repeat(20_000), `++${'+a'.repeat(50_000)}`, `++a${' b'.repeat(100_000)}`, '+'.repeat(200_000)];
|
|
133
|
+
const t0 = performance.now();
|
|
134
|
+
for (const r of rows)
|
|
135
|
+
parseInlineFormatting(r, ON);
|
|
136
|
+
expect(performance.now() - t0).toBeLessThan(2000);
|
|
137
|
+
});
|
|
138
|
+
it('maps every character of a block back to its source', () => {
|
|
139
|
+
const md = 'Sign ++here++ and ~~there~~ **now**.';
|
|
140
|
+
const [block] = parseMarkdown(md, ON);
|
|
141
|
+
expect(block.text).toBe('Sign here and there now.');
|
|
142
|
+
const { text: t, sourceMap } = block;
|
|
143
|
+
for (let i = 0; i < t.length; i++) {
|
|
144
|
+
if (t[i] === ' ')
|
|
145
|
+
continue;
|
|
146
|
+
expect(md[sourceMap[i]]).toBe(t[i]);
|
|
147
|
+
}
|
|
148
|
+
});
|
|
149
|
+
it('strips the markers for plain text when on', () => {
|
|
150
|
+
expect(stripInlineFormatting('a ++bc de++ f', ON)).toBe('a bc de f');
|
|
151
|
+
});
|
|
152
|
+
});
|
|
153
|
+
describe('underlineRanges (the Sandbox editor)', () => {
|
|
154
|
+
it('finds the directive always and ++…++ only when on', () => {
|
|
155
|
+
const line = 'a :underline[b] ++c++';
|
|
156
|
+
expect(underlineRanges(line)).toEqual([{ from: 2, to: 15, open: 11, close: 1 }]);
|
|
157
|
+
expect(underlineRanges(line, ON)).toEqual([{ from: 2, to: 15, open: 11, close: 1 }, { from: 16, to: 21, open: 2, close: 2 }]);
|
|
158
|
+
expect(underlineRanges('\\++x++', ON)).toEqual([]);
|
|
159
|
+
});
|
|
160
|
+
});
|
|
161
|
+
//# sourceMappingURL=underline.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"underline.test.js","sourceRoot":"","sources":["../../../src/__tests__/parse/underline.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"calloutHangingIndent.test.d.ts","sourceRoot":"","sources":["../../../../src/__tests__/pipeline/callouts/calloutHangingIndent.test.ts"],"names":[],"mappings":""}
|