postext 1.15.0 → 1.16.0

package/dist/__tests__/video.test.js

@@ -0,0 +1,305 @@
+import { describe, it, expect } from 'vitest';
+import { buildDocument } from '../pipeline';
+import { createBundle, defaultResourceTypes, effectiveResourceTypes, encodeQr, openBundle, parseVideoUrl, renderToHtml, resolveVideoStyleConfig, resourceVideoLink, stripConfigDefaults, videoElementAttributes, videoEmbedUrl, videoWatchUrl, DEFAULT_VIDEO_PLAYER_OPTIONS, } from '../index';
+import { collectContentWarnings } from '../pipeline/contentWarnings';
+// Deterministic text measurement stub (no DOM in the node test env).
+class StubCtx {
+    font = '';
+    measureText(s) {
+        return { width: s.length * 7 };
+    }
+}
+globalThis.OffscreenCanvas = class {
+    getContext() {
+        return new StubCtx();
+    }
+};
+const px = (value) => ({ value, unit: 'px' });
+/** A screen-like page: 600 × 900 px at 96 dpi, no margins, one column. */
+const PAGE = {
+    page: { dpi: 96, width: px(600), height: px(900), margins: { top: px(0), bottom: px(0), left: px(0), right: px(0) } },
+    layout: { layoutType: 'single' },
+    headings: { balancing: { enabled: false }, levels: [{ level: 1, breakBefore: { enabled: false } }] },
+};
+const youtube = (over = {}) => ({
+    id: 'talk',
+    typeId: 'video',
+    kind: 'video',
+    caption: 'The talk.',
+    createdAt: 0,
+    updatedAt: 0,
+    video: {
+        source: 'youtube',
+        url: 'https://www.youtube.com/watch?v=dQw4w9WgXcQ',
+        poster: { fileId: 'poster', format: 'jpeg', width: 1280, height: 720 },
+    },
+    placement: { position: 'here' },
+    ...over,
+});
+const ownFile = (over = {}) => ({
+    id: 'clip',
+    typeId: 'video',
+    kind: 'video',
+    caption: 'A clip.',
+    createdAt: 0,
+    updatedAt: 0,
+    video: { source: 'file', fileId: 'clip.mp4', format: 'mp4', poster: { fileId: 'clip.jpg', format: 'jpeg', width: 800, height: 600 }, ...over },
+    placement: { position: 'here' },
+});
+const resourceBlocks = (doc) => {
+    const out = [];
+    for (const page of doc.pages) {
+        for (const col of page.columns)
+            for (const b of col.blocks)
+                if (b.type === 'resource')
+                    out.push(b);
+        for (const f of page.floats ?? [])
+            if (f.resourceBlock)
+                out.push(f);
+    }
+    return out;
+};
+// The label and its number are joined by a no-break space.
+const captionText = (b) => b.resourceBlock.captionLines.map((l) => l.text).join(' ').replace(/\u00a0/g, ' ');
+describe('video addresses', () => {
+    it('recognises YouTube links of every shape', () => {
+        for (const url of [
+            'https://www.youtube.com/watch?v=dQw4w9WgXcQ',
+            'youtube.com/watch?v=dQw4w9WgXcQ&list=x',
+            'https://youtu.be/dQw4w9WgXcQ',
+            'https://m.youtube.com/shorts/dQw4w9WgXcQ',
+            'https://www.youtube-nocookie.com/embed/dQw4w9WgXcQ',
+        ]) {
+            expect(parseVideoUrl(url)).toEqual({ source: 'youtube', id: 'dQw4w9WgXcQ' });
+        }
+        expect(parseVideoUrl('https://youtu.be/dQw4w9WgXcQ?t=1m30s')).toEqual({ source: 'youtube', id: 'dQw4w9WgXcQ', start: 90 });
+        expect(parseVideoUrl('https://www.youtube.com/watch?v=short')).toBeUndefined();
+    });
+    it('recognises Vimeo links, unlisted ones with their hash', () => {
+        expect(parseVideoUrl('https://vimeo.com/76979871')).toEqual({ source: 'vimeo', id: '76979871' });
+        expect(parseVideoUrl('https://vimeo.com/channels/staffpicks/76979871')).toEqual({ source: 'vimeo', id: '76979871' });
+        expect(parseVideoUrl('https://vimeo.com/76979871/abc123def0')).toEqual({ source: 'vimeo', id: '76979871', hash: 'abc123def0' });
+        expect(parseVideoUrl('https://player.vimeo.com/video/76979871?h=abc123def0')).toEqual({ source: 'vimeo', id: '76979871', hash: 'abc123def0' });
+        expect(parseVideoUrl('https://example.com/76979871')).toBeUndefined();
+    });
+    it('builds the watch page and the player address with the player options', () => {
+        const yt = parseVideoUrl('https://youtu.be/dQw4w9WgXcQ');
+        expect(videoWatchUrl(yt, 12)).toBe('https://youtu.be/dQw4w9WgXcQ?t=12');
+        const embed = videoEmbedUrl(yt, { ...DEFAULT_VIDEO_PLAYER_OPTIONS, controls: false, loop: true, fullscreen: false }, { start: 5, end: 20 });
+        expect(embed.startsWith('https://www.youtube-nocookie.com/embed/dQw4w9WgXcQ?')).toBe(true);
+        const q = new URL(embed).searchParams;
+        expect(q.get('controls')).toBe('0');
+        expect(q.get('loop')).toBe('1');
+        expect(q.get('playlist')).toBe('dQw4w9WgXcQ');
+        expect(q.get('fs')).toBe('0');
+        expect(q.get('start')).toBe('5');
+        expect(q.get('end')).toBe('20');
+        const vimeo = videoEmbedUrl(parseVideoUrl('https://vimeo.com/1/abcdef12'), { ...DEFAULT_VIDEO_PLAYER_OPTIONS, privacy: true, playbackRate: false });
+        expect(vimeo).toContain('player.vimeo.com/video/1?');
+        expect(vimeo).toContain('h=abcdef12');
+        expect(vimeo).toContain('dnt=1');
+        expect(vimeo).toContain('speed=0');
+    });
+    it('turns the player options into HTML5 video attributes', () => {
+        const attrs = Object.fromEntries(videoElementAttributes({ ...DEFAULT_VIDEO_PLAYER_OPTIONS, download: false, pictureInPicture: false }));
+        expect(attrs.controls).toBe(true);
+        expect(attrs.controlslist).toBe('nodownload');
+        expect(attrs.disablepictureinpicture).toBe(true);
+        expect(attrs.preload).toBe('metadata');
+        expect(attrs.autoplay).toBeUndefined();
+    });
+    it('links a self-hosted file to its production address only', () => {
+        expect(resourceVideoLink(ownFile())).toBeUndefined();
+        expect(resourceVideoLink(ownFile({ url: 'https://cdn.example.org/clip.mp4' }))).toBe('https://cdn.example.org/clip.mp4');
+        expect(resourceVideoLink(youtube())).toBe('https://youtu.be/dQw4w9WgXcQ');
+    });
+});
+describe('QR codes', () => {
+    it('picks the smallest version and is deterministic', () => {
+        const a = encodeQr('https://youtu.be/dQw4w9WgXcQ', 'M');
+        expect(a.size).toBe(29); // version 3: 28 bytes overflow 2-M's 26
+        expect(a.rows).toHaveLength(29);
+        expect(a.rows.every((r) => r.length === 29 && /^[01]+$/.test(r))).toBe(true);
+        expect(encodeQr('https://youtu.be/dQw4w9WgXcQ', 'M')).toEqual(a);
+        // Finder pattern in the top-left corner.
+        expect(a.rows[0].slice(0, 7)).toBe('1111111');
+        expect(a.rows[1].slice(0, 7)).toBe('1000001');
+        expect(a.rows[3].slice(0, 7)).toBe('1011101');
+    });
+    it('grows with the data and gives up past version 40', () => {
+        expect(encodeQr('x'.repeat(500), 'L').size).toBeGreaterThan(57);
+        expect(encodeQr('x'.repeat(4000), 'H')).toBeUndefined();
+    });
+});
+describe('video resources in layout', () => {
+    it('numbers videos on their own: Video 1.1 next to Figure 1.1', () => {
+        const figure = {
+            id: 'fig', typeId: 'figure', kind: 'bitmap', caption: 'A figure.', createdAt: 0, updatedAt: 0,
+            bitmap: { fileId: 'f', format: 'png', width: 600, height: 300 }, placement: { position: 'here' },
+        };
+        const doc = buildDocument({ markdown: '# One\n\n::resource{id="fig"}\n\n::resource{id="talk"}\n\nSee :ref{id="talk"}.', resources: [figure, youtube()] }, PAGE);
+        const [fig, video] = resourceBlocks(doc);
+        expect(captionText(fig)).toContain('Figure 1.1');
+        expect(captionText(video)).toContain('Video 1.1');
+        expect(video.resourceBlock.kind).toBe('video');
+    });
+    it('numbers videos in a book whose resource types predate them', () => {
+        const config = { ...PAGE, locale: 'es', resourceTypes: defaultResourceTypes('es').filter((t) => t.id !== 'video') };
+        expect(effectiveResourceTypes(config, [youtube()]).map((t) => t.id)).toEqual(['figure', 'table', 'video']);
+        expect(effectiveResourceTypes(config, []).map((t) => t.id)).toEqual(['figure', 'table']);
+        const doc = buildDocument({ markdown: '# Uno\n\n::resource{id="talk"}', resources: [youtube()] }, config);
+        expect(captionText(resourceBlocks(doc)[0])).toContain('Vídeo 1.1');
+    });
+    it('sets the poster at the measure with its ratio, the play mark and the QR code on it', () => {
+        const doc = buildDocument({ markdown: '::resource{id="talk"}', resources: [youtube()] }, PAGE);
+        const rb = resourceBlocks(doc)[0].resourceBlock;
+        expect(rb.fileId).toBe('poster');
+        expect(rb.bodyRect.width).toBeCloseTo(600, 3);
+        expect(rb.bodyRect.height).toBeCloseTo(337.5, 3);
+        const v = rb.video;
+        expect(v.link).toBe('https://youtu.be/dQw4w9WgXcQ');
+        expect(v.embedUrl).toContain('youtube-nocookie.com/embed/dQw4w9WgXcQ');
+        expect(v.linkPoster).toBe(true);
+        // 12 mm at 96 dpi, centred.
+        const mark = v.playMark;
+        expect(mark.rect.height).toBeCloseTo(45.354, 2);
+        expect(mark.rect.x + mark.rect.width / 2).toBeCloseTo(300, 3);
+        expect(mark.rect.y + mark.rect.height / 2).toBeCloseTo(168.75, 3);
+        // 18 mm, 3 mm from the bottom-right corner.
+        const qr = v.qr;
+        expect(qr.text).toBe('https://youtu.be/dQw4w9WgXcQ');
+        expect(qr.rect.width).toBeCloseTo(68.03, 1);
+        expect(qr.rect.x + qr.rect.width).toBeCloseTo(600 - 11.339, 2);
+        expect(qr.rect.y + qr.rect.height).toBeCloseTo(337.5 - 11.339, 2);
+        expect(qr.moduleSize * (qr.size + 2 * qr.quietZone)).toBeCloseTo(qr.rect.width, 6);
+    });
+    it('follows the video style: positions, sizes, overlays off', () => {
+        const config = {
+            ...PAGE,
+            videoStyle: {
+                playMark: { position: 'top-left', shape: 'rounded', size: px(40), inset: px(10) },
+                qr: { enabled: false },
+                linkPoster: false,
+            },
+        };
+        const doc = buildDocument({ markdown: '::resource{id="talk"}', resources: [youtube()] }, config);
+        const v = resourceBlocks(doc)[0].resourceBlock.video;
+        expect(v.qr).toBeUndefined();
+        expect(v.linkPoster).toBe(false);
+        expect(v.playMark.rect).toMatchObject({ x: 10, y: 10, height: 40 });
+        expect(v.playMark.rect.width).toBeCloseTo(58, 6);
+    });
+    it('prints no QR code for a self-hosted file without a production address', () => {
+        const doc = buildDocument({ markdown: '::resource{id="clip"}', resources: [ownFile()] }, PAGE);
+        const rb = resourceBlocks(doc)[0].resourceBlock;
+        expect(rb.video.qr).toBeUndefined();
+        expect(rb.video.fileId).toBe('clip.mp4');
+        expect(rb.video.mimeType).toBe('video/mp4');
+        expect(rb.bodyRect.height).toBeCloseTo(450, 3);
+    });
+    it('keeps a 16:9 box for a video without a poster', () => {
+        const r = youtube();
+        delete r.video.poster;
+        const doc = buildDocument({ markdown: '::resource{id="talk"}', resources: [r] }, PAGE);
+        const rb = resourceBlocks(doc)[0].resourceBlock;
+        expect(rb.fileId).toBeUndefined();
+        expect(rb.bodyRect.height).toBeCloseTo(337.5, 3);
+    });
+    it('floats a referenced video like a figure', () => {
+        const r = youtube({ placement: { position: 'auto' } });
+        const doc = buildDocument({ markdown: 'As :ref{id="talk"} shows, the lantern is lit.', resources: [r] }, PAGE);
+        const floats = doc.pages.flatMap((p) => p.floats ?? []);
+        expect(floats.some((f) => f.resourceBlock?.kind === 'video')).toBe(true);
+    });
+    it('warns about a missing poster, a missing address and a foreign link', () => {
+        const noPoster = youtube({ id: 'a' });
+        delete noPoster.video.poster;
+        const badLink = youtube({ id: 'b', video: { source: 'vimeo', url: 'https://youtu.be/dQw4w9WgXcQ' } });
+        const file = { ...ownFile(), id: 'c' };
+        const warnings = collectContentWarnings('::resource{id="a"}\n\n::resource{id="b"}\n\n::resource{id="c"}', PAGE, [noPoster, badLink, file]);
+        const kinds = warnings.map((w) => w.kind);
+        expect(kinds).toContain('videoWithoutPoster');
+        expect(kinds).toContain('videoUrlInvalid');
+        expect(kinds).toContain('videoWithoutUrl');
+    });
+});
+describe('video style config', () => {
+    it('resolves defaults and strips them again', () => {
+        const r = resolveVideoStyleConfig();
+        expect(r.playMark.position).toBe('center');
+        expect(r.qr.position).toBe('bottom-right');
+        expect(r.html).toBe('player');
+        expect(r.player.download).toBe(true);
+        const stripped = stripConfigDefaults({ videoStyle: { qr: { position: 'bottom-right', size: px(30) }, player: { download: false, controls: true } } });
+        expect(stripped.videoStyle).toEqual({ qr: { size: px(30) }, player: { download: false } });
+        expect(stripConfigDefaults({ videoStyle: { html: 'player' } }).videoStyle).toBeUndefined();
+    });
+});
+describe('video resources in HTML', () => {
+    const html = (resources, config = PAGE, options = {}) => {
+        const doc = buildDocument({ markdown: resources.map((r) => `::resource{id="${r.id}"}`).join('\n\n'), resources }, config);
+        return renderToHtml(doc, { resourceImageUrl: (id) => `blob:${id}`, ...options });
+    };
+    it('embeds the YouTube player', () => {
+        const out = html([youtube({ altText: 'A talk on lanterns' })]);
+        expect(out).toContain('<iframe class="pt-video" src="https://www.youtube-nocookie.com/embed/dQw4w9WgXcQ?');
+        expect(out).toContain('title="A talk on lanterns"');
+        expect(out).toContain('allowfullscreen="allowfullscreen"');
+    });
+    it('plays a self-hosted file in an HTML5 player with its options', () => {
+        const config = { ...PAGE, videoStyle: { player: { download: false } } };
+        const out = html([ownFile({ start: 3 })], config, { resourceVideoUrl: (id) => `blob:${id}` });
+        expect(out).toContain('<video class="pt-video" src="blob:clip.mp4#t=3" poster="blob:clip.jpg"');
+        expect(out).toContain('controls="controls"');
+        expect(out).toContain('controlslist="nodownload"');
+    });
+    it('falls back to the production address, then to the poster', () => {
+        expect(html([ownFile({ url: 'https://cdn.example.org/clip.mp4' })])).toContain('src="https://cdn.example.org/clip.mp4"');
+        const poster = html([ownFile()]);
+        expect(poster).not.toContain('<video');
+        expect(poster).toContain('src="blob:clip.jpg"');
+    });
+    it('sets the poster with its overlays, linked, when asked to', () => {
+        const out = html([youtube()], { ...PAGE, videoStyle: { html: 'poster' } });
+        expect(out).not.toContain('<iframe');
+        expect(out).toContain('<a class="pt-video-link" href="https://youtu.be/dQw4w9WgXcQ"');
+        expect(out).toContain('<ellipse');
+        expect(out).toContain('shape-rendering="crispEdges"');
+        const files = html([youtube()], PAGE, { videos: { streams: 'poster' } });
+        expect(files).not.toContain('<iframe');
+    });
+});
+describe('video resources in bundles', () => {
+    it('carries the video file and its poster, and reads them back', async () => {
+        const r = ownFile({ url: 'https://cdn.example.org/clip.mp4', player: { download: false } });
+        const { manifest, files, warnings } = await createBundle({
+            name: 'Clips',
+            markdown: '::resource{id="clip"}',
+            resources: [r],
+            files: { 'clip.mp4': new Uint8Array([0, 0, 0, 24, 102, 116, 121, 112]), 'clip.jpg': new Uint8Array([0xff, 0xd8, 0xff]) },
+        });
+        expect(warnings).toEqual([]);
+        expect(manifest.resources?.[0]).toMatchObject({
+            id: 'clip', kind: 'video', file: 'resources/clip.mp4', poster: 'resources/clip.poster.jpg', width: 800, height: 600,
+            video: { source: 'file', url: 'https://cdn.example.org/clip.mp4', format: 'mp4', player: { download: false } },
+        });
+        expect(manifest.resources?.[0]?.video?.fileId).toBeUndefined();
+        expect(Object.keys(files)).toEqual(expect.arrayContaining(['resources/clip.mp4', 'resources/clip.poster.jpg']));
+        const { bytes } = await createBundle({ name: 'Clips', markdown: '::resource{id="clip"}', resources: [r], files: { 'clip.mp4': new Uint8Array([1]), 'clip.jpg': new Uint8Array([2]) } });
+        const opened = await openBundle(bytes);
+        const back = opened.resources[0];
+        expect(back.kind).toBe('video');
+        expect(back.video).toMatchObject({
+            source: 'file', fileId: 'resources/clip.mp4', format: 'mp4', url: 'https://cdn.example.org/clip.mp4',
+            poster: { fileId: 'resources/clip.poster.jpg', format: 'jpeg', width: 800, height: 600 },
+        });
+        expect(opened.files.get('resources/clip.mp4')).toEqual(new Uint8Array([1]));
+    });
+    it('keeps a YouTube video with no files, and a video whose file is missing', async () => {
+        const { manifest, warnings } = await createBundle({ name: 'x', markdown: '::resource{id="talk"}', resources: [youtube()] });
+        expect(warnings).toEqual(['talk: missing file, skipped']);
+        expect(manifest.resources?.[0]).toMatchObject({ id: 'talk', kind: 'video', video: { source: 'youtube' } });
+        expect(manifest.resources?.[0]?.poster).toBeUndefined();
+    });
+});
+//# sourceMappingURL=video.test.js.map

package/dist/__tests__/video.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"video.test.js","sourceRoot":"","sources":["../../src/__tests__/video.test.ts"],"names":[],"mappings":"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"}

package/dist/arabicMarks.d.ts

@@ -24,7 +24,12 @@
  *   a descender at the other end of the line. Ink boxes are what the
  *   measurer gives (`TextMetrics.actualBoundingBox*`); without them (no
  *   canvas metrics) a word's box is estimated from its size and from the
- *   marks it holds.
+ *   marks it holds. Two words whose boxes meet are painted and compared
+ *   pixel column by pixel column (`profileNeed`, #445): a box only says
+ *   how high a word's tallest mark rises and how low its deepest
+ *   descender hangs, wherever they stand along it, and fully vocalised
+ *   text set at its face's own line spacing has boxes that meet on
+ *   nearly every line while its ink never does.
  *
  * A document without vowel marks is looked at once per line (one regular
  * expression test) and left as it was.
@@ -58,6 +63,11 @@ interface WordInk {
     ascent: number;
     descent: number;
     marked: boolean;
+    /** What is painted and in which font, and how far it is moved off the
+     *  baseline (up: positive), for its ink profile. */
+    text: string;
+    font: string;
+    shift: number;
 }
 type BlockLike = Parameters<typeof segmentPositions>[1];
 /** The words of a line with their ink, at the x the renderers paint them

package/dist/arabicMarks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arabicMarks.d.ts","sourceRoot":"","sources":["../src/arabicMarks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAG5E,OAAO,EAAe,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE3D;;;;;;;YAOY;AACZ,eAAO,MAAM,cAAc,QAA+B,CAAC;AAU3D,6DAA6D;AAC7D,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEpD;AAsBD,qEAAqE;AACrE,UAAU,GAAG;IACX,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAOD;iDACiD;AACjD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,CAoBxD;AAQD;qCACqC;AACrC,UAAU,OAAO;IACf,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,KAAK,SAAS,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;AAExD;;oEAEoE;AACpE,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,EAAE,CA8BvE;AAQD;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,WAAW,GAAG,cAAc,EAAE,CA2EtE;AAED;;eAEe;AACf,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,QAAQ,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAarG"}
+{"version":3,"file":"arabicMarks.d.ts","sourceRoot":"","sources":["../src/arabicMarks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAG5E,OAAO,EAAe,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE3D;;;;;;;YAOY;AACZ,eAAO,MAAM,cAAc,QAA+B,CAAC;AAU3D,6DAA6D;AAC7D,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEpD;AAsBD,qEAAqE;AACrE,UAAU,GAAG;IACX,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAOD;iDACiD;AACjD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,CAoBxD;AAQD;qCACqC;AACrC,UAAU,OAAO;IACf,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB;wDACoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,KAAK,SAAS,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;AAExD;;oEAEoE;AACpE,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,EAAE,CAkCvE;AA2DD;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,WAAW,GAAG,cAAc,EAAE,CAiFtE;AAED;;eAEe;AACf,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,QAAQ,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAarG"}

package/dist/arabicMarks.js

@@ -24,12 +24,17 @@
  *   a descender at the other end of the line. Ink boxes are what the
  *   measurer gives (`TextMetrics.actualBoundingBox*`); without them (no
  *   canvas metrics) a word's box is estimated from its size and from the
- *   marks it holds.
+ *   marks it holds. Two words whose boxes meet are painted and compared
+ *   pixel column by pixel column (`profileNeed`, #445): a box only says
+ *   how high a word's tallest mark rises and how low its deepest
+ *   descender hangs, wherever they stand along it, and fully vocalised
+ *   text set at its face's own line spacing has boxes that meet on
+ *   nearly every line while its ink never does.
  *
  * A document without vowel marks is looked at once per line (one regular
  * expression test) and left as it was.
  */
-import { measureInkBox } from './measure/canvas';
+import { measureInkBox, measureInkProfile } from './measure/canvas';
 import { fontEm } from './measure/vertical';
 import { segmentFont, segmentPositions } from './cjkMarks';
 /** The combining marks of Arabic vocalisation and Qurʾānic annotation:
@@ -116,7 +121,7 @@ export function lineWordInks(line, block) {
         if (!line.text.trim())
             return [];
         const ink = inkBoxOf(line.text, block.fontString);
-        return [{ x0: line.bbox.x, x1: line.bbox.x + line.bbox.width, ...ink, marked: hasArabicMarks(line.text) }];
+        return [{ x0: line.bbox.x, x1: line.bbox.x + line.bbox.width, ...ink, marked: hasArabicMarks(line.text), text: line.text, font: block.fontString, shift: 0 }];
     }
     const { xs, widths } = segmentPositions(line, block);
     const at = xs.slice();
@@ -131,7 +136,8 @@ export function lineWordInks(line, block) {
     segments.forEach((seg, i) => {
         if (seg.kind !== 'text' || !seg.text.trim())
             return;
-        const ink = inkBoxOf(seg.text, segmentFont(seg, block));
+        const font = segmentFont(seg, block);
+        const ink = inkBoxOf(seg.text, font);
         const shift = seg.baselineShift ?? 0;
         out.push({
             x0: at[i],
@@ -139,11 +145,66 @@ export function lineWordInks(line, block) {
             ascent: ink.ascent - shift,
             descent: ink.descent + shift,
             marked: hasArabicMarks(seg.text),
+            text: seg.text,
+            font,
+            shift,
         });
     });
     return out;
 }
 const round = (v) => Math.round(v * 1000) / 1000;
+/** Ink profiles painted, per font and text (`null`: none could be). */
+let profileCache = new Map();
+const MAX_PROFILE_ENTRIES = 5_000;
+function profileOf(word) {
+    const key = `${word.font}\u0000${word.text}`;
+    let profile = profileCache.get(key);
+    if (profile === undefined) {
+        if (profileCache.size >= MAX_PROFILE_ENTRIES)
+            profileCache = new Map();
+        profile = measureInkProfile(word.text, word.font);
+        profileCache.set(key, profile);
+    }
+    return profile;
+}
+/**
+ * How much room the ink of `lower` and of `upper` (the word over it on the
+ * line above) take together where they stand over each other, px: the
+ * largest sum, column by column, of what rises above the lower word's
+ * baseline and what hangs under the upper word's. A word's box only says
+ * how high its tallest mark rises and how low its deepest descender
+ * hangs, wherever they are along it: a shadda at one end of a word and a
+ * yāʾ's tail at the other end of the word above are no collision. Null
+ * when the words can't be painted (no canvas): their boxes decide.
+ */
+function profileNeed(lower, upper) {
+    const lp = profileOf(lower);
+    const up = profileOf(upper);
+    if (!lp || !up)
+        return null;
+    // A word painted wider or narrower than set (kashida, tracking) is
+    // stretched to its box.
+    const ls = lp.advance > 0 ? (lower.x1 - lower.x0) / lp.advance : 1;
+    const us = up.advance > 0 ? (upper.x1 - upper.x0) / up.advance : 1;
+    let need = -Infinity;
+    for (let c = 0; c < lp.above.length; c++) {
+        const a = lp.above[c];
+        if (a === -Infinity)
+            continue;
+        const xa = lower.x0 + (lp.start + c) * ls;
+        const xb = xa + ls;
+        // The upper word's columns under this one.
+        const from = Math.max(0, Math.floor((xa - upper.x0) / us - up.start));
+        const to = Math.min(up.below.length - 1, Math.ceil((xb - upper.x0) / us - up.start));
+        for (let k = from; k <= to; k++) {
+            const b = up.below[k];
+            if (b === -Infinity)
+                continue;
+            need = Math.max(need, a - lower.shift + b + upper.shift);
+        }
+    }
+    return need === -Infinity ? 0 : need;
+}
 /** Two lines' ink may touch by this much (px) before they are reported:
  *  antialiasing, not a collision. */
 const TOUCH_PX = 0.5;
@@ -168,6 +229,7 @@ export function annotateArabicMarks(doc) {
     if (!any)
         return [];
     inkCache = new Map();
+    profileCache = new Map();
     /** Lines of the columns that hold a marked line, with their words. */
     const columns = new Map();
     const marked = new Set();
@@ -224,7 +286,12 @@ export function annotateArabicMarks(doc) {
                         continue;
                     if (Math.min(lower.x1, upper.x1) - Math.max(lower.x0, upper.x0) <= 0)
                         continue;
-                    need = Math.max(need, lower.ascent + upper.descent);
+                    const boxes = lower.ascent + upper.descent;
+                    if (boxes <= pitch + TOUCH_PX) {
+                        need = Math.max(need, boxes);
+                        continue;
+                    }
+                    need = Math.max(need, profileNeed(lower, upper) ?? boxes);
                 }
             }
             if (need <= pitch + TOUCH_PX)

package/dist/arabicMarks.js.map

@@ -1 +1 @@
-{"version":3,"file":"arabicMarks.js","sourceRoot":"","sources":["../src/arabicMarks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"arabicMarks.js","sourceRoot":"","sources":["../src/arabicMarks.ts"],"names":[],"mappings":"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"}

package/dist/bundle/adapters.d.ts

@@ -24,6 +24,12 @@ export declare function bundleImageUrl(bundle: BundleSource): ((fileId: string)
     revoke: () => void;
     singleInk: false;
 };
+/** A `resourceVideoUrl` resolver for `renderToHtml` (#454): object URLs
+ *  over the bundle's self-hosted videos, built once. `revoke()` frees
+ *  them. */
+export declare function bundleVideoUrl(bundle: BundleSource): ((fileId: string) => string | undefined) & {
+    revoke: () => void;
+};
 /** A `resourceBytes` resolver for `postext-pdf`'s `renderToPdf`: an SVG
  *  figure resolves to its vector print master (`svg.pdfFileId`) when it has
  *  one — unless single-ink is on, which recolours SVG markup only. The

package/dist/bundle/adapters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapters.d.ts","sourceRoot":"","sources":["../../src/bundle/adapters.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAY,MAAM,UAAU,CAAC;AAIxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAG3C;sCACsC;AACtC,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,WAAW,GAAG,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;AAQzH;uCACuC;AACvC,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,GAAG,IAAI,CAIlE;AAeD;;2DAE2D;AAC3D,wBAAsB,eAAe,CACnC,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACpC,OAAO,GAAE,WAAW,GAAG,SAAwE,GAC9F,OAAO,CAAC,QAAQ,EAAE,CAAC,CAQrB;AAED;;;;wDAIwD;AACxD,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAwB9E;AAED;;;wDAGwD;AACxD,wBAAgB,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,IAAI,CAAC;IAAC,SAAS,EAAE,KAAK,CAAA;CAAE,CAgBxI;AAED;;;;4DAI4D;AAC5D,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,UAAU,GAAG,SAAS,CAcpG;AAED;kDACkD;AAClD,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,yBAAyB,CAAC,QAAQ,SAAS,UAAU,GAAG,UAAU,EAAE,GAAG,UAAU;IAChG;;0BAEsB;IACtB,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC;IACtE;;;;gFAI4E;IAC5E,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,QAAQ,EAAE,OAAO,CAAC,EAAE,iBAAiB,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC3H;AAED;;wEAEwE;AACxE,wBAAgB,kBAAkB,CAAC,QAAQ,SAAS,UAAU,GAAG,UAAU,EAAE,GAAG,UAAU,EACxF,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACpC,OAAO,GAAE,yBAAyB,CAAC,QAAQ,CAAM,GAChD,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,QAAQ,EAAE,OAAO,CAAC,EAAE,iBAAiB,KAAK,OAAO,CAAC,UAAU,GAAG,QAAQ,CAAC,CAe7H"}
+{"version":3,"file":"adapters.d.ts","sourceRoot":"","sources":["../../src/bundle/adapters.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAY,MAAM,UAAU,CAAC;AAIxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAI3C;sCACsC;AACtC,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,WAAW,GAAG,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;AAUzH;uCACuC;AACvC,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,GAAG,IAAI,CAIlE;AAeD;;2DAE2D;AAC3D,wBAAsB,eAAe,CACnC,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACpC,OAAO,GAAE,WAAW,GAAG,SAAwE,GAC9F,OAAO,CAAC,QAAQ,EAAE,CAAC,CAQrB;AAED;;;;wDAIwD;AACxD,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAwB9E;AAED;;;wDAGwD;AACxD,wBAAgB,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,IAAI,CAAC;IAAC,SAAS,EAAE,KAAK,CAAA;CAAE,CAgBxI;AAED;;YAEY;AACZ,wBAAgB,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,IAAI,CAAA;CAAE,CAgBtH;AAED;;;;4DAI4D;AAC5D,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,UAAU,GAAG,SAAS,CAiBpG;AAED;kDACkD;AAClD,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,yBAAyB,CAAC,QAAQ,SAAS,UAAU,GAAG,UAAU,EAAE,GAAG,UAAU;IAChG;;0BAEsB;IACtB,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC;IACtE;;;;gFAI4E;IAC5E,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,QAAQ,EAAE,OAAO,CAAC,EAAE,iBAAiB,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC3H;AAED;;wEAEwE;AACxE,wBAAgB,kBAAkB,CAAC,QAAQ,SAAS,UAAU,GAAG,UAAU,EAAE,GAAG,UAAU,EACxF,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACpC,OAAO,GAAE,yBAAyB,CAAC,QAAQ,CAAM,GAChD,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,QAAQ,EAAE,OAAO,CAAC,EAAE,iBAAiB,KAAK,OAAO,CAAC,UAAU,GAAG,QAAQ,CAAC,CAe7H"}

package/dist/bundle/adapters.js

@@ -5,11 +5,15 @@ import { registerResourceImage } from '../canvas-backend';
 import { resolveColorValue, resolveDiagramStyleConfig } from '../defaults';
 import { applySingleInkToSvg } from '../svg/singleInk';
 import { mimeForFile } from './manifest';
+import { videoMimeType } from '../video/url';
 function imageFileId(r) {
     if (r.kind === 'bitmap')
         return r.bitmap?.fileId;
     if (r.kind === 'svg')
         return r.svg?.fileId;
+    // A video is printed as its poster frame (#454).
+    if (r.kind === 'video')
+        return r.video?.poster?.fileId;
     return undefined;
 }
 /** The single-ink colour SVG figures are recoloured to, or null when
@@ -103,6 +107,27 @@ export function bundleImageUrl(bundle) {
         },
     });
 }
+/** A `resourceVideoUrl` resolver for `renderToHtml` (#454): object URLs
+ *  over the bundle's self-hosted videos, built once. `revoke()` frees
+ *  them. */
+export function bundleVideoUrl(bundle) {
+    const urls = new Map();
+    for (const r of bundle.resources) {
+        const fileId = r.kind === 'video' ? r.video?.fileId : undefined;
+        const bytes = fileId ? bundle.files.get(fileId) : undefined;
+        if (fileId && bytes && !urls.has(fileId)) {
+            urls.set(fileId, URL.createObjectURL(new Blob([bytes.slice()], { type: videoMimeType(r.video?.format) })));
+        }
+    }
+    const resolve = (fileId) => urls.get(fileId);
+    return Object.assign(resolve, {
+        revoke: () => {
+            for (const url of urls.values())
+                URL.revokeObjectURL(url);
+            urls.clear();
+        },
+    });
+}
 /** A `resourceBytes` resolver for `postext-pdf`'s `renderToPdf`: an SVG
  *  figure resolves to its vector print master (`svg.pdfFileId`) when it has
  *  one — unless single-ink is on, which recolours SVG markup only. The
@@ -117,6 +142,11 @@ export function bundleResourceBytes(bundle) {
             if (data)
                 bytes.set(r.bitmap.fileId, data);
         }
+        else if (r.kind === 'video' && r.video?.poster?.fileId) {
+            const data = bundle.files.get(r.video.poster.fileId);
+            if (data)
+                bytes.set(r.video.poster.fileId, data);
+        }
         else if (r.kind === 'svg' && r.svg?.fileId) {
             const master = r.svg.pdfFileId && !singleInk ? bundle.files.get(r.svg.pdfFileId) : undefined;
             const data = master ?? bundle.files.get(r.svg.fileId);