Skip to content

armgit / hypit

Public Imported from GitHub
0

Clone any viral video with AI agents. Not just a script, the whole workflow: swap the face, the words, the B-roll, ship 100 variants in one command, and get your 100M views.

feat: complete fine caption visual system

kashorin59afccb75d03
diff --git a/docs/quickstart/styles.md b/docs/quickstart/styles.md
index 4efb9a55..385e98b9 100644
--- a/docs/quickstart/styles.md
+++ b/docs/quickstart/styles.md
@@ -314,9 +314,9 @@ import the private pre-release catalog and select only the faces the Author Grap
```svml
<import as="fonts" from="@narratage/fonts-open@1"/>
-<fonts:Face id="inter-semibold" family="inter" weight="600" style="normal"/>
-<fonts:Face id="noto-cjk-semibold" family="noto-sans-sc" weight="600" style="normal"/>
-<fonts:Face id="symbols" family="noto-emoji" weight="400" style="normal"/>
+<fonts:Stack id="caption-fonts" family="inter" weight="600" style="normal" emoji="color">
+ <fonts:Fallback family="noto-sans-sc" weight="600" style="normal"/>
+</fonts:Stack>
```
| Property | Description |
@@ -324,26 +324,25 @@ import the private pre-release catalog and select only the faces the Author Grap
| `family` | A family from the package's finite catalog |
| `weight` | Exact selected face weight |
| `style` | Selected style: `normal` or a family-supported `italic` |
+| `emoji` | Optional `color` (COLRv1) or `mono` fallback on `Stack` |
-The catalog currently includes Inter, Montserrat, DM Sans, Manrope, Poppins, Bebas Neue, Playfair
-Display, Source Serif 4, Noto Sans SC, Noto Serif SC and Noto Emoji. Its Fontsource dependencies are
-pinned to `5.3.0`; the compiler hashes the installed bytes into a content-addressed
-`FontArtifactRef`. It performs no font download during a build, and the Runtime never guesses a
-font:
+The catalog contains 109 open families across handwriting, script, display, sans, serif,
+monospace, CJK, world-script and Emoji categories. Fontsource dependencies are pinned to `5.3.0`;
+the Chromium-compatible COLRv1 Emoji package is pinned separately. The compiler hashes installed
+bytes into content-addressed font values. It performs no download during a build, and the Runtime
+never guesses a font:
```svml
<caption-fine:Style id="dialogue" recipe={studio.caption.dialogue}
- font={inter-semibold}>
- <caption-fine:Fallback font={noto-cjk-semibold}/>
- <caption-fine:Fallback font={symbols}/>
-</caption-fine:Style>
+ font={caption-fonts}/>
```
-`font=` is the primary face; ordered `Fallback` children cover additional glyph sets such as CJK or
-emoji. The primary must match the Recipe's weight/style; fallback faces preserve their own honest
-weight/style. CJK and emoji can be split into several Unicode-range files while remaining one
-logical font edge. Omitting the stack keeps the Recipe's `font` family as an environment fallback,
+`fonts:Stack` emits one generic `FontStackRef`: its primary must match the Recipe's weight/style and
+its fallbacks preserve their own honest metadata. CJK and Emoji can be split into several
+Unicode-range files while remaining one logical graph edge. Omitting the stack keeps the Recipe's `font` family as an environment fallback,
which is convenient for prototypes but is not byte-reproducible.
+For a symbol with both text and Emoji presentation, write the authored Unicode Emoji sequence
+(for example `☎️`, including VS16); no package rewrites display text to force color.
Brand and custom fonts remain explicit author assets rather than additions to the shared catalog:
diff --git a/docs/quickstart/tracks.md b/docs/quickstart/tracks.md
index 77d490cd..56b9b0fa 100644
--- a/docs/quickstart/tracks.md
+++ b/docs/quickstart/tracks.md
@@ -27,7 +27,7 @@ Script Display → Caption Program → Planner + measured Atom timing → Style-
`@narratage/caption` owns only common Cue bounds, generic optional per-Word fields, total Style
assignment, Plan validation and the timing join. `@narratage/caption-fine` is one field-free Style
-family: it owns geometry, glyph/Cue-box Paint, restrained motion and optional whole-Atom karaoke.
+family: it owns geometry, glyph/Cue/Pill Paint and layered local motion.
### caption-fine:Style
@@ -48,28 +48,33 @@ caption.primary {
shadow-color: #000000; shadow-opacity: 0.72;
shadow-x: 0; shadow-y: 3; shadow-blur: 8;
glow-color: #FFFFFF; glow-opacity: 0.12; glow-blur: 8;
+ gradient-from: #FFFFFF; gradient-to: #93C5FD; gradient-angle: 120;
+ long-shadow-color: #111827; long-shadow-opacity: 0.35;
+ long-shadow-distance: 8; long-shadow-angle: 45;
background: #09090BCC; border-color: #FFFFFF20; border-width: 1;
padding: 16 24; radius: 18;
karaoke: trail; karaoke-transition: wipe;
- active-fill: #FFD54A; active-scale: 1.04;
- cue-enter: fade; cue-exit: fade; cue-transition-frames: 4;
+ active-fill: #FFD54A;
+ active-box: current; active-box-continuity: isolated;
+ active-box-background: #FFD54ACC; active-box-padding: 4 8; active-box-radius: 8;
+ active-underline: current; active-underline-color: #FFFFFF;
+ active-underline-thickness: 3; active-underline-offset: 5;
+ cue-enter: fade; cue-enter-frames: 4; cue-exit: fade; cue-exit-frames: 4;
atom-reveal: all;
+ active-response: pop; active-response-frames: 5; active-scale: 1.08;
}
```
```svml
-<fonts:Face id="caption-font" family="inter" weight="700" style="normal"/>
-<fonts:Face id="caption-cjk" family="noto-sans-sc" weight="700" style="normal"/>
-<fonts:Face id="caption-symbols" family="noto-emoji" weight="400" style="normal"/>
+<fonts:Stack id="caption-fonts" family="inter" weight="700" style="normal" emoji="color">
+ <fonts:Fallback family="noto-sans-sc" weight="700" style="normal"/>
+</fonts:Stack>
<caption-fine:Style id="primary-caption" recipe={studio.caption.primary}
- font={caption-font}>
- <caption-fine:Fallback font={caption-cjk}/>
- <caption-fine:Fallback font={caption-symbols}/>
-</caption-fine:Style>
+ font={caption-fonts}/>
```
-The explicit `font=` edge and ordered `Fallback` children make the rendered stack
-byte-reproducible. The primary face must match the Recipe's weight/style; each fallback retains its
+The explicit `font=` edge carries one byte-reproducible `FontStackRef`. The primary face must match
+the Recipe's weight/style; each fallback retains its
own exact face metadata. Omitting the stack deliberately uses the Recipe's `font` family as an
environment fallback; neither Caption nor the Runtime chooses a font on the author's behalf.
@@ -77,15 +82,20 @@ Another Caption package may define completely different planning fields and visu
without changing the common package.
Fine's properties are orthogonal: Cue planning; normalized placement and anchor; layout and
-typography; base glyph Paint; Cue-box Paint; active glyph Paint; karaoke timing; and restrained
-local motion. Active Paint supports the same `fill`/`opacity`/`stroke-*`/`shadow-*`/`glow-*`
-dimensions using the `active-` prefix. Missing optional dimensions resolve deterministically to no
-decoration or motion. Unknown properties are rejected.
+typography; base/active solid or gradient glyph Paint; stroke, shadow, directional long shadow,
+glow and underline; Cue/Pill Paint; three independent glyph/Pill/underline activation channels;
+and layered Cue, Atom, active-response and loop motion. Missing optional dimensions resolve
+deterministically to no decoration or motion. Unknown properties are rejected.
`karaoke` is `off`, `current` or `trail`; `karaoke-transition` is `step` or `wipe`. Timing is always
whole-Atom timing already proven by Caption. A normal one-word Atom therefore highlights per word,
while a Dual Text Atom remains one indivisible visible unit. Fine never guesses internal time.
+`active-box` is independently `off`, `current` or `trail`. `active-box-continuity: isolated` paints
+one capsule per activated Atom; `joined` turns a trail into one ordered prefix whose background is
+continuous on each real browser line. Thus trail-colored text with a current-only Pill, the original
+Twinit behavior, is one Recipe—not a second renderer.
+
Fine wraps only between complete Atoms and never clips author text. It intentionally has no
`max-lines`; use Cue bounds, Track width and font size to control density.
diff --git a/docs/zh/quickstart/styles.md b/docs/zh/quickstart/styles.md
index c9618c7c..088725be 100644
--- a/docs/zh/quickstart/styles.md
+++ b/docs/zh/quickstart/styles.md
@@ -309,9 +309,9 @@ SVS 描述字体策略,但不选择或打开字体字节。常用开源字体
```svml
<import as="fonts" from="@narratage/fonts-open@1"/>
-<fonts:Face id="inter-semibold" family="inter" weight="600" style="normal"/>
-<fonts:Face id="noto-cjk-semibold" family="noto-sans-sc" weight="600" style="normal"/>
-<fonts:Face id="symbols" family="noto-emoji" weight="400" style="normal"/>
+<fonts:Stack id="caption-fonts" family="inter" weight="600" style="normal" emoji="color">
+ <fonts:Fallback family="noto-sans-sc" weight="600" style="normal"/>
+</fonts:Stack>
```
| 属性 | 描述 |
@@ -319,24 +319,24 @@ SVS 描述字体策略,但不选择或打开字体字节。常用开源字体
| `family` | 字体包有限目录中的字体族 |
| `weight` | 精确选择的字体粗细 |
| `style` | `normal` 或该字体族支持的 `italic` |
+| `emoji` | `Stack` 可选的 `color`(COLRv1)或 `mono` 兜底 |
-当前目录包含 Inter、Montserrat、DM Sans、Manrope、Poppins、Bebas Neue、Playfair Display、
-Source Serif 4、Noto Sans SC、Noto Serif SC 与 Noto Emoji。Fontsource 依赖固定为 `5.3.0`;
-编译器把已安装字节哈希成内容寻址的 `FontArtifactRef`,Build 过程不会下载字体,Runtime
+目录现有 109 个开源字体族,覆盖手写、书法、展示、无衬线、衬线、等宽、CJK、其他
+文字系统与 Emoji。Fontsource 依赖固定为 `5.3.0`,Chromium 兼容的 COLRv1 Emoji 包另行
+锁定版本;编译器把已安装字节哈希成内容寻址的字体值,Build 过程不会下载字体,Runtime
也不猜字体:
```svml
<caption-fine:Style id="dialogue" recipe={studio.caption.dialogue}
- font={inter-semibold}>
- <caption-fine:Fallback font={noto-cjk-semibold}/>
- <caption-fine:Fallback font={symbols}/>
-</caption-fine:Style>
+ font={caption-fonts}/>
```
-`font=` 是主字体,有序 `Fallback` 子元素用于覆盖 CJK、emoji 等额外字形集合。主字体
-必须和 Recipe 的 weight/style 一致;Fallback 保留自己的真实 weight/style。CJK 与 emoji
-即使由多个 Unicode-range 文件组成,在作者图中仍是一条逻辑字体边。省略字体栈时会使用
+`fonts:Stack` 产出通用 `FontStackRef`:主字体必须和 Recipe 的 weight/style 一致,Fallback
+保留自己的真实元数据。CJK 与 Emoji 即使由多个 Unicode-range 文件组成,在作者图中仍是
+一条逻辑边。省略字体栈时会使用
Recipe 的环境字体兜底名,适合原型,但不能保证字节级复现。
+对于同时具有文本与 Emoji 两种呈现的符号,作者应写真实的 Unicode Emoji 序列(例如
+包含 VS16 的 `☎️`);任何包都不会为了强制彩色而改写显示稿。
品牌字体与自定义字体仍是显式作者资产,不会被塞进共享目录:
diff --git a/docs/zh/quickstart/tracks.md b/docs/zh/quickstart/tracks.md
index 381b96fb..c1c8c16e 100644
--- a/docs/zh/quickstart/tracks.md
+++ b/docs/zh/quickstart/tracks.md
@@ -24,31 +24,50 @@ Script 显示全集 → Caption Program → Planner + Atom 实测时间 → 样
```
公共 Caption 只负责 Cue 字数边界、可选的通用逐词字段、完整样式分配、Plan 校验与时间
-拼接。Fine 是第一种无字段样式族,负责自己的字体/框参数和统一 Cue 视觉渲染。
+拼接。Fine 是第一种无字段样式族,负责自己的几何、字形/Cue/Pill Paint 与局部动画。
### caption-fine:Style
一个 Style 是不可拆分的“规划要求 + 渲染参数”。Fine 从一个包自有的 SVS Recipe
同时解析两者:
+```svs
+caption.primary {
+ cue-min-words: 2; cue-max-words: 7;
+ stack-order: 70; x: 0.5; y: 0.88; width: 0.84;
+ anchor-x: center; anchor-y: bottom;
+ font: Inter; weight: 700; size: 58; line-height: 1; align: center;
+ fill: #FFFFFF; stroke-color: #09090B; stroke-width: 2;
+ background: #00000000; padding: 0; radius: 0;
+ karaoke: trail; karaoke-transition: wipe; active-fill: #FFD54A;
+ active-box: current; active-box-continuity: isolated;
+ active-box-background: #FFD54ACC; active-box-padding: 4 8; active-box-radius: 8;
+ active-underline: current; active-underline-color: #FFFFFF;
+ cue-enter: spring; cue-enter-frames: 6;
+ active-response: pop; active-response-frames: 5; active-scale: 1.08;
+}
+```
+
```svml
-<fonts:Face id="caption-font" family="inter" weight="700" style="normal"/>
-<fonts:Face id="caption-cjk" family="noto-sans-sc" weight="700" style="normal"/>
-<fonts:Face id="caption-symbols" family="noto-emoji" weight="400" style="normal"/>
+<fonts:Stack id="caption-fonts" family="inter" weight="700" style="normal" emoji="color">
+ <fonts:Fallback family="noto-sans-sc" weight="700" style="normal"/>
+</fonts:Stack>
<caption-fine:Style id="primary-caption" recipe={studio.caption.primary}
- font={caption-font}>
- <caption-fine:Fallback font={caption-cjk}/>
- <caption-fine:Fallback font={caption-symbols}/>
-</caption-fine:Style>
+ font={caption-fonts}/>
```
-显式的 `font=` 边与有序 `Fallback` 子元素让最终字体栈按字节复现。主字体必须与 Recipe
+显式的 `font=` 边携带一个按字节复现的 `FontStackRef`。主字体必须与 Recipe
的 weight/style 一致;每个 Fallback 保留自己的真实字体信息。省略字体栈则明确使用
Recipe 的环境字体兜底名;Caption 和 Runtime 都不会替作者猜字体。
Recipe 同时包含 `cue-min-words`、`cue-max-words` 和完整字体/框参数。Fine 不声明任何
逐词字段;其他字幕包可以定义完全不同的字段和渲染方式,无需修改公共 Caption。
+Fine 不是一组互斥预设。基础/激活渐变、描边、阴影、长阴影、外发光、下划线、Pill
+和动画均为正交维度。文字、下划线和 Pill 各自选择 `off | current | trail`;因此可以
+直接表达“文字保留已读色,但 Pill 只跟随当前词”。`active-box-continuity: joined` 会把
+已读前缀在每个真实换行片段内连成一个背景,而不是给每个词分别套胶囊。
+
Fine 只在完整 Atom 之间自然换行,永不裁掉作者文字,因此有意不提供 `max-lines`。
需要控制行数时,应调整 Cue 字数边界、Track 宽度与字号。
diff --git a/examples/talking-film-graph-check/studio.svs b/examples/talking-film-graph-check/studio.svs
index 05663baf..9d3e30eb 100644
--- a/examples/talking-film-graph-check/studio.svs
+++ b/examples/talking-film-graph-check/studio.svs
@@ -15,7 +15,7 @@
glow-color: #FFFFFF; glow-opacity: 0.12; glow-blur: 8;
background: #09090BCC; border-color: #FFFFFF20; border-width: 1; padding: 16 24; radius: 18;
karaoke: trail; karaoke-transition: wipe; active-fill: #FFD54A;
- cue-enter: fade; cue-exit: fade; cue-transition-frames: 4;
+ cue-enter: fade; cue-enter-frames: 4; cue-exit: fade; cue-exit-frames: 4;
}
text.title {
stack-order: 90; x: 0.06; y: 0.06; width: 0.88; height: 0.1; font: Inter;
diff --git a/examples/talking-film-graph-check/svml.packages.lock b/examples/talking-film-graph-check/svml.packages.lock
index bdd5eff1..06c598e7 100644
--- a/examples/talking-film-graph-check/svml.packages.lock
+++ b/examples/talking-film-graph-check/svml.packages.lock
@@ -14,7 +14,7 @@
{
"name": "@narratage/caption-fine",
"version": "0.0.0-dev",
- "digest": "sha256:a04ada5d0a1e28ed95a6fd388ee2cbee07c46524308639e30cc01aac3a28cd13"
+ "digest": "sha256:1dbfb8e75d745ccda9d6e086fa360ab458b19acd51f6b14214a52819bd0703b8"
},
{
"name": "@narratage/caption-gemini",
@@ -69,7 +69,7 @@
{
"name": "@narratage/hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:dab846f27aab6083a00d5c4a6f9c2e8010c43d4b5767fee4648f87dd35462b03"
+ "digest": "sha256:48f6b2bb2f90ea9f5d11fb8b1d94b5e7ccdb552dd5eb4f08cdbb5631c69de8c0"
},
{
"name": "@narratage/media-pipeline",
@@ -79,7 +79,7 @@
{
"name": "@narratage/media",
"version": "0.0.0-dev",
- "digest": "sha256:dd0afbcbb6b8fcfcd1d1344eff4aec43d5a0e139b6cce4bbe4f823520795761b"
+ "digest": "sha256:059c7ebefb816a9831e5ce22edb4c9737ee1548428aba1108b054bc967989cf3"
},
{
"name": "@narratage/model-kit",
@@ -184,7 +184,7 @@
{
"name": "@narratage/visual-ir",
"version": "0.0.0-dev",
- "digest": "sha256:7a112d37e211797b680b2aa37382be47a65a6182e91fdcc93da50e684e50373c"
+ "digest": "sha256:fbf0af7778388d444c6098359cb5af8498c40c6cc386be10305e524c00366a1e"
},
{
"name": "@narratage/whisperx",
@@ -208,8 +208,8 @@
"name": "@narratage/broll",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:6bbdc804e3792d1ed909f6879c8ffbeb51f4bb298695db480cdc0e6b68fdab29",
- "closureDigest": "sha256:0c59c58f6c12a666949317c85fc6598725eb6f3537c1ba0d8eb6e1e311068ef1"
+ "facetsDigest": "sha256:29d590f5b5b125db139773046ce48eba938c675f39ed2b1cdda7e24bff1ea75a",
+ "closureDigest": "sha256:2ff3c105fc9d1117bc5f9bde39ffd12fc4cb69764ffaa77022e37ba4d105963f"
},
{
"specifier": "@narratage/caption",
@@ -217,8 +217,8 @@
"name": "@narratage/caption",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:f2ac25c3857a3278aa5333f4de08181a5cb7afeda22154a8c743b533f6337f1b",
- "closureDigest": "sha256:df0c080fd02b7d5d49cb064510bb97f1ec5dcebeef6bba754f132f68e746c4a7"
+ "facetsDigest": "sha256:73dfafd232af1ba279fc9d2cb4715ad7518a697f97d5279b4b88a1f3ee24eb19",
+ "closureDigest": "sha256:0bf34edc64b304226c0d59faa5853bdbc729083a660f1f3214c0e484a689f049"
},
{
"specifier": "@narratage/caption-fine",
@@ -226,8 +226,8 @@
"name": "@narratage/caption-fine",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:79dacfd6818beabd48cd1d69b652854fe1ae2d0712eb1e77727ad6dba0a7ef56",
- "closureDigest": "sha256:ad4c89e4d1a5cb7d09b3b33e2b39469d38e3f6abf261d23486d33eb7e8e95c42"
+ "facetsDigest": "sha256:4eb6e1dbde32fe5090c4080749f3903072ce7d7725c52785f7d03563aa7c9a59",
+ "closureDigest": "sha256:ee3ea312a961632c3af80daeefe087125fc97055ac92b92edc9563a5a0e9ab4e"
},
{
"specifier": "@narratage/caption-gemini",
@@ -235,8 +235,8 @@
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:3e76553b6ebd4f212948bb2c48939d80d72b594a7e0b02b345468df72f98f4e2",
- "closureDigest": "sha256:8601d27a2c384f320aea245b383ec46af3feeefd7c4b7751d7113978d0068ae0"
+ "facetsDigest": "sha256:83573766921453a6961390645bad28929d7ebec400cb9aae00e6b4ca83e94ac3",
+ "closureDigest": "sha256:da5c121fc168e08ac6d09b214de405bad045f624c1aac29be92b1ed128c34108"
},
{
"specifier": "@narratage/composition",
@@ -244,8 +244,8 @@
"name": "@narratage/composition",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:70efe1f75f3bf6cfe82afe389d223ccb2b9d0afac6e1ea861fb0d202146633bc",
- "closureDigest": "sha256:5065ccc118a2efdcdcdd9116782e05b106967f616d420483d2d0b5a8fb3fd868"
+ "facetsDigest": "sha256:235c69438be252eae6cc91b8d8cdaeadf5e074322c211c923c7e5a1a97d047f8",
+ "closureDigest": "sha256:76678cf3a82fe486488b4f5b993ef96f2488b5223238a22c57e1e450fc09d336"
},
{
"specifier": "@narratage/estimate",
@@ -253,8 +253,8 @@
"name": "@narratage/estimate",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:36b000e4ab107720740a861516cf45f033a827862b2f1fc995a0a0fb11cc4517",
- "closureDigest": "sha256:4a51d327fe815d10d993dd7ccf30cfe4ac087f6cce5d054931514d4655724f34"
+ "facetsDigest": "sha256:195e4840e8238866ccd6ae9362e990e124bf69de41fba71758436f1959609fbb",
+ "closureDigest": "sha256:5d3bfee43e26aff29f07cefa8a6cde83ce36af4dc185e1c9d2578886d5cb88d8"
},
{
"specifier": "@narratage/film",
@@ -262,8 +262,8 @@
"name": "@narratage/film",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:c4b09b0404e6af2c2bc54e3f3b02a5b8955c9af74e8e510abd63264a93b03ed8",
- "closureDigest": "sha256:b2896f0c5a8955432c32662b025df23f8ddc47f4464b2d20ea768f239b94c4ce"
+ "facetsDigest": "sha256:78df513364725a6434b44b349d834dd5f754cf3da53036ed90aca62c38fd2bbc",
+ "closureDigest": "sha256:24eaafd5632206142f0a037973b33421c68d0890fa251d683ea1a25f07b2e481"
},
{
"specifier": "@narratage/generation",
@@ -280,8 +280,8 @@
"name": "@narratage/hyperframes",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:b4ad8b6d03e5e05c97daa4ba2aadcccb277569afac1eb57ff3aa88db1ae49615",
- "closureDigest": "sha256:1065152b1f223b44f5b86bd2d61e25bfb7e9f226b9f9be3f9b796b409c598bbd"
+ "facetsDigest": "sha256:a556fa46f3b8466f96041e630a7b54a07028ee2a5a49983af6148c917516a226",
+ "closureDigest": "sha256:56cb214ee86a115c456a937a606f7b4cbbadbef70c32915b9453d99855becb6c"
},
{
"specifier": "@narratage/media",
@@ -289,8 +289,8 @@
"name": "@narratage/media",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:9bfcc6a265d2a34988bf1404a934fa163f69676aa75573d8aaab5c21287de1e6",
- "closureDigest": "sha256:66f675206efd7904b3c50b8aa5a1d5b80f744e51708326a6014ca4a0919fe12c"
+ "facetsDigest": "sha256:b365049728f4fd4eaa8cf93792697c89cf7871b1f333b1d4b5bef1113dcfb218",
+ "closureDigest": "sha256:4b4573f6fcd2ddacaf39c2c37a2aebebf5b6959aa9fb3a14df4e3dd819712b99"
},
{
"specifier": "@narratage/media-pipeline",
@@ -298,8 +298,8 @@
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:e52e42c6380b866ab39b0ce44cdec88cb065e24bef3d85a76014de0e29eac45c",
- "closureDigest": "sha256:be73e62ba1795cd593e9d1b0c20ca22360cfea612bd54ec1f203077397a9ed5c"
+ "facetsDigest": "sha256:8db585fd108e36178a39ff2f44d77897cfd18cb6bc1870b793d85f3b18e30792",
+ "closureDigest": "sha256:26cd5ffacebc0e5af04992c28223ad2b275aeea425ea28a95d06612024bf1103"
},
{
"specifier": "@narratage/narrative",
@@ -325,8 +325,8 @@
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:d174224f68de9d4274e4db4c9dcb1e108cbafe3e3c4fcdcbf6ea6a1c29329ce2",
- "closureDigest": "sha256:64d8449b03abc4d08bea81e407bde6c0f157bf5a3175df5e8fd86b06f54b05a8"
+ "facetsDigest": "sha256:d9b87a3622ce9153dc3a23d5601458caec1c72a8e568c821a166b945ff758868",
+ "closureDigest": "sha256:f406b5fded56ce2f31d2cab2e0cdb06b0c714f1a23bdf81845913cfaee1eda25"
},
{
"specifier": "@narratage/run-text",
@@ -352,8 +352,8 @@
"name": "@narratage/seedance",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:b4764848325539e7e38192efc8701eb66923d094cdca5768204c56453d327b1a",
- "closureDigest": "sha256:d28519408aa2a8179446934b60a1e104346929e493ff69f8f2d37ca4eaa46c35"
+ "facetsDigest": "sha256:c3b8b4b87fa07ab54de7629380f3f3aba50c7f78413f193e55d5056bba32fd4f",
+ "closureDigest": "sha256:e0c54d6e9ab97fa03029a92e8160bd03ac12287993b3063c045a351e329bd270"
},
{
"specifier": "@narratage/semantic-map",
@@ -361,8 +361,8 @@
"name": "@narratage/semantic-map",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:c5feca5f3a3cfd822160e7dd8b322f738da96e782bee8c3c0c31547a1e7887ea",
- "closureDigest": "sha256:0a24ad5c2f3ddfa8513726e7172e0455a12a6898046f07d85d2389fb629af55f"
+ "facetsDigest": "sha256:0935b3fde2040ca370ba47b09da4ac7285067709cbf77885b01b74a02ed1765f",
+ "closureDigest": "sha256:c5ec936affa7d20bdeb1e3f57f691c10f60a885bda1b1335325c7b6bdb98b818"
},
{
"specifier": "@narratage/speech",
@@ -370,8 +370,8 @@
"name": "@narratage/speech",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:19406f15210d753f02f639e72775d89822c555cbc97ca0d04ae29f19c5ab5dbd",
- "closureDigest": "sha256:5f09e54b2aed50be63e464ed155510fa8c970bf22d0d4044a7c9383f61ff19b9"
+ "facetsDigest": "sha256:1b1a0539eba2204f733bcca51c503f1c947986444db02eb77ced761e80109d1d",
+ "closureDigest": "sha256:1b24fc651047d6e940aff90a9a7976956d83276832b481764b31921431df06a3"
},
{
"specifier": "@narratage/speech-alignment",
@@ -379,8 +379,8 @@
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:d4b4dc0ff2cfe3de80a12f41c7a32a0c1335846047c6338d0c5be8f775d09d26",
- "closureDigest": "sha256:8e92197a06629044d7f741447016885ceac829d0f6c3d099c03af640876b58cf"
+ "facetsDigest": "sha256:c9b967337f259992350626efbab9c2b56c7687d5404a82b058c79076b57e3029",
+ "closureDigest": "sha256:3d2a3fff4f529755ff2da02cf68e3bce56105b999c1ee92113498f01204466f7"
},
{
"specifier": "@narratage/speech-basis",
@@ -388,8 +388,8 @@
"name": "@narratage/speech-basis",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:2de779cbc1a17a675fe1a7682bafce62e39f3cdf1979867e4158c2374bba6761",
- "closureDigest": "sha256:90e6aa6c671bd2f356b77197b3dcf43d7058515835f252022415fafeffd0a986"
+ "facetsDigest": "sha256:e072ae8af0da0900055e8bbe3e8d3dc0d321a7d95e728bd676d025c4000492cc",
+ "closureDigest": "sha256:e197c04f00404b1f61d87cbe3820209ac9303ec10c3606e1223302c06b7d3c2a"
},
{
"specifier": "@narratage/speech-evidence",
@@ -397,8 +397,8 @@
"name": "@narratage/speech-evidence",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:f437adcaf0a0d03b12ebf0e42cf791978e8cf58632e8164acf29204dec66bb63",
- "closureDigest": "sha256:86e0583db976ba95f208fa7497a594ab01922d9e30c2bf150ded4738ff9ad0cc"
+ "facetsDigest": "sha256:c3441e4dca55aded30e49188889422969a59c9515512f8098c3c780e8337fafb",
+ "closureDigest": "sha256:15fad31dfd08d44577168cce1009cef5817a31c5be55f29063dfe43d427c893f"
},
{
"specifier": "@narratage/speech-spine",
@@ -406,8 +406,8 @@
"name": "@narratage/speech-spine",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:baa2ab372d24658a44227fe7c69b0edbe255abff8a397f12b21d96b2a4d40f4d",
- "closureDigest": "sha256:46721b27166d5109bc300b1b0400fa0750c9c0dc5c5f18380596b688bf94f637"
+ "facetsDigest": "sha256:dabf22bbcf3ab13504b71209d3643b9175880f859f38971a119505214c0d58fa",
+ "closureDigest": "sha256:4be19980d2f68dda18a3b10984a6c3ac1cdbe157aa2ef2a34a463bb6bff5d510"
},
{
"specifier": "@narratage/svs",
@@ -424,8 +424,8 @@
"name": "@narratage/text-track",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:4c1b3fefe7b4c588c19a29a0265df95101ad2b59b59f4a0dcad6c72c556b956b",
- "closureDigest": "sha256:4888fac0cae691f9e2768a9f0c10828ec7b5a7c88bf107ba2fb280868cba89f6"
+ "facetsDigest": "sha256:956cb6d53a1db24e822af86b24cdaa0054d7daadc3828ace40fa6497a9fa5e68",
+ "closureDigest": "sha256:0b5eaf76d1a3109826da9427a2dd431364f6903f7b16431224839e5a07e9c66b"
},
{
"specifier": "@narratage/visual-ir",
@@ -434,7 +434,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:a8d72579639a41123f5ac017e98781819012adc52d94a8116c5a072dc9e6fc05",
- "closureDigest": "sha256:026709127336795d41295ad4d67d3fb13e7765e4ae4fc3689661d5b7991282c6"
+ "closureDigest": "sha256:63d591b669757e83663dbae933870ffb852a66e83f831dd21aae259be1eddac1"
},
{
"specifier": "@narratage/whisperx",
@@ -442,9 +442,9 @@
"name": "@narratage/whisperx",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:19f77e1ff6db2def21fc9a111a4595e2e973ebc8e5da6d28f983283f11269dff",
- "closureDigest": "sha256:89808d24cb03ee7329ff8e4f7a20e71c825aa9d81b5967844e5628adf0b6a30a"
+ "facetsDigest": "sha256:a0d0b282085f5d6b0994660d39009f0d859780fe4597622f8edb6e743ffc2bae",
+ "closureDigest": "sha256:747dda39abd4c81eba23f4db6be19698dfe653517bdd1fc7b9896a3839bbda3f"
}
],
- "digest": "sha256:8450bdb4b417298e6c6669fce5b920197ef692f45a9a89b1687950e6da5ba1bf"
+ "digest": "sha256:f90f463681d78c06d1885b0edcf10c855cd1ae9935aba7af4d31d83d64b1c403"
}
diff --git a/examples/talking-film-live/svml.packages.lock b/examples/talking-film-live/svml.packages.lock
index ef7abdd9..e82842dc 100644
--- a/examples/talking-film-live/svml.packages.lock
+++ b/examples/talking-film-live/svml.packages.lock
@@ -9,7 +9,7 @@
{
"name": "@narratage/caption-fine",
"version": "0.0.0-dev",
- "digest": "sha256:a04ada5d0a1e28ed95a6fd388ee2cbee07c46524308639e30cc01aac3a28cd13"
+ "digest": "sha256:1dbfb8e75d745ccda9d6e086fa360ab458b19acd51f6b14214a52819bd0703b8"
},
{
"name": "@narratage/caption-gemini",
@@ -64,7 +64,7 @@
{
"name": "@narratage/hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:dab846f27aab6083a00d5c4a6f9c2e8010c43d4b5767fee4648f87dd35462b03"
+ "digest": "sha256:48f6b2bb2f90ea9f5d11fb8b1d94b5e7ccdb552dd5eb4f08cdbb5631c69de8c0"
},
{
"name": "@narratage/media-pipeline",
@@ -74,7 +74,7 @@
{
"name": "@narratage/media",
"version": "0.0.0-dev",
- "digest": "sha256:dd0afbcbb6b8fcfcd1d1344eff4aec43d5a0e139b6cce4bbe4f823520795761b"
+ "digest": "sha256:059c7ebefb816a9831e5ce22edb4c9737ee1548428aba1108b054bc967989cf3"
},
{
"name": "@narratage/model-kit",
@@ -179,7 +179,7 @@
{
"name": "@narratage/visual-ir",
"version": "0.0.0-dev",
- "digest": "sha256:7a112d37e211797b680b2aa37382be47a65a6182e91fdcc93da50e684e50373c"
+ "digest": "sha256:fbf0af7778388d444c6098359cb5af8498c40c6cc386be10305e524c00366a1e"
},
{
"name": "@narratage/whisperx",
@@ -203,8 +203,8 @@
"name": "@narratage/caption",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:f2ac25c3857a3278aa5333f4de08181a5cb7afeda22154a8c743b533f6337f1b",
- "closureDigest": "sha256:df0c080fd02b7d5d49cb064510bb97f1ec5dcebeef6bba754f132f68e746c4a7"
+ "facetsDigest": "sha256:73dfafd232af1ba279fc9d2cb4715ad7518a697f97d5279b4b88a1f3ee24eb19",
+ "closureDigest": "sha256:0bf34edc64b304226c0d59faa5853bdbc729083a660f1f3214c0e484a689f049"
},
{
"specifier": "@narratage/caption-fine",
@@ -212,8 +212,8 @@
"name": "@narratage/caption-fine",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:79dacfd6818beabd48cd1d69b652854fe1ae2d0712eb1e77727ad6dba0a7ef56",
- "closureDigest": "sha256:ad4c89e4d1a5cb7d09b3b33e2b39469d38e3f6abf261d23486d33eb7e8e95c42"
+ "facetsDigest": "sha256:4eb6e1dbde32fe5090c4080749f3903072ce7d7725c52785f7d03563aa7c9a59",
+ "closureDigest": "sha256:ee3ea312a961632c3af80daeefe087125fc97055ac92b92edc9563a5a0e9ab4e"
},
{
"specifier": "@narratage/caption-gemini",
@@ -221,8 +221,8 @@
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:3e76553b6ebd4f212948bb2c48939d80d72b594a7e0b02b345468df72f98f4e2",
- "closureDigest": "sha256:8601d27a2c384f320aea245b383ec46af3feeefd7c4b7751d7113978d0068ae0"
+ "facetsDigest": "sha256:83573766921453a6961390645bad28929d7ebec400cb9aae00e6b4ca83e94ac3",
+ "closureDigest": "sha256:da5c121fc168e08ac6d09b214de405bad045f624c1aac29be92b1ed128c34108"
},
{
"specifier": "@narratage/composition",
@@ -230,8 +230,8 @@
"name": "@narratage/composition",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:70efe1f75f3bf6cfe82afe389d223ccb2b9d0afac6e1ea861fb0d202146633bc",
- "closureDigest": "sha256:5065ccc118a2efdcdcdd9116782e05b106967f616d420483d2d0b5a8fb3fd868"
+ "facetsDigest": "sha256:235c69438be252eae6cc91b8d8cdaeadf5e074322c211c923c7e5a1a97d047f8",
+ "closureDigest": "sha256:76678cf3a82fe486488b4f5b993ef96f2488b5223238a22c57e1e450fc09d336"
},
{
"specifier": "@narratage/estimate",
@@ -239,8 +239,8 @@
"name": "@narratage/estimate",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:36b000e4ab107720740a861516cf45f033a827862b2f1fc995a0a0fb11cc4517",
- "closureDigest": "sha256:4a51d327fe815d10d993dd7ccf30cfe4ac087f6cce5d054931514d4655724f34"
+ "facetsDigest": "sha256:195e4840e8238866ccd6ae9362e990e124bf69de41fba71758436f1959609fbb",
+ "closureDigest": "sha256:5d3bfee43e26aff29f07cefa8a6cde83ce36af4dc185e1c9d2578886d5cb88d8"
},
{
"specifier": "@narratage/film",
@@ -248,8 +248,8 @@
"name": "@narratage/film",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:c4b09b0404e6af2c2bc54e3f3b02a5b8955c9af74e8e510abd63264a93b03ed8",
- "closureDigest": "sha256:b2896f0c5a8955432c32662b025df23f8ddc47f4464b2d20ea768f239b94c4ce"
+ "facetsDigest": "sha256:78df513364725a6434b44b349d834dd5f754cf3da53036ed90aca62c38fd2bbc",
+ "closureDigest": "sha256:24eaafd5632206142f0a037973b33421c68d0890fa251d683ea1a25f07b2e481"
},
{
"specifier": "@narratage/generation",
@@ -266,8 +266,8 @@
"name": "@narratage/hyperframes",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:b4ad8b6d03e5e05c97daa4ba2aadcccb277569afac1eb57ff3aa88db1ae49615",
- "closureDigest": "sha256:1065152b1f223b44f5b86bd2d61e25bfb7e9f226b9f9be3f9b796b409c598bbd"
+ "facetsDigest": "sha256:a556fa46f3b8466f96041e630a7b54a07028ee2a5a49983af6148c917516a226",
+ "closureDigest": "sha256:56cb214ee86a115c456a937a606f7b4cbbadbef70c32915b9453d99855becb6c"
},
{
"specifier": "@narratage/media",
@@ -275,8 +275,8 @@
"name": "@narratage/media",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:9bfcc6a265d2a34988bf1404a934fa163f69676aa75573d8aaab5c21287de1e6",
- "closureDigest": "sha256:66f675206efd7904b3c50b8aa5a1d5b80f744e51708326a6014ca4a0919fe12c"
+ "facetsDigest": "sha256:b365049728f4fd4eaa8cf93792697c89cf7871b1f333b1d4b5bef1113dcfb218",
+ "closureDigest": "sha256:4b4573f6fcd2ddacaf39c2c37a2aebebf5b6959aa9fb3a14df4e3dd819712b99"
},
{
"specifier": "@narratage/media-pipeline",
@@ -284,8 +284,8 @@
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:e52e42c6380b866ab39b0ce44cdec88cb065e24bef3d85a76014de0e29eac45c",
- "closureDigest": "sha256:be73e62ba1795cd593e9d1b0c20ca22360cfea612bd54ec1f203077397a9ed5c"
+ "facetsDigest": "sha256:8db585fd108e36178a39ff2f44d77897cfd18cb6bc1870b793d85f3b18e30792",
+ "closureDigest": "sha256:26cd5ffacebc0e5af04992c28223ad2b275aeea425ea28a95d06612024bf1103"
},
{
"specifier": "@narratage/narrative",
@@ -311,8 +311,8 @@
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:d174224f68de9d4274e4db4c9dcb1e108cbafe3e3c4fcdcbf6ea6a1c29329ce2",
- "closureDigest": "sha256:64d8449b03abc4d08bea81e407bde6c0f157bf5a3175df5e8fd86b06f54b05a8"
+ "facetsDigest": "sha256:d9b87a3622ce9153dc3a23d5601458caec1c72a8e568c821a166b945ff758868",
+ "closureDigest": "sha256:f406b5fded56ce2f31d2cab2e0cdb06b0c714f1a23bdf81845913cfaee1eda25"
},
{
"specifier": "@narratage/run-text",
@@ -338,8 +338,8 @@
"name": "@narratage/seedance",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:b4764848325539e7e38192efc8701eb66923d094cdca5768204c56453d327b1a",
- "closureDigest": "sha256:d28519408aa2a8179446934b60a1e104346929e493ff69f8f2d37ca4eaa46c35"
+ "facetsDigest": "sha256:c3b8b4b87fa07ab54de7629380f3f3aba50c7f78413f193e55d5056bba32fd4f",
+ "closureDigest": "sha256:e0c54d6e9ab97fa03029a92e8160bd03ac12287993b3063c045a351e329bd270"
},
{
"specifier": "@narratage/semantic-map",
@@ -347,8 +347,8 @@
"name": "@narratage/semantic-map",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:c5feca5f3a3cfd822160e7dd8b322f738da96e782bee8c3c0c31547a1e7887ea",
- "closureDigest": "sha256:0a24ad5c2f3ddfa8513726e7172e0455a12a6898046f07d85d2389fb629af55f"
+ "facetsDigest": "sha256:0935b3fde2040ca370ba47b09da4ac7285067709cbf77885b01b74a02ed1765f",
+ "closureDigest": "sha256:c5ec936affa7d20bdeb1e3f57f691c10f60a885bda1b1335325c7b6bdb98b818"
},
{
"specifier": "@narratage/speech",
@@ -356,8 +356,8 @@
"name": "@narratage/speech",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:19406f15210d753f02f639e72775d89822c555cbc97ca0d04ae29f19c5ab5dbd",
- "closureDigest": "sha256:5f09e54b2aed50be63e464ed155510fa8c970bf22d0d4044a7c9383f61ff19b9"
+ "facetsDigest": "sha256:1b1a0539eba2204f733bcca51c503f1c947986444db02eb77ced761e80109d1d",
+ "closureDigest": "sha256:1b24fc651047d6e940aff90a9a7976956d83276832b481764b31921431df06a3"
},
{
"specifier": "@narratage/speech-alignment",
@@ -365,8 +365,8 @@
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:d4b4dc0ff2cfe3de80a12f41c7a32a0c1335846047c6338d0c5be8f775d09d26",
- "closureDigest": "sha256:8e92197a06629044d7f741447016885ceac829d0f6c3d099c03af640876b58cf"
+ "facetsDigest": "sha256:c9b967337f259992350626efbab9c2b56c7687d5404a82b058c79076b57e3029",
+ "closureDigest": "sha256:3d2a3fff4f529755ff2da02cf68e3bce56105b999c1ee92113498f01204466f7"
},
{
"specifier": "@narratage/speech-basis",
@@ -374,8 +374,8 @@
"name": "@narratage/speech-basis",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:2de779cbc1a17a675fe1a7682bafce62e39f3cdf1979867e4158c2374bba6761",
- "closureDigest": "sha256:90e6aa6c671bd2f356b77197b3dcf43d7058515835f252022415fafeffd0a986"
+ "facetsDigest": "sha256:e072ae8af0da0900055e8bbe3e8d3dc0d321a7d95e728bd676d025c4000492cc",
+ "closureDigest": "sha256:e197c04f00404b1f61d87cbe3820209ac9303ec10c3606e1223302c06b7d3c2a"
},
{
"specifier": "@narratage/speech-evidence",
@@ -383,8 +383,8 @@
"name": "@narratage/speech-evidence",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:f437adcaf0a0d03b12ebf0e42cf791978e8cf58632e8164acf29204dec66bb63",
- "closureDigest": "sha256:86e0583db976ba95f208fa7497a594ab01922d9e30c2bf150ded4738ff9ad0cc"
+ "facetsDigest": "sha256:c3441e4dca55aded30e49188889422969a59c9515512f8098c3c780e8337fafb",
+ "closureDigest": "sha256:15fad31dfd08d44577168cce1009cef5817a31c5be55f29063dfe43d427c893f"
},
{
"specifier": "@narratage/speech-spine",
@@ -392,8 +392,8 @@
"name": "@narratage/speech-spine",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:baa2ab372d24658a44227fe7c69b0edbe255abff8a397f12b21d96b2a4d40f4d",
- "closureDigest": "sha256:46721b27166d5109bc300b1b0400fa0750c9c0dc5c5f18380596b688bf94f637"
+ "facetsDigest": "sha256:dabf22bbcf3ab13504b71209d3643b9175880f859f38971a119505214c0d58fa",
+ "closureDigest": "sha256:4be19980d2f68dda18a3b10984a6c3ac1cdbe157aa2ef2a34a463bb6bff5d510"
},
{
"specifier": "@narratage/svs",
@@ -410,8 +410,8 @@
"name": "@narratage/text-track",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:4c1b3fefe7b4c588c19a29a0265df95101ad2b59b59f4a0dcad6c72c556b956b",
- "closureDigest": "sha256:4888fac0cae691f9e2768a9f0c10828ec7b5a7c88bf107ba2fb280868cba89f6"
+ "facetsDigest": "sha256:956cb6d53a1db24e822af86b24cdaa0054d7daadc3828ace40fa6497a9fa5e68",
+ "closureDigest": "sha256:0b5eaf76d1a3109826da9427a2dd431364f6903f7b16431224839e5a07e9c66b"
},
{
"specifier": "@narratage/visual-ir",
@@ -420,7 +420,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:a8d72579639a41123f5ac017e98781819012adc52d94a8116c5a072dc9e6fc05",
- "closureDigest": "sha256:026709127336795d41295ad4d67d3fb13e7765e4ae4fc3689661d5b7991282c6"
+ "closureDigest": "sha256:63d591b669757e83663dbae933870ffb852a66e83f831dd21aae259be1eddac1"
},
{
"specifier": "@narratage/whisperx",
@@ -428,9 +428,9 @@
"name": "@narratage/whisperx",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:19f77e1ff6db2def21fc9a111a4595e2e973ebc8e5da6d28f983283f11269dff",
- "closureDigest": "sha256:89808d24cb03ee7329ff8e4f7a20e71c825aa9d81b5967844e5628adf0b6a30a"
+ "facetsDigest": "sha256:a0d0b282085f5d6b0994660d39009f0d859780fe4597622f8edb6e743ffc2bae",
+ "closureDigest": "sha256:747dda39abd4c81eba23f4db6be19698dfe653517bdd1fc7b9896a3839bbda3f"
}
],
- "digest": "sha256:4db71e53fe8883e2ec9d82628a1b7eb931e4028c7c0ea496d3083e0b9a217e48"
+ "digest": "sha256:64160099ccdc7eca13febaf148f2398e73ccf1d317c5c6b6d88871b8ac79c278"
}
diff --git a/examples/talking-film-live/svml.runtime-packages.lock b/examples/talking-film-live/svml.runtime-packages.lock
index 14ebbf1b..141f80bf 100644
--- a/examples/talking-film-live/svml.runtime-packages.lock
+++ b/examples/talking-film-live/svml.runtime-packages.lock
@@ -79,7 +79,7 @@
{
"name": "@narratage/hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:dab846f27aab6083a00d5c4a6f9c2e8010c43d4b5767fee4648f87dd35462b03"
+ "digest": "sha256:48f6b2bb2f90ea9f5d11fb8b1d94b5e7ccdb552dd5eb4f08cdbb5631c69de8c0"
},
{
"name": "@narratage/media-execution",
@@ -94,7 +94,7 @@
{
"name": "@narratage/media",
"version": "0.0.0-dev",
- "digest": "sha256:dd0afbcbb6b8fcfcd1d1344eff4aec43d5a0e139b6cce4bbe4f823520795761b"
+ "digest": "sha256:059c7ebefb816a9831e5ce22edb4c9737ee1548428aba1108b054bc967989cf3"
},
{
"name": "@narratage/narrative",
@@ -194,7 +194,7 @@
{
"name": "@narratage/visual-ir",
"version": "0.0.0-dev",
- "digest": "sha256:7a112d37e211797b680b2aa37382be47a65a6182e91fdcc93da50e684e50373c"
+ "digest": "sha256:fbf0af7778388d444c6098359cb5af8498c40c6cc386be10305e524c00366a1e"
},
{
"name": "@narratage/whisperx",
@@ -850,7 +850,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:b2636492ab0b0b500d674899ab2ff14fc61c7f2b22ef44eb8f816f141b21ec4d",
- "closureDigest": "sha256:d3aa7f9841308a6527f9a32daf858807355e4968f13790bbedfa189e99f5b1b5"
+ "closureDigest": "sha256:5c92620e7d9365cf43721684b39ea5dc8a3807bd24491f340607243511e65213"
},
{
"specifier": "@narratage/provider-hyperframes-local",
@@ -859,7 +859,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:b14b721bdc0c9d5d9ced1c345107c92a3a5878f3383dea2ecd3e310442c2a40c",
- "closureDigest": "sha256:4ba832de33258b5f8e12105dd737e00884ad9ff17a963d56ac97486f214fb736"
+ "closureDigest": "sha256:292da8784b8c8465a66ee6849209bc0c908691b28cf7aceaf2e9fb7d4e506e39"
},
{
"specifier": "@narratage/provider-kie",
@@ -877,7 +877,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:701abcc923bf8a711c20b6e308d8cc8be27bf560f249b8c5a801e1dbd9cb3979",
- "closureDigest": "sha256:cf5a9555e43f0733111b8eb189c168da5681ae596dc1f944413c99eb3953aaae"
+ "closureDigest": "sha256:1c0b1ad30ee02c1637e25de62ec4d5c207f30b5f927ee11de297e4acc114eeaa"
},
{
"specifier": "@narratage/provider-whisperx-local",
@@ -886,8 +886,8 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:3686b84c42cc2b1bcaccf57cbdcda25a15c7d9d3778fb92d25437f9880ed8f5d",
- "closureDigest": "sha256:614eee90172133b91bdd4bbeb818a5e3a536f248781fc17d3e8cb2b3ab3b1afe"
+ "closureDigest": "sha256:c229c953e6eda641deb1116ba4cdf782a94eccbf56537710cbab40a8279207b7"
}
],
- "digest": "sha256:c1ae4192bb3fab604672c59c78dd8afe4f187e17bb0b15174ee97b870c4b84fb"
+ "digest": "sha256:19529231d0dcb2d7045c51c9a2cd5324e788a18b0b9ee5830c7966bc07a6e08f"
}
diff --git a/examples/talking-head-aroll/svml.packages.lock b/examples/talking-head-aroll/svml.packages.lock
index 60a300a0..68fc9a59 100644
--- a/examples/talking-head-aroll/svml.packages.lock
+++ b/examples/talking-head-aroll/svml.packages.lock
@@ -9,7 +9,7 @@
{
"name": "@narratage/caption-fine",
"version": "0.0.0-dev",
- "digest": "sha256:a04ada5d0a1e28ed95a6fd388ee2cbee07c46524308639e30cc01aac3a28cd13"
+ "digest": "sha256:1dbfb8e75d745ccda9d6e086fa360ab458b19acd51f6b14214a52819bd0703b8"
},
{
"name": "@narratage/caption-gemini",
@@ -64,7 +64,7 @@
{
"name": "@narratage/hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:dab846f27aab6083a00d5c4a6f9c2e8010c43d4b5767fee4648f87dd35462b03"
+ "digest": "sha256:48f6b2bb2f90ea9f5d11fb8b1d94b5e7ccdb552dd5eb4f08cdbb5631c69de8c0"
},
{
"name": "@narratage/media-pipeline",
@@ -74,7 +74,7 @@
{
"name": "@narratage/media",
"version": "0.0.0-dev",
- "digest": "sha256:dd0afbcbb6b8fcfcd1d1344eff4aec43d5a0e139b6cce4bbe4f823520795761b"
+ "digest": "sha256:059c7ebefb816a9831e5ce22edb4c9737ee1548428aba1108b054bc967989cf3"
},
{
"name": "@narratage/model-kit",
@@ -184,7 +184,7 @@
{
"name": "@narratage/visual-ir",
"version": "0.0.0-dev",
- "digest": "sha256:7a112d37e211797b680b2aa37382be47a65a6182e91fdcc93da50e684e50373c"
+ "digest": "sha256:fbf0af7778388d444c6098359cb5af8498c40c6cc386be10305e524c00366a1e"
},
{
"name": "@narratage/whisperx",
@@ -208,8 +208,8 @@
"name": "@narratage/caption",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:f2ac25c3857a3278aa5333f4de08181a5cb7afeda22154a8c743b533f6337f1b",
- "closureDigest": "sha256:df0c080fd02b7d5d49cb064510bb97f1ec5dcebeef6bba754f132f68e746c4a7"
+ "facetsDigest": "sha256:73dfafd232af1ba279fc9d2cb4715ad7518a697f97d5279b4b88a1f3ee24eb19",
+ "closureDigest": "sha256:0bf34edc64b304226c0d59faa5853bdbc729083a660f1f3214c0e484a689f049"
},
{
"specifier": "@narratage/caption-fine",
@@ -217,8 +217,8 @@
"name": "@narratage/caption-fine",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:79dacfd6818beabd48cd1d69b652854fe1ae2d0712eb1e77727ad6dba0a7ef56",
- "closureDigest": "sha256:ad4c89e4d1a5cb7d09b3b33e2b39469d38e3f6abf261d23486d33eb7e8e95c42"
+ "facetsDigest": "sha256:4eb6e1dbde32fe5090c4080749f3903072ce7d7725c52785f7d03563aa7c9a59",
+ "closureDigest": "sha256:ee3ea312a961632c3af80daeefe087125fc97055ac92b92edc9563a5a0e9ab4e"
},
{
"specifier": "@narratage/caption-gemini",
@@ -226,8 +226,8 @@
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:3e76553b6ebd4f212948bb2c48939d80d72b594a7e0b02b345468df72f98f4e2",
- "closureDigest": "sha256:8601d27a2c384f320aea245b383ec46af3feeefd7c4b7751d7113978d0068ae0"
+ "facetsDigest": "sha256:83573766921453a6961390645bad28929d7ebec400cb9aae00e6b4ca83e94ac3",
+ "closureDigest": "sha256:da5c121fc168e08ac6d09b214de405bad045f624c1aac29be92b1ed128c34108"
},
{
"specifier": "@narratage/composition",
@@ -235,8 +235,8 @@
"name": "@narratage/composition",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:70efe1f75f3bf6cfe82afe389d223ccb2b9d0afac6e1ea861fb0d202146633bc",
- "closureDigest": "sha256:5065ccc118a2efdcdcdd9116782e05b106967f616d420483d2d0b5a8fb3fd868"
+ "facetsDigest": "sha256:235c69438be252eae6cc91b8d8cdaeadf5e074322c211c923c7e5a1a97d047f8",
+ "closureDigest": "sha256:76678cf3a82fe486488b4f5b993ef96f2488b5223238a22c57e1e450fc09d336"
},
{
"specifier": "@narratage/estimate",
@@ -244,8 +244,8 @@
"name": "@narratage/estimate",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:36b000e4ab107720740a861516cf45f033a827862b2f1fc995a0a0fb11cc4517",
- "closureDigest": "sha256:4a51d327fe815d10d993dd7ccf30cfe4ac087f6cce5d054931514d4655724f34"
+ "facetsDigest": "sha256:195e4840e8238866ccd6ae9362e990e124bf69de41fba71758436f1959609fbb",
+ "closureDigest": "sha256:5d3bfee43e26aff29f07cefa8a6cde83ce36af4dc185e1c9d2578886d5cb88d8"
},
{
"specifier": "@narratage/film",
@@ -253,8 +253,8 @@
"name": "@narratage/film",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:c4b09b0404e6af2c2bc54e3f3b02a5b8955c9af74e8e510abd63264a93b03ed8",
- "closureDigest": "sha256:b2896f0c5a8955432c32662b025df23f8ddc47f4464b2d20ea768f239b94c4ce"
+ "facetsDigest": "sha256:78df513364725a6434b44b349d834dd5f754cf3da53036ed90aca62c38fd2bbc",
+ "closureDigest": "sha256:24eaafd5632206142f0a037973b33421c68d0890fa251d683ea1a25f07b2e481"
},
{
"specifier": "@narratage/generation",
@@ -271,8 +271,8 @@
"name": "@narratage/hyperframes",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:b4ad8b6d03e5e05c97daa4ba2aadcccb277569afac1eb57ff3aa88db1ae49615",
- "closureDigest": "sha256:1065152b1f223b44f5b86bd2d61e25bfb7e9f226b9f9be3f9b796b409c598bbd"
+ "facetsDigest": "sha256:a556fa46f3b8466f96041e630a7b54a07028ee2a5a49983af6148c917516a226",
+ "closureDigest": "sha256:56cb214ee86a115c456a937a606f7b4cbbadbef70c32915b9453d99855becb6c"
},
{
"specifier": "@narratage/media",
@@ -280,8 +280,8 @@
"name": "@narratage/media",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:9bfcc6a265d2a34988bf1404a934fa163f69676aa75573d8aaab5c21287de1e6",
- "closureDigest": "sha256:66f675206efd7904b3c50b8aa5a1d5b80f744e51708326a6014ca4a0919fe12c"
+ "facetsDigest": "sha256:b365049728f4fd4eaa8cf93792697c89cf7871b1f333b1d4b5bef1113dcfb218",
+ "closureDigest": "sha256:4b4573f6fcd2ddacaf39c2c37a2aebebf5b6959aa9fb3a14df4e3dd819712b99"
},
{
"specifier": "@narratage/media-pipeline",
@@ -289,8 +289,8 @@
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:e52e42c6380b866ab39b0ce44cdec88cb065e24bef3d85a76014de0e29eac45c",
- "closureDigest": "sha256:be73e62ba1795cd593e9d1b0c20ca22360cfea612bd54ec1f203077397a9ed5c"
+ "facetsDigest": "sha256:8db585fd108e36178a39ff2f44d77897cfd18cb6bc1870b793d85f3b18e30792",
+ "closureDigest": "sha256:26cd5ffacebc0e5af04992c28223ad2b275aeea425ea28a95d06612024bf1103"
},
{
"specifier": "@narratage/narrative",
@@ -325,8 +325,8 @@
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:d174224f68de9d4274e4db4c9dcb1e108cbafe3e3c4fcdcbf6ea6a1c29329ce2",
- "closureDigest": "sha256:64d8449b03abc4d08bea81e407bde6c0f157bf5a3175df5e8fd86b06f54b05a8"
+ "facetsDigest": "sha256:d9b87a3622ce9153dc3a23d5601458caec1c72a8e568c821a166b945ff758868",
+ "closureDigest": "sha256:f406b5fded56ce2f31d2cab2e0cdb06b0c714f1a23bdf81845913cfaee1eda25"
},
{
"specifier": "@narratage/run-text",
@@ -352,8 +352,8 @@
"name": "@narratage/seedance",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:b4764848325539e7e38192efc8701eb66923d094cdca5768204c56453d327b1a",
- "closureDigest": "sha256:d28519408aa2a8179446934b60a1e104346929e493ff69f8f2d37ca4eaa46c35"
+ "facetsDigest": "sha256:c3b8b4b87fa07ab54de7629380f3f3aba50c7f78413f193e55d5056bba32fd4f",
+ "closureDigest": "sha256:e0c54d6e9ab97fa03029a92e8160bd03ac12287993b3063c045a351e329bd270"
},
{
"specifier": "@narratage/seedance-speaker",
@@ -361,8 +361,8 @@
"name": "@narratage/seedance-speaker",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:deb80a855a5cc92f3624ee3681c842bc22086ecacea1f5de69cf9e399cd71a4b",
- "closureDigest": "sha256:30fea818b9d0609ff59e7964d953f22bcfd6cc0264b02f0cd0e00a53436f7daa"
+ "facetsDigest": "sha256:af969a55984b7ebe51faa77b446bca2ab6403a214a1ba6f4a23e6ac82e1901a4",
+ "closureDigest": "sha256:ad5579d4078403ec4baa3e8930a6c037cd707ae96bf61482b25580183f0db1e9"
},
{
"specifier": "@narratage/semantic-map",
@@ -370,8 +370,8 @@
"name": "@narratage/semantic-map",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:c5feca5f3a3cfd822160e7dd8b322f738da96e782bee8c3c0c31547a1e7887ea",
- "closureDigest": "sha256:0a24ad5c2f3ddfa8513726e7172e0455a12a6898046f07d85d2389fb629af55f"
+ "facetsDigest": "sha256:0935b3fde2040ca370ba47b09da4ac7285067709cbf77885b01b74a02ed1765f",
+ "closureDigest": "sha256:c5ec936affa7d20bdeb1e3f57f691c10f60a885bda1b1335325c7b6bdb98b818"
},
{
"specifier": "@narratage/speech",
@@ -379,8 +379,8 @@
"name": "@narratage/speech",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:19406f15210d753f02f639e72775d89822c555cbc97ca0d04ae29f19c5ab5dbd",
- "closureDigest": "sha256:5f09e54b2aed50be63e464ed155510fa8c970bf22d0d4044a7c9383f61ff19b9"
+ "facetsDigest": "sha256:1b1a0539eba2204f733bcca51c503f1c947986444db02eb77ced761e80109d1d",
+ "closureDigest": "sha256:1b24fc651047d6e940aff90a9a7976956d83276832b481764b31921431df06a3"
},
{
"specifier": "@narratage/speech-alignment",
@@ -388,8 +388,8 @@
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:d4b4dc0ff2cfe3de80a12f41c7a32a0c1335846047c6338d0c5be8f775d09d26",
- "closureDigest": "sha256:8e92197a06629044d7f741447016885ceac829d0f6c3d099c03af640876b58cf"
+ "facetsDigest": "sha256:c9b967337f259992350626efbab9c2b56c7687d5404a82b058c79076b57e3029",
+ "closureDigest": "sha256:3d2a3fff4f529755ff2da02cf68e3bce56105b999c1ee92113498f01204466f7"
},
{
"specifier": "@narratage/speech-basis",
@@ -397,8 +397,8 @@
"name": "@narratage/speech-basis",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:2de779cbc1a17a675fe1a7682bafce62e39f3cdf1979867e4158c2374bba6761",
- "closureDigest": "sha256:90e6aa6c671bd2f356b77197b3dcf43d7058515835f252022415fafeffd0a986"
+ "facetsDigest": "sha256:e072ae8af0da0900055e8bbe3e8d3dc0d321a7d95e728bd676d025c4000492cc",
+ "closureDigest": "sha256:e197c04f00404b1f61d87cbe3820209ac9303ec10c3606e1223302c06b7d3c2a"
},
{
"specifier": "@narratage/speech-evidence",
@@ -406,8 +406,8 @@
"name": "@narratage/speech-evidence",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:f437adcaf0a0d03b12ebf0e42cf791978e8cf58632e8164acf29204dec66bb63",
- "closureDigest": "sha256:86e0583db976ba95f208fa7497a594ab01922d9e30c2bf150ded4738ff9ad0cc"
+ "facetsDigest": "sha256:c3441e4dca55aded30e49188889422969a59c9515512f8098c3c780e8337fafb",
+ "closureDigest": "sha256:15fad31dfd08d44577168cce1009cef5817a31c5be55f29063dfe43d427c893f"
},
{
"specifier": "@narratage/speech-spine",
@@ -415,8 +415,8 @@
"name": "@narratage/speech-spine",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:baa2ab372d24658a44227fe7c69b0edbe255abff8a397f12b21d96b2a4d40f4d",
- "closureDigest": "sha256:46721b27166d5109bc300b1b0400fa0750c9c0dc5c5f18380596b688bf94f637"
+ "facetsDigest": "sha256:dabf22bbcf3ab13504b71209d3643b9175880f859f38971a119505214c0d58fa",
+ "closureDigest": "sha256:4be19980d2f68dda18a3b10984a6c3ac1cdbe157aa2ef2a34a463bb6bff5d510"
},
{
"specifier": "@narratage/svs",
@@ -434,7 +434,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:a8d72579639a41123f5ac017e98781819012adc52d94a8116c5a072dc9e6fc05",
- "closureDigest": "sha256:026709127336795d41295ad4d67d3fb13e7765e4ae4fc3689661d5b7991282c6"
+ "closureDigest": "sha256:63d591b669757e83663dbae933870ffb852a66e83f831dd21aae259be1eddac1"
},
{
"specifier": "@narratage/whisperx",
@@ -442,9 +442,9 @@
"name": "@narratage/whisperx",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:19f77e1ff6db2def21fc9a111a4595e2e973ebc8e5da6d28f983283f11269dff",
- "closureDigest": "sha256:89808d24cb03ee7329ff8e4f7a20e71c825aa9d81b5967844e5628adf0b6a30a"
+ "facetsDigest": "sha256:a0d0b282085f5d6b0994660d39009f0d859780fe4597622f8edb6e743ffc2bae",
+ "closureDigest": "sha256:747dda39abd4c81eba23f4db6be19698dfe653517bdd1fc7b9896a3839bbda3f"
}
],
- "digest": "sha256:4c4a50e7b13e15915a0ede36444f0bfd51f64bfbec2f63563d866d9f33f2578e"
+ "digest": "sha256:18a9f1f0b8cae9165dbb880d6f13ed2c14206caa5fb90c639719bc7ea2512d39"
}
diff --git a/examples/talking-head-aroll/svml.runtime-packages.lock b/examples/talking-head-aroll/svml.runtime-packages.lock
index 14ebbf1b..141f80bf 100644
--- a/examples/talking-head-aroll/svml.runtime-packages.lock
+++ b/examples/talking-head-aroll/svml.runtime-packages.lock
@@ -79,7 +79,7 @@
{
"name": "@narratage/hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:dab846f27aab6083a00d5c4a6f9c2e8010c43d4b5767fee4648f87dd35462b03"
+ "digest": "sha256:48f6b2bb2f90ea9f5d11fb8b1d94b5e7ccdb552dd5eb4f08cdbb5631c69de8c0"
},
{
"name": "@narratage/media-execution",
@@ -94,7 +94,7 @@
{
"name": "@narratage/media",
"version": "0.0.0-dev",
- "digest": "sha256:dd0afbcbb6b8fcfcd1d1344eff4aec43d5a0e139b6cce4bbe4f823520795761b"
+ "digest": "sha256:059c7ebefb816a9831e5ce22edb4c9737ee1548428aba1108b054bc967989cf3"
},
{
"name": "@narratage/narrative",
@@ -194,7 +194,7 @@
{
"name": "@narratage/visual-ir",
"version": "0.0.0-dev",
- "digest": "sha256:7a112d37e211797b680b2aa37382be47a65a6182e91fdcc93da50e684e50373c"
+ "digest": "sha256:fbf0af7778388d444c6098359cb5af8498c40c6cc386be10305e524c00366a1e"
},
{
"name": "@narratage/whisperx",
@@ -850,7 +850,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:b2636492ab0b0b500d674899ab2ff14fc61c7f2b22ef44eb8f816f141b21ec4d",
- "closureDigest": "sha256:d3aa7f9841308a6527f9a32daf858807355e4968f13790bbedfa189e99f5b1b5"
+ "closureDigest": "sha256:5c92620e7d9365cf43721684b39ea5dc8a3807bd24491f340607243511e65213"
},
{
"specifier": "@narratage/provider-hyperframes-local",
@@ -859,7 +859,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:b14b721bdc0c9d5d9ced1c345107c92a3a5878f3383dea2ecd3e310442c2a40c",
- "closureDigest": "sha256:4ba832de33258b5f8e12105dd737e00884ad9ff17a963d56ac97486f214fb736"
+ "closureDigest": "sha256:292da8784b8c8465a66ee6849209bc0c908691b28cf7aceaf2e9fb7d4e506e39"
},
{
"specifier": "@narratage/provider-kie",
@@ -877,7 +877,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:701abcc923bf8a711c20b6e308d8cc8be27bf560f249b8c5a801e1dbd9cb3979",
- "closureDigest": "sha256:cf5a9555e43f0733111b8eb189c168da5681ae596dc1f944413c99eb3953aaae"
+ "closureDigest": "sha256:1c0b1ad30ee02c1637e25de62ec4d5c207f30b5f927ee11de297e4acc114eeaa"
},
{
"specifier": "@narratage/provider-whisperx-local",
@@ -886,8 +886,8 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:3686b84c42cc2b1bcaccf57cbdcda25a15c7d9d3778fb92d25437f9880ed8f5d",
- "closureDigest": "sha256:614eee90172133b91bdd4bbeb818a5e3a536f248781fc17d3e8cb2b3ab3b1afe"
+ "closureDigest": "sha256:c229c953e6eda641deb1116ba4cdf782a94eccbf56537710cbab40a8279207b7"
}
],
- "digest": "sha256:c1ae4192bb3fab604672c59c78dd8afe4f187e17bb0b15174ee97b870c4b84fb"
+ "digest": "sha256:19529231d0dcb2d7045c51c9a2cd5324e788a18b0b9ee5830c7966bc07a6e08f"
}
diff --git a/packages/caption-fine/README.md b/packages/caption-fine/README.md
index 60610706..ca4f211c 100644
--- a/packages/caption-fine/README.md
+++ b/packages/caption-fine/README.md
@@ -3,17 +3,17 @@
The official field-free fine-grained Caption Style family. It turns one SVS Recipe into a complete
`CaptionStyle` and lowers timed whole Atoms into one ordinary peer `VisualTrack`.
-Fine owns Cue geometry, typography, base/active glyph Paint, Cue box Paint and restrained local
-motion. Its optional karaoke is `current | trail` by `step | wipe`; ordinary single-Word Atoms get
-per-word timing while a Dual Text Atom remains one honest indivisible activation unit. It declares
-no planning fields and has no `important`, random sizing or inferred Word timestamps.
+Fine owns Cue geometry, single-font typography, base/active glyph Paint, Cue/Pill Paint and layered
+local motion. Glyph, underline and Pill activation are independent `off | current | trail` channels;
+Pills may be isolated or one joined prefix across real browser line fragments. Ordinary single-Word
+Atoms get per-word timing while a Dual Text Atom remains one honest indivisible activation unit. It
+declares no planning fields and has no `important`, random sizing or inferred Word timestamps.
```xml
-<fonts:Face id="caption-font" family="inter" weight="600" style="normal"/>
-<fonts:Face id="caption-cjk" family="noto-sans-sc" weight="600" style="normal"/>
-<fine:Style id="primary" recipe={studio.caption.primary} font={caption-font}>
- <fine:Fallback font={caption-cjk}/>
-</fine:Style>
+<fonts:Stack id="caption-fonts" family="inter" weight="600" style="normal" emoji="color">
+ <fonts:Fallback family="noto-sans-sc" weight="600" style="normal"/>
+</fonts:Stack>
+<fine:Style id="primary" recipe={studio.caption.primary} font={caption-fonts}/>
<caption:Program id="captions" display={story.caption} default={primary}/>
@@ -28,9 +28,38 @@ no planning fields and has no `important`, random sizing or inferred Word timest
/>
```
-One Track handles the default and ordered Style replacements. `font=` plus ordered `Fallback`
-children form an exact font stack for reproducible builds; all faces reference existing Media
-`FontArtifactRef` values. The primary must match the Recipe's weight/style; fallbacks keep their own
+The complete Recipe surface is orthogonal rather than a list of visual presets. For example:
+
+```svs
+caption.primary {
+ cue-min-words: 2; cue-max-words: 6;
+ stack-order: 70; x: 0.5; y: 0.88; width: 0.84;
+ anchor-x: center; anchor-y: bottom; align: center; direction: ltr;
+ font: Inter; weight: 800; size: 58; line-height: 1.05;
+ fill: #FFFFFF; gradient-from: #FFFFFF; gradient-to: #93C5FD; gradient-angle: 120;
+ stroke-color: #09090B; stroke-width: 2;
+ shadow-color: #000000; shadow-opacity: 0.7; shadow-x: 0; shadow-y: 3; shadow-blur: 8;
+ background: #00000000; padding: 0; radius: 0;
+
+ karaoke: trail; karaoke-transition: wipe; active-fill: #FFD54A;
+ active-box: current; active-box-continuity: isolated;
+ active-box-background: #FFD54ACC; active-box-padding: 4 8; active-box-radius: 8;
+ active-underline: current; active-underline-color: #FFFFFF;
+ active-underline-thickness: 3; active-underline-offset: 5;
+
+ cue-enter: spring; cue-enter-frames: 6;
+ cue-exit: fade; cue-exit-frames: 4;
+ active-response: pop; active-response-frames: 5; active-scale: 1.10;
+}
+```
+
+Changing `active-box` to `trail` and `active-box-continuity` to `joined` produces a continuous
+already-read Pill rather than one capsule per Atom. Text may remain `trail` while the Pill remains
+`current`; no field or renderer fork is required.
+
+One Track handles the default and ordered Style replacements. `font=` accepts either one exact
+`FontArtifactRef` plus ordered Style `Fallback` children, or a reusable Media `FontStackRef` such as
+the compact `fonts:Stack` above. The primary must match the Recipe's weight/style; fallbacks keep their own
honest face metadata. Omitting the stack is the explicit environment-font prototype path. Fine never
clips author text and intentionally has no `max-lines`.
Common Caption, Composition and Core know none of Fine's Recipe fields or layout policy. See
diff --git a/packages/caption-fine/src/manifest.ts b/packages/caption-fine/src/manifest.ts
index 9cdcf6bb..006922cb 100644
--- a/packages/caption-fine/src/manifest.ts
+++ b/packages/caption-fine/src/manifest.ts
@@ -13,8 +13,8 @@ export const captionFineModuleRef = { name: "@narratage/caption-fine", version:
export const captionFineProducers = {
render: { module: captionFineModuleRef, name: "render-fine-caption" },
} satisfies Record<string, ProducerRef>;
-export const captionFineStyleSurfaceImplementationDigest = digestOf("@narratage/caption-fine/exact-font-stack-style-surface@1");
-export const captionFineTrackSurfaceImplementationDigest = digestOf("@narratage/caption-fine/whole-atom-track-surface@1");
+export const captionFineStyleSurfaceImplementationDigest = digestOf("@narratage/caption-fine/full-orthogonal-style-surface@1");
+export const captionFineTrackSurfaceImplementationDigest = digestOf("@narratage/caption-fine/full-orthogonal-track-surface@1");
export const captionFineManifest: ModuleManifest = {
format: "svml.module@1",
diff --git a/packages/caption-fine/src/render.ts b/packages/caption-fine/src/render.ts
index 190bf783..05967b6e 100644
--- a/packages/caption-fine/src/render.ts
+++ b/packages/caption-fine/src/render.ts
@@ -16,9 +16,15 @@ import type { ProgramSpace } from "@narratage/program-space";
import { digestOf } from "@narratage/protocol";
import { assertFineCaptionParameters, FINE_CAPTION_FAMILY } from "./style.js";
-import type { FineCaptionGlyphPaint, FineCaptionParameters } from "./types.js";
+import type {
+ FineCaptionActiveUnderline,
+ FineCaptionGlyphPaint,
+ FineCaptionOneShotMotion,
+ FineCaptionParameters,
+ FineCaptionUnderline,
+} from "./types.js";
-export const renderFineCaptionImplementationDigest = digestOf("@narratage/caption-fine/render-exact-font-stack@1");
+export const renderFineCaptionImplementationDigest = digestOf("@narratage/caption-fine/full-orthogonal-renderer@1");
function frameAt(space: ProgramSpace, seconds: number): number {
return Math.round(seconds * space.frameRate.numerator / space.frameRate.denominator);
@@ -40,7 +46,35 @@ function alphaColor(hex: string, opacity: number): string {
return `rgba(${red},${green},${blue},${compactNumber(authoredAlpha * opacity)})`;
}
-function glyphStyle(parameters: FineCaptionParameters, paint: FineCaptionGlyphPaint): VisualStyleDeclaration[] {
+function typographyStyle(parameters: FineCaptionParameters): VisualStyleDeclaration[] {
+ return [
+ { name: "font-size", value: `${compactNumber(parameters.typography.fontSizePx)}px` },
+ ...(parameters.typography.exactFonts === undefined ? [
+ { name: "font-family", value: parameters.typography.fontFamily },
+ { name: "font-style", value: parameters.typography.fontStyle },
+ { name: "font-weight", value: parameters.typography.fontWeight },
+ ] as const : []),
+ { name: "letter-spacing", value: `${compactNumber(parameters.layout.letterSpacingPx)}px` },
+ { name: "line-height", value: parameters.layout.lineHeight },
+ { name: "text-transform", value: parameters.typography.textTransform },
+ ];
+}
+
+function underlineStyle(underline: FineCaptionUnderline | FineCaptionActiveUnderline): VisualStyleDeclaration[] {
+ if (underline.mode === "off") return [];
+ return [
+ { name: "text-decoration", value: "underline" },
+ { name: "text-decoration-color", value: underline.color },
+ { name: "text-decoration-thickness", value: `${compactNumber(underline.thicknessPx)}px` },
+ { name: "text-underline-offset", value: `${compactNumber(underline.offsetPx)}px` },
+ ];
+}
+
+function glyphStyle(
+ parameters: FineCaptionParameters,
+ paint: FineCaptionGlyphPaint,
+ underline?: FineCaptionUnderline,
+): VisualStyleDeclaration[] {
const shadows: string[] = [];
if (paint.shadow.opacity > 0) {
shadows.push([
@@ -53,23 +87,48 @@ function glyphStyle(parameters: FineCaptionParameters, paint: FineCaptionGlyphPa
if (paint.glow.opacity > 0) {
shadows.push(`0 0 ${compactNumber(paint.glow.blurPx)}px ${alphaColor(paint.glow.color, paint.glow.opacity)}`);
}
+ if (paint.longShadow.opacity > 0 && paint.longShadow.distancePx > 0) {
+ const steps = Math.min(32, Math.max(1, Math.ceil(paint.longShadow.distancePx)));
+ const radians = paint.longShadow.angleDeg * Math.PI / 180;
+ for (let step = 1; step <= steps; step += 1) {
+ const distance = paint.longShadow.distancePx * step / steps;
+ shadows.push([
+ `${compactNumber(Math.cos(radians) * distance)}px`,
+ `${compactNumber(Math.sin(radians) * distance)}px`,
+ "0",
+ alphaColor(paint.longShadow.color, paint.longShadow.opacity),
+ ].join(" "));
+ }
+ }
return [
{ name: "color", value: paint.fill },
- { name: "font-size", value: `${compactNumber(parameters.typography.fontSizePx)}px` },
- ...(parameters.typography.exactFonts === undefined ? [
- { name: "font-family", value: parameters.typography.fontFamily },
- { name: "font-style", value: parameters.typography.fontStyle },
- { name: "font-weight", value: parameters.typography.fontWeight },
- ] as const : []),
- { name: "letter-spacing", value: `${compactNumber(parameters.layout.letterSpacingPx)}px` },
- { name: "line-height", value: parameters.layout.lineHeight },
+ ...typographyStyle(parameters),
{ name: "opacity", value: paint.opacity },
{ name: "white-space", value: "nowrap" },
+ ...(paint.gradient === undefined ? [] : [
+ { name: "background-image", value: `linear-gradient(${compactNumber(paint.gradient.angleDeg)}deg,${paint.gradient.from},${paint.gradient.to})` },
+ { name: "background-clip", value: "text" },
+ { name: "-webkit-background-clip", value: "text" },
+ { name: "-webkit-text-fill-color", value: "transparent" },
+ ] as const),
...(paint.stroke.widthPx === 0 ? [] : [
{ name: "-webkit-text-stroke-color", value: paint.stroke.color },
{ name: "-webkit-text-stroke-width", value: `${compactNumber(paint.stroke.widthPx)}px` },
] as const),
...(shadows.length === 0 ? [] : [{ name: "text-shadow", value: shadows.join(",") }] as const),
+ ...(underline === undefined ? [] : underlineStyle(underline)),
+ ];
+}
+
+function transparentGlyphStyle(
+ parameters: FineCaptionParameters,
+ underline?: FineCaptionUnderline | FineCaptionActiveUnderline,
+): VisualStyleDeclaration[] {
+ return [
+ { name: "color", value: "#00000000" },
+ ...typographyStyle(parameters),
+ { name: "white-space", value: "nowrap" },
+ ...(underline === undefined ? [] : underlineStyle(underline)),
];
}
@@ -94,42 +153,87 @@ function stepOffsets(...boundaries: number[]): number[] {
return boundaries.flatMap((boundary) => [boundary - 1, boundary]);
}
+type MotionSnapshot = { readonly opacity: number; readonly transform: string; readonly filter: string };
+
+function motionSnapshot(kind: FineCaptionOneShotMotion, progress: number, distancePx: number): MotionSnapshot {
+ const value = clamp(progress, 0, 1);
+ if (kind === "none") return { opacity: 1, transform: "none", filter: "none" };
+ if (kind === "fade") return { opacity: value, transform: "none", filter: "none" };
+ if (kind === "blur-in") {
+ return { opacity: value, transform: "none", filter: `blur(${compactNumber((1 - value) * 12)}px)` };
+ }
+ if (kind === "pop") {
+ return { opacity: value, transform: `scale(${compactNumber(0.78 + 0.22 * value)})`, filter: "none" };
+ }
+ if (kind === "spring") {
+ const settled = value >= 1 ? 1 : 1 - Math.exp(-5 * value) * Math.cos(10 * value);
+ return { opacity: value, transform: `scale(${compactNumber(0.72 + 0.28 * settled)})`, filter: "none" };
+ }
+ const remaining = compactNumber((1 - value) * distancePx);
+ const transform = kind === "slide-left" ? `translateX(-${remaining}px)`
+ : kind === "slide-right" ? `translateX(${remaining}px)`
+ : kind === "slide-up" ? `translateY(-${remaining}px)`
+ : `translateY(${remaining}px)`;
+ return { opacity: value, transform, filter: "none" };
+}
+
+function snapshotStyle(snapshot: MotionSnapshot): VisualStyleDeclaration[] {
+ return [
+ { name: "opacity", value: snapshot.opacity },
+ { name: "transform", value: snapshot.transform },
+ { name: "filter", value: snapshot.filter },
+ ];
+}
+
+function transitionOffsets(start: number, frames: number, kind: FineCaptionOneShotMotion): number[] {
+ if (frames === 0) return stepOffsets(start);
+ const samples = kind === "spring" ? Math.min(frames, 8) : Math.min(frames, 4);
+ return Array.from({ length: samples + 1 }, (_, index) => start + Math.round(frames * index / samples));
+}
+
function cueAnimation(parameters: FineCaptionParameters, durationFrames: number): VisualAnimation | undefined {
- const requested = parameters.motion.cueTransitionFrames;
- const enterFrames = parameters.motion.cueEnter === "fade" ? Math.min(requested, Math.floor(durationFrames / 2)) : 0;
- const exitFrames = parameters.motion.cueExit === "fade" ? Math.min(requested, Math.floor(durationFrames / 2)) : 0;
- return animationFrom(durationFrames, [enterFrames, durationFrames - exitFrames], (frame) => {
- const enter = enterFrames === 0 ? 1 : clamp(frame / enterFrames, 0, 1);
- const exit = exitFrames === 0 ? 1 : clamp((durationFrames - frame) / exitFrames, 0, 1);
- return [{ name: "opacity", value: Math.min(enter, exit) }];
+ const enterFrames = parameters.motion.cueEnter === "none"
+ ? 0 : Math.min(parameters.motion.cueEnterFrames, Math.floor(durationFrames / 2));
+ const exitFrames = parameters.motion.cueExit === "none"
+ ? 0 : Math.min(parameters.motion.cueExitFrames, Math.floor(durationFrames / 2));
+ const offsets = [
+ ...transitionOffsets(0, enterFrames, parameters.motion.cueEnter),
+ ...transitionOffsets(durationFrames - exitFrames, exitFrames, parameters.motion.cueExit),
+ ];
+ return animationFrom(durationFrames, offsets, (frame) => {
+ const enterProgress = enterFrames === 0 ? 1 : clamp(frame / enterFrames, 0, 1);
+ const exitProgress = exitFrames === 0 ? 1 : clamp((durationFrames - frame) / exitFrames, 0, 1);
+ const enter = motionSnapshot(parameters.motion.cueEnter, enterProgress, parameters.motion.slideDistancePx);
+ const exit = motionSnapshot(parameters.motion.cueExit, exitProgress, parameters.motion.slideDistancePx);
+ return snapshotStyle(enterProgress < 1 ? enter : exit);
});
}
-function atomAnimation(
+function atomEntryAnimation(
parameters: FineCaptionParameters,
startFrame: number,
- endFrame: number,
durationFrames: number,
): VisualAnimation | undefined {
- if (parameters.motion.atomReveal === "all" && parameters.motion.activeScale === 1) return undefined;
- return animationFrom(durationFrames, stepOffsets(startFrame, endFrame), (frame) => {
- const active = frame >= startFrame && (frame < endFrame || (endFrame === durationFrames && frame === durationFrames));
- const revealed = parameters.motion.atomReveal === "all" || frame >= startFrame;
- return [
- { name: "opacity", value: revealed ? 1 : 0 },
- { name: "transform", value: `scale(${compactNumber(active ? parameters.motion.activeScale : 1)})` },
- ];
+ const shouldWait = parameters.motion.atomReveal === "on-start" || parameters.motion.atomEnter !== "none";
+ if (!shouldWait) return undefined;
+ const enterFrames = parameters.motion.atomEnter === "none" ? 0
+ : Math.min(parameters.motion.atomEnterFrames, Math.max(0, durationFrames - startFrame));
+ return animationFrom(durationFrames, transitionOffsets(startFrame, enterFrames, parameters.motion.atomEnter), (frame) => {
+ if (frame < startFrame) return [{ name: "opacity", value: 0 }];
+ if (parameters.motion.atomEnter === "none") return [{ name: "opacity", value: 1 }];
+ const progress = enterFrames === 0 ? 1 : (frame - startFrame) / enterFrames;
+ return snapshotStyle(motionSnapshot(parameters.motion.atomEnter, progress, parameters.motion.slideDistancePx));
});
}
-function karaokeStepAnimation(
- parameters: FineCaptionParameters,
+function activationStepAnimation(
+ mode: "current" | "trail",
startFrame: number,
endFrame: number,
durationFrames: number,
): VisualAnimation {
return animationFrom(durationFrames, stepOffsets(startFrame, endFrame), (frame) => {
- const active = parameters.karaoke.mode === "trail"
+ const active = mode === "trail"
? frame >= startFrame
: frame >= startFrame && (frame < endFrame || (endFrame === durationFrames && frame === durationFrames));
return [{ name: "opacity", value: active ? 1 : 0 }];
@@ -146,19 +250,20 @@ function wipeClip(progress: number, direction: FineCaptionParameters["layout"]["
function karaokeWipeAnimation(
parameters: FineCaptionParameters,
+ mode: "current" | "trail",
startFrame: number,
endFrame: number,
durationFrames: number,
): VisualAnimation {
- if (parameters.karaoke.mode === "current" && endFrame - startFrame <= 1) {
- return karaokeStepAnimation(parameters, startFrame, endFrame, durationFrames);
+ if (mode === "current" && endFrame - startFrame <= 1) {
+ return activationStepAnimation(mode, startFrame, endFrame, durationFrames);
}
- const revealEnd = parameters.karaoke.mode === "current" ? endFrame - 1 : endFrame;
+ const revealEnd = mode === "current" ? endFrame - 1 : endFrame;
return animationFrom(durationFrames, [startFrame, revealEnd, endFrame], (frame) => {
let progress = 0;
if (frame >= startFrame && frame <= revealEnd) {
progress = revealEnd === startFrame ? 1 : (frame - startFrame) / (revealEnd - startFrame);
- } else if (parameters.karaoke.mode === "trail" && frame > revealEnd) {
+ } else if (mode === "trail" && frame > revealEnd) {
progress = 1;
}
return [{ name: "clip-path", value: wipeClip(progress, parameters.layout.direction) }];
@@ -168,6 +273,115 @@ function karaokeWipeAnimation(
] };
}
+function typewriterAnimation(
+ text: string,
+ parameters: FineCaptionParameters,
+ startFrame: number,
+ endFrame: number,
+ durationFrames: number,
+): VisualAnimation | undefined {
+ if (parameters.motion.atomReveal !== "typewriter") return undefined;
+ const graphemes = Math.max(1, [...new Intl.Segmenter("und", { granularity: "grapheme" }).segment(text)].length);
+ const span = Math.max(1, endFrame - startFrame);
+ const offsets = Array.from({ length: graphemes + 1 }, (_, index) => startFrame + Math.round(span * index / graphemes));
+ return animationFrom(durationFrames, [...stepOffsets(startFrame), ...offsets], (frame) => {
+ const progress = frame < startFrame ? 0 : Math.floor(clamp((frame - startFrame) / span, 0, 1) * graphemes) / graphemes;
+ return [{ name: "clip-path", value: wipeClip(progress, parameters.layout.direction) }];
+ });
+}
+
+function activeResponseAnimation(
+ parameters: FineCaptionParameters,
+ startFrame: number,
+ endFrame: number,
+ durationFrames: number,
+): VisualAnimation | undefined {
+ const response = parameters.motion.activeResponse;
+ if (response === "none") return undefined;
+ if (response === "scale") {
+ return animationFrom(durationFrames, stepOffsets(startFrame, endFrame), (frame) => {
+ const active = frame >= startFrame && (frame < endFrame || (endFrame === durationFrames && frame === durationFrames));
+ return [{ name: "transform", value: `scale(${compactNumber(active ? parameters.motion.activeScale : 1)})` }];
+ });
+ }
+ const frames = Math.min(parameters.motion.activeResponseFrames, Math.max(1, endFrame - startFrame));
+ return animationFrom(durationFrames, transitionOffsets(startFrame, frames, response), (frame) => {
+ if (frame < startFrame || frame > startFrame + frames) return [{ name: "transform", value: "scale(1)" }];
+ const progress = clamp((frame - startFrame) / frames, 0, 1);
+ const amplitude = parameters.motion.activeScale - 1;
+ const responseScale = response === "pop"
+ ? 1 + amplitude * Math.sin(Math.PI * progress)
+ : 1 + amplitude * Math.exp(-4 * progress) * Math.sin(12 * progress);
+ return [{ name: "transform", value: `scale(${compactNumber(responseScale)})` }];
+ });
+}
+
+function loopAnimation(
+ parameters: FineCaptionParameters,
+ durationFrames: number,
+ activeWindow?: { readonly start: number; readonly end: number },
+): VisualAnimation | undefined {
+ if (parameters.motion.loop === "none") return undefined;
+ const period = parameters.motion.loopPeriodFrames;
+ const start = activeWindow?.start ?? 0;
+ const end = activeWindow?.end ?? durationFrames;
+ const offsets: number[] = [...stepOffsets(start, end)];
+ for (let frame = start; frame <= end; frame += Math.max(1, Math.round(period / 4))) offsets.push(frame);
+ return animationFrom(durationFrames, offsets, (frame) => {
+ const active = frame >= start && (frame < end || (end === durationFrames && frame === durationFrames));
+ if (!active) return parameters.motion.loop === "glow-pulse"
+ ? [{ name: "filter", value: "none" }]
+ : [{ name: "transform", value: "none" }];
+ const phase = 2 * Math.PI * ((frame - start) % period) / period;
+ if (parameters.motion.loop === "shake") {
+ return [{ name: "transform", value: `translateX(${compactNumber(Math.sin(phase * 2) * 3 * parameters.motion.loopIntensity)}px)` }];
+ }
+ if (parameters.motion.loop === "wobble") {
+ return [{ name: "transform", value: `rotate(${compactNumber(Math.sin(phase) * 2.5 * parameters.motion.loopIntensity)}deg)` }];
+ }
+ const strength = (0.35 + 0.65 * (Math.sin(phase) + 1) / 2) * parameters.motion.loopIntensity;
+ const paint = activeWindow === undefined ? parameters.basePaint : parameters.activePaint;
+ const color = paint.glow.opacity > 0 ? paint.glow.color : paint.fill;
+ const opacity = paint.glow.opacity > 0 ? paint.glow.opacity : 0.65;
+ const blur = paint.glow.blurPx > 0 ? paint.glow.blurPx : 8;
+ return [{ name: "filter", value: `drop-shadow(0 0 ${compactNumber(blur * strength)}px ${alphaColor(color, opacity)})` }];
+ });
+}
+
+function activeBoxAnimation(
+ parameters: FineCaptionParameters,
+ startFrame: number,
+ endFrame: number,
+ durationFrames: number,
+ mode: "current" | "trail" = parameters.activeBox.mode === "off" ? "current" : parameters.activeBox.mode,
+): VisualAnimation {
+ const box = parameters.activeBox;
+ const logicalEnd = mode === "trail" ? durationFrames : endFrame;
+ const enterFrames = box.enter === "none" ? 0 : Math.min(box.transitionFrames, Math.max(0, logicalEnd - startFrame));
+ const exitFrames = box.exit === "none" ? 0 : Math.min(box.transitionFrames, Math.max(0, logicalEnd - startFrame));
+ const offsets = [
+ ...stepOffsets(startFrame, logicalEnd),
+ ...transitionOffsets(startFrame, enterFrames, box.enter === "pop" ? "pop" : box.enter),
+ ...transitionOffsets(logicalEnd - exitFrames, exitFrames, box.exit === "pop" ? "pop" : box.exit),
+ ];
+ return animationFrom(durationFrames, offsets, (frame) => {
+ if (frame < startFrame || frame > logicalEnd || (frame === logicalEnd && logicalEnd !== durationFrames)) {
+ return [{ name: "opacity", value: 0 }, { name: "transform", value: "scale(0.82)" }];
+ }
+ const enterProgress = enterFrames === 0 ? 1 : clamp((frame - startFrame) / enterFrames, 0, 1);
+ const exitProgress = exitFrames === 0 ? 1 : clamp((logicalEnd - frame) / exitFrames, 0, 1);
+ const progress = Math.min(enterProgress, exitProgress);
+ const isPop = (enterProgress < 1 ? box.enter : box.exit) === "pop";
+ return [
+ { name: "opacity", value: (enterProgress < 1 ? box.enter : box.exit) === "none" ? 1 : progress },
+ { name: "transform", value: isPop ? `scale(${compactNumber(0.82 + 0.18 * progress)})` : "scale(1)" },
+ ];
+ }) ?? { keyframes: [
+ { atFrame: 0, style: [{ name: "opacity", value: 1 }] },
+ { atFrame: durationFrames, style: [{ name: "opacity", value: 1 }] },
+ ] };
+}
+
function anchorTransform(parameters: FineCaptionParameters): string | undefined {
const x = parameters.placement.anchorX === "left" ? 0 : parameters.placement.anchorX === "center" ? -50 : -100;
const y = parameters.placement.anchorY === "top" ? 0 : parameters.placement.anchorY === "center" ? -50 : -100;
@@ -190,6 +404,8 @@ function cueElements(
};
const transform = anchorTransform(parameters);
const cueMotion = cueAnimation(parameters, durationFrames);
+ const cueLoop = parameters.motion.loopTarget === "cue" ? loopAnimation(parameters, durationFrames) : undefined;
+ const fonts = parameters.typography.exactFonts;
push({
id: "placement",
kind: "box",
@@ -206,9 +422,23 @@ function cueElements(
],
});
push({
- id: "cue",
+ id: "cue-motion",
parent: "placement",
kind: "box",
+ style: [{ name: "display", value: "inline-flex" }, { name: "transform-origin", value: "center center" }],
+ ...(cueMotion === undefined ? {} : { animation: cueMotion }),
+ });
+ push({
+ id: "cue-loop",
+ parent: "cue-motion",
+ kind: "box",
+ style: [{ name: "display", value: "inline-flex" }, { name: "transform-origin", value: "center center" }],
+ ...(cueLoop === undefined ? {} : { animation: cueLoop }),
+ });
+ push({
+ id: "cue",
+ parent: "cue-loop",
+ kind: "box",
style: [
{ name: "background", value: parameters.cueBox.background },
{ name: "border-color", value: parameters.cueBox.borderColor },
@@ -222,30 +452,147 @@ function cueElements(
{ name: "justify-content", value: parameters.layout.textAlign === "left" ? "flex-start"
: parameters.layout.textAlign === "right" ? "flex-end" : "center" },
{ name: "padding", value: `${compactNumber(parameters.cueBox.paddingYPx)}px ${compactNumber(parameters.cueBox.paddingXPx)}px` },
+ { name: "position", value: "relative" },
{ name: "text-align", value: parameters.layout.textAlign },
],
- ...(cueMotion === undefined ? {} : { animation: cueMotion }),
});
+ if (parameters.activeBox.mode === "trail" && parameters.activeBox.continuity === "joined") {
+ for (const [prefixIndex, atom] of atoms.entries()) {
+ const timing = atomFrames.get(atom.id);
+ if (timing === undefined) throw new Error(`Fine Caption is missing timing for Atom ${atom.id}`);
+ const next = atoms[prefixIndex + 1];
+ const nextStart = next === undefined ? durationFrames : atomFrames.get(next.id)?.start;
+ if (nextStart === undefined) throw new Error("Fine Caption is missing timing for the next Atom");
+ const prefixText = atoms.slice(0, prefixIndex + 1).map((prefixAtom) => prefixAtom.wordIds
+ .map((wordId) => {
+ const text = wordText.get(wordId);
+ if (text === undefined) throw new Error(`Fine Caption Atom references unknown word ${wordId}`);
+ return text;
+ }).join("\u00A0")).join(" ");
+ const layerId = `joined-box-${prefixIndex + 1}`;
+ push({
+ id: layerId,
+ parent: "cue",
+ kind: "box",
+ style: [
+ { name: "box-sizing", value: "border-box" },
+ { name: "direction", value: parameters.layout.direction },
+ { name: "inset", value: "0" },
+ { name: "padding", value: `${compactNumber(parameters.cueBox.paddingYPx)}px ${compactNumber(parameters.cueBox.paddingXPx)}px` },
+ { name: "position", value: "absolute" },
+ { name: "text-align", value: parameters.layout.textAlign },
+ ],
+ animation: activeBoxAnimation(parameters, timing.start, nextStart, durationFrames, "current"),
+ attributes: [{ name: "data-caption-active-box", value: "joined" }],
+ });
+ push({
+ id: `${layerId}-text`,
+ parent: layerId,
+ kind: "text",
+ text: prefixText,
+ style: [
+ ...transparentGlyphStyle(parameters).filter(({ name }) => name !== "white-space"),
+ { name: "-webkit-box-decoration-break", value: "clone" },
+ { name: "background", value: parameters.activeBox.background },
+ { name: "border-color", value: parameters.activeBox.borderColor },
+ { name: "border-radius", value: `${compactNumber(parameters.activeBox.radiusPx)}px` },
+ { name: "border-style", value: "solid" },
+ { name: "border-width", value: `${compactNumber(parameters.activeBox.borderWidthPx)}px` },
+ { name: "box-decoration-break", value: "clone" },
+ { name: "display", value: "inline" },
+ { name: "padding", value: `${compactNumber(parameters.activeBox.paddingYPx)}px ${compactNumber(parameters.activeBox.paddingXPx)}px` },
+ { name: "white-space", value: "normal" },
+ ],
+ ...(fonts === undefined ? {} : { fonts }),
+ });
+ }
+ }
+
for (const [atomIndex, atom] of atoms.entries()) {
const timing = atomFrames.get(atom.id);
if (timing === undefined) throw new Error(`Fine Caption is missing timing for Atom ${atom.id}`);
const atomId = `atom-${atomIndex + 1}`;
- const animation = atomAnimation(parameters, timing.start, timing.end, durationFrames);
+ const atomText = atom.wordIds.map((wordId) => wordText.get(wordId) ?? "").join(" ");
+ const entryId = `${atomId}-entry`;
+ const typewriterId = `${atomId}-typewriter`;
+ const loopId = `${atomId}-loop`;
+ const responseId = `${atomId}-response`;
+ const entryAnimation = atomEntryAnimation(parameters, timing.start, durationFrames);
+ const writerAnimation = typewriterAnimation(atomText, parameters, timing.start, timing.end, durationFrames);
+ const atomLoop = parameters.motion.loopTarget === "active-atom"
+ ? loopAnimation(parameters, durationFrames, timing) : undefined;
+ const responseAnimation = activeResponseAnimation(parameters, timing.start, timing.end, durationFrames);
push({
- id: atomId,
+ id: entryId,
parent: "cue",
kind: "box",
+ style: [
+ { name: "display", value: "inline-flex" },
+ { name: "transform-origin", value: "center center" },
+ ],
+ ...(entryAnimation === undefined ? {} : { animation: entryAnimation }),
+ });
+ push({
+ id: typewriterId,
+ parent: entryId,
+ kind: "box",
+ style: [
+ { name: "display", value: "inline-flex" },
+ { name: "transform-origin", value: parameters.layout.direction === "rtl" ? "right center" : "left center" },
+ ],
+ ...(writerAnimation === undefined ? {} : { animation: writerAnimation }),
+ });
+ push({
+ id: loopId,
+ parent: typewriterId,
+ kind: "box",
+ style: [{ name: "display", value: "inline-flex" }, { name: "transform-origin", value: "center center" }],
+ ...(atomLoop === undefined ? {} : { animation: atomLoop }),
+ });
+ push({
+ id: responseId,
+ parent: loopId,
+ kind: "box",
+ style: [{ name: "display", value: "inline-flex" }, { name: "transform-origin", value: "center center" }],
+ ...(responseAnimation === undefined ? {} : { animation: responseAnimation }),
+ });
+ push({
+ id: atomId,
+ parent: responseId,
+ kind: "box",
style: [
{ name: "column-gap", value: `${compactNumber(parameters.layout.wordGapPx)}px` },
{ name: "display", value: "inline-flex" },
{ name: "position", value: "relative" },
- { name: "transform-origin", value: "center center" },
{ name: "white-space", value: "nowrap" },
],
- ...(animation === undefined ? {} : { animation }),
attributes: [{ name: "data-caption-atom", value: atom.id }],
});
+ const useIsolatedBox = parameters.activeBox.mode !== "off"
+ && !(parameters.activeBox.mode === "trail" && parameters.activeBox.continuity === "joined");
+ if (useIsolatedBox) {
+ push({
+ id: `${atomId}-box`,
+ parent: atomId,
+ kind: "box",
+ style: [
+ { name: "background", value: parameters.activeBox.background },
+ { name: "border-color", value: parameters.activeBox.borderColor },
+ { name: "border-radius", value: `${compactNumber(parameters.activeBox.radiusPx)}px` },
+ { name: "border-style", value: "solid" },
+ { name: "border-width", value: `${compactNumber(parameters.activeBox.borderWidthPx)}px` },
+ { name: "bottom", value: `${compactNumber(-parameters.activeBox.paddingYPx)}px` },
+ { name: "left", value: `${compactNumber(-parameters.activeBox.paddingXPx)}px` },
+ { name: "position", value: "absolute" },
+ { name: "right", value: `${compactNumber(-parameters.activeBox.paddingXPx)}px` },
+ { name: "top", value: `${compactNumber(-parameters.activeBox.paddingYPx)}px` },
+ { name: "transform-origin", value: "center center" },
+ ],
+ animation: activeBoxAnimation(parameters, timing.start, timing.end, durationFrames),
+ attributes: [{ name: "data-caption-active-box", value: "isolated" }],
+ });
+ }
for (const [wordIndex, wordId] of atom.wordIds.entries()) {
const text = wordText.get(wordId);
if (text === undefined) throw new Error(`Fine Caption Atom references unknown word ${wordId}`);
@@ -254,40 +601,52 @@ function cueElements(
parent: atomId,
kind: "text",
text,
- style: glyphStyle(parameters, parameters.basePaint),
- ...(parameters.typography.exactFonts === undefined ? {} : { fonts: parameters.typography.exactFonts }),
+ style: glyphStyle(parameters, parameters.basePaint, parameters.underline),
+ ...(fonts === undefined ? {} : { fonts }),
attributes: [{ name: "data-caption-word", value: wordId }],
});
}
- if (parameters.karaoke.mode === "off") continue;
- const activeId = `${atomId}-active`;
- push({
- id: activeId,
- parent: atomId,
- kind: "box",
- style: [
- { name: "column-gap", value: `${compactNumber(parameters.layout.wordGapPx)}px` },
- { name: "display", value: "inline-flex" },
- { name: "inset", value: "0" },
- { name: "overflow", value: "hidden" },
- { name: "position", value: "absolute" },
- ],
- animation: parameters.karaoke.transition === "step"
- ? karaokeStepAnimation(parameters, timing.start, timing.end, durationFrames)
- : karaokeWipeAnimation(parameters, timing.start, timing.end, durationFrames),
- attributes: [{ name: "data-caption-karaoke", value: parameters.karaoke.mode }],
- });
- for (const [wordIndex, wordId] of atom.wordIds.entries()) {
- const text = wordText.get(wordId)!;
+ const addActivatedTextLayer = (
+ suffix: string,
+ mode: "current" | "trail",
+ kind: "glyph" | "underline",
+ ): void => {
+ const activeId = `${atomId}-${suffix}`;
push({
- id: `${atomId}-active-${wordIndex + 1}`,
- parent: activeId,
- kind: "text",
- text,
- style: glyphStyle(parameters, parameters.activePaint),
- ...(parameters.typography.exactFonts === undefined ? {} : { fonts: parameters.typography.exactFonts }),
- attributes: [{ name: "data-caption-active-word", value: wordId }],
+ id: activeId,
+ parent: atomId,
+ kind: "box",
+ style: [
+ { name: "column-gap", value: `${compactNumber(parameters.layout.wordGapPx)}px` },
+ { name: "display", value: "inline-flex" },
+ { name: "inset", value: "0" },
+ ...(kind === "glyph" && parameters.karaoke.transition === "wipe"
+ ? [{ name: "overflow", value: "hidden" }] as const : []),
+ { name: "position", value: "absolute" },
+ ],
+ animation: kind === "glyph" && parameters.karaoke.transition === "wipe"
+ ? karaokeWipeAnimation(parameters, mode, timing.start, timing.end, durationFrames)
+ : activationStepAnimation(mode, timing.start, timing.end, durationFrames),
+ attributes: [{ name: kind === "glyph" ? "data-caption-karaoke" : "data-caption-active-underline", value: mode }],
});
+ for (const [wordIndex, wordId] of atom.wordIds.entries()) {
+ const text = wordText.get(wordId)!;
+ push({
+ id: `${activeId}-${wordIndex + 1}`,
+ parent: activeId,
+ kind: "text",
+ text,
+ style: kind === "glyph"
+ ? glyphStyle(parameters, parameters.activePaint)
+ : transparentGlyphStyle(parameters, parameters.activeUnderline),
+ ...(fonts === undefined ? {} : { fonts }),
+ attributes: [{ name: kind === "glyph" ? "data-caption-active-word" : "data-caption-underlined-word", value: wordId }],
+ });
+ }
+ };
+ if (parameters.karaoke.mode !== "off") addActivatedTextLayer("active", parameters.karaoke.mode, "glyph");
+ if (parameters.activeUnderline.mode !== "off") {
+ addActivatedTextLayer("underline", parameters.activeUnderline.mode, "underline");
}
}
return elements;
diff --git a/packages/caption-fine/src/style.ts b/packages/caption-fine/src/style.ts
index 0a314467..9d3ccbe6 100644
--- a/packages/caption-fine/src/style.ts
+++ b/packages/caption-fine/src/style.ts
@@ -15,13 +15,21 @@ const REQUIRED_PROPERTIES = [
] as const;
const OPTIONAL_PROPERTIES = [
- "active-fill", "active-glow-blur", "active-glow-color", "active-glow-opacity", "active-opacity",
- "active-scale", "active-shadow-blur", "active-shadow-color", "active-shadow-opacity", "active-shadow-x",
- "active-shadow-y", "active-stroke-color", "active-stroke-width", "anchor-x", "anchor-y", "atom-reveal",
- "border-color", "border-width", "cue-enter", "cue-exit", "cue-transition-frames", "direction", "font-style",
- "glow-blur", "glow-color", "glow-opacity", "karaoke", "karaoke-transition", "letter-spacing", "opacity",
- "shadow-blur", "shadow-color", "shadow-opacity", "shadow-x", "shadow-y", "stroke-color", "stroke-width",
- "word-gap",
+ "active-box", "active-box-background", "active-box-border-color", "active-box-border-width",
+ "active-box-continuity", "active-box-enter", "active-box-exit", "active-box-padding", "active-box-radius",
+ "active-box-transition-frames", "active-fill", "active-glow-blur", "active-glow-color", "active-glow-opacity",
+ "active-gradient-angle", "active-gradient-from", "active-gradient-to", "active-long-shadow-angle",
+ "active-long-shadow-color", "active-long-shadow-distance", "active-long-shadow-opacity", "active-opacity",
+ "active-response", "active-response-frames", "active-scale", "active-shadow-blur", "active-shadow-color", "active-shadow-opacity",
+ "active-shadow-x", "active-shadow-y", "active-stroke-color", "active-stroke-width", "active-underline",
+ "active-underline-color", "active-underline-offset", "active-underline-thickness", "anchor-x", "anchor-y",
+ "atom-enter", "atom-enter-frames", "atom-reveal", "border-color", "border-width", "cue-enter",
+ "cue-enter-frames", "cue-exit", "cue-exit-frames", "direction", "font-style", "glow-blur", "glow-color",
+ "glow-opacity", "gradient-angle", "gradient-from", "gradient-to", "karaoke", "karaoke-transition",
+ "letter-spacing", "long-shadow-angle", "long-shadow-color", "long-shadow-distance", "long-shadow-opacity",
+ "loop", "loop-intensity", "loop-period-frames", "loop-target", "opacity", "shadow-blur", "shadow-color",
+ "shadow-opacity", "shadow-x", "shadow-y", "slide-distance", "stroke-color", "stroke-width", "text-transform",
+ "underline", "underline-color", "underline-offset", "underline-thickness", "word-gap",
] as const;
const ALLOWED_PROPERTIES = new Set<string>([...REQUIRED_PROPERTIES, ...OPTIONAL_PROPERTIES]);
@@ -80,13 +88,37 @@ function padding(value: string): { readonly x: number; readonly y: number } {
return { y: parts[0]!, x: parts[1] ?? parts[0]! };
}
+function optionalGradient(
+ recipe: SvsRecipe,
+ prefix: "" | "active-",
+ base?: FineCaptionGlyphPaint["gradient"],
+): FineCaptionGlyphPaint["gradient"] | undefined {
+ const fromName = `${prefix}gradient-from`;
+ const toName = `${prefix}gradient-to`;
+ const hasFrom = Object.hasOwn(recipe.properties, fromName);
+ const hasTo = Object.hasOwn(recipe.properties, toName);
+ const hasAngle = Object.hasOwn(recipe.properties, `${prefix}gradient-angle`);
+ if (!hasFrom && !hasTo && !hasAngle) return prefix === "active-" ? undefined : base;
+ if (!hasFrom || !hasTo) {
+ throw new Error(`Fine Caption Recipe ${prefix}gradient requires both from and to colors`);
+ }
+ return {
+ from: color(recipe, fromName),
+ to: color(recipe, toName),
+ angleDeg: number(recipe, `${prefix}gradient-angle`, base?.angleDeg ?? 90),
+ };
+}
+
function glyphPaint(recipe: SvsRecipe, prefix: "" | "active-", base?: FineCaptionGlyphPaint): FineCaptionGlyphPaint {
const fallback = <K extends keyof FineCaptionGlyphPaint>(key: K): FineCaptionGlyphPaint[K] | undefined => base?.[key];
const baseShadow = fallback("shadow") as FineCaptionGlyphPaint["shadow"] | undefined;
const baseGlow = fallback("glow") as FineCaptionGlyphPaint["glow"] | undefined;
const baseStroke = fallback("stroke") as FineCaptionGlyphPaint["stroke"] | undefined;
+ const baseLongShadow = fallback("longShadow") as FineCaptionGlyphPaint["longShadow"] | undefined;
+ const gradient = optionalGradient(recipe, prefix, base?.gradient);
return {
fill: color(recipe, `${prefix}fill`, prefix === "active-" ? "#FFD54A" : base?.fill),
+ ...(gradient === undefined ? {} : { gradient }),
opacity: number(recipe, `${prefix}opacity`, base?.opacity ?? 1),
stroke: {
color: color(recipe, `${prefix}stroke-color`, baseStroke?.color ?? "#000000"),
@@ -99,6 +131,12 @@ function glyphPaint(recipe: SvsRecipe, prefix: "" | "active-", base?: FineCaptio
offsetYPx: number(recipe, `${prefix}shadow-y`, baseShadow?.offsetYPx ?? 0),
blurPx: number(recipe, `${prefix}shadow-blur`, baseShadow?.blurPx ?? 0),
},
+ longShadow: {
+ color: color(recipe, `${prefix}long-shadow-color`, baseLongShadow?.color ?? "#000000"),
+ opacity: number(recipe, `${prefix}long-shadow-opacity`, baseLongShadow?.opacity ?? 0),
+ distancePx: number(recipe, `${prefix}long-shadow-distance`, baseLongShadow?.distancePx ?? 0),
+ angleDeg: number(recipe, `${prefix}long-shadow-angle`, baseLongShadow?.angleDeg ?? 45),
+ },
glow: {
color: color(recipe, `${prefix}glow-color`, baseGlow?.color ?? "#FFFFFF"),
opacity: number(recipe, `${prefix}glow-opacity`, baseGlow?.opacity ?? 0),
@@ -120,17 +158,26 @@ function assertPaint(value: FineCaptionGlyphPaint, label: string): void {
assertOpacity(value.opacity, `${label} opacity`);
assertColor(value.stroke.color, `${label} stroke color`);
assertColor(value.shadow.color, `${label} shadow color`);
+ assertColor(value.longShadow.color, `${label} long shadow color`);
assertColor(value.glow.color, `${label} glow color`);
assertOpacity(value.shadow.opacity, `${label} shadow opacity`);
+ assertOpacity(value.longShadow.opacity, `${label} long shadow opacity`);
assertOpacity(value.glow.opacity, `${label} glow opacity`);
for (const [name, metric] of [
- ["stroke width", value.stroke.widthPx], ["shadow blur", value.shadow.blurPx], ["glow blur", value.glow.blurPx],
+ ["stroke width", value.stroke.widthPx], ["shadow blur", value.shadow.blurPx],
+ ["long shadow distance", value.longShadow.distancePx], ["glow blur", value.glow.blurPx],
] as const) {
if (!Number.isFinite(metric) || metric < 0) throw new Error(`${label} ${name} is invalid`);
}
if (!Number.isFinite(value.shadow.offsetXPx) || !Number.isFinite(value.shadow.offsetYPx)) {
throw new Error(`${label} shadow offset is invalid`);
}
+ if (!Number.isFinite(value.longShadow.angleDeg)) throw new Error(`${label} long shadow angle is invalid`);
+ if (value.gradient !== undefined) {
+ assertColor(value.gradient.from, `${label} gradient from`);
+ assertColor(value.gradient.to, `${label} gradient to`);
+ if (!Number.isFinite(value.gradient.angleDeg)) throw new Error(`${label} gradient angle is invalid`);
+ }
}
export function fineCaptionParameters(
@@ -142,8 +189,12 @@ export function fineCaptionParameters(
if (unknown.length > 0) throw new Error(`Fine Caption Recipe contains unknown property ${unknown[0]}`);
const pad = padding(string(recipe, "padding"));
+ const activeBoxPadding = padding(string(recipe, "active-box-padding", "0"));
const fontSizePx = number(recipe, "size");
const basePaint = glyphPaint(recipe, "");
+ const oneShotMotions = [
+ "none", "fade", "pop", "spring", "slide-left", "slide-right", "slide-up", "slide-down", "blur-in",
+ ] as const;
const parameters: FineCaptionParameters = {
contract: "svml.caption-fine-parameters@1",
stackingOrder: integer(recipe, "stack-order"),
@@ -166,10 +217,23 @@ export function fineCaptionParameters(
fontSizePx,
fontWeight: integer(recipe, "weight"),
fontStyle: choice(recipe, "font-style", ["normal", "italic", "oblique"] as const, "normal"),
+ textTransform: choice(recipe, "text-transform", ["none", "uppercase", "lowercase"] as const, "none"),
...(exactFonts.length === 0 ? {} : { exactFonts: [...exactFonts] }),
},
basePaint,
activePaint: glyphPaint(recipe, "active-", basePaint),
+ underline: {
+ mode: choice(recipe, "underline", ["off", "always"] as const, "off"),
+ color: color(recipe, "underline-color", basePaint.fill),
+ thicknessPx: number(recipe, "underline-thickness", 2),
+ offsetPx: number(recipe, "underline-offset", 4),
+ },
+ activeUnderline: {
+ mode: choice(recipe, "active-underline", ["off", "current", "trail"] as const, "off"),
+ color: color(recipe, "active-underline-color", "#FFD54A"),
+ thicknessPx: number(recipe, "active-underline-thickness", 3),
+ offsetPx: number(recipe, "active-underline-offset", 4),
+ },
cueBox: {
background: color(recipe, "background"),
borderColor: color(recipe, "border-color", "#00000000"),
@@ -182,12 +246,35 @@ export function fineCaptionParameters(
mode: choice(recipe, "karaoke", ["off", "current", "trail"] as const, "off"),
transition: choice(recipe, "karaoke-transition", ["step", "wipe"] as const, "step"),
},
+ activeBox: {
+ mode: choice(recipe, "active-box", ["off", "current", "trail"] as const, "off"),
+ continuity: choice(recipe, "active-box-continuity", ["isolated", "joined"] as const, "isolated"),
+ background: color(recipe, "active-box-background", "#FFD54A"),
+ borderColor: color(recipe, "active-box-border-color", "#00000000"),
+ borderWidthPx: number(recipe, "active-box-border-width", 0),
+ paddingXPx: activeBoxPadding.x,
+ paddingYPx: activeBoxPadding.y,
+ radiusPx: number(recipe, "active-box-radius", 8),
+ enter: choice(recipe, "active-box-enter", ["none", "fade", "pop"] as const, "none"),
+ exit: choice(recipe, "active-box-exit", ["none", "fade", "pop"] as const, "none"),
+ transitionFrames: integer(recipe, "active-box-transition-frames", 0),
+ },
motion: {
- cueEnter: choice(recipe, "cue-enter", ["none", "fade"] as const, "none"),
- cueExit: choice(recipe, "cue-exit", ["none", "fade"] as const, "none"),
- cueTransitionFrames: integer(recipe, "cue-transition-frames", 0),
- atomReveal: choice(recipe, "atom-reveal", ["all", "on-start"] as const, "all"),
- activeScale: number(recipe, "active-scale", 1),
+ cueEnter: choice(recipe, "cue-enter", oneShotMotions, "none"),
+ cueExit: choice(recipe, "cue-exit", oneShotMotions, "none"),
+ cueEnterFrames: integer(recipe, "cue-enter-frames", 0),
+ cueExitFrames: integer(recipe, "cue-exit-frames", 0),
+ atomEnter: choice(recipe, "atom-enter", oneShotMotions, "none"),
+ atomEnterFrames: integer(recipe, "atom-enter-frames", 0),
+ atomReveal: choice(recipe, "atom-reveal", ["all", "on-start", "typewriter"] as const, "all"),
+ activeResponse: choice(recipe, "active-response", ["none", "scale", "pop", "spring"] as const, "none"),
+ activeResponseFrames: integer(recipe, "active-response-frames", 6),
+ activeScale: number(recipe, "active-scale", 1.08),
+ slideDistancePx: number(recipe, "slide-distance", 24),
+ loop: choice(recipe, "loop", ["none", "shake", "wobble", "glow-pulse"] as const, "none"),
+ loopTarget: choice(recipe, "loop-target", ["cue", "active-atom"] as const, "cue"),
+ loopPeriodFrames: integer(recipe, "loop-period-frames", 12),
+ loopIntensity: number(recipe, "loop-intensity", 1),
},
};
assertFineCaptionParameters(parameters);
@@ -202,12 +289,21 @@ export function assertFineCaptionParameters(value: FineCaptionParameters): void
const nonNegative = [
value.placement.x, value.placement.y, value.placement.width, value.typography.fontSizePx,
value.typography.fontWeight, value.layout.lineHeight, value.layout.wordGapPx, value.cueBox.paddingXPx,
- value.cueBox.paddingYPx, value.cueBox.radiusPx, value.cueBox.borderWidthPx, value.motion.cueTransitionFrames,
+ value.cueBox.paddingYPx, value.cueBox.radiusPx, value.cueBox.borderWidthPx,
+ value.underline.thicknessPx, value.underline.offsetPx, value.activeUnderline.thicknessPx,
+ value.activeUnderline.offsetPx, value.activeBox.borderWidthPx, value.activeBox.paddingXPx,
+ value.activeBox.paddingYPx, value.activeBox.radiusPx, value.activeBox.transitionFrames,
+ value.motion.cueEnterFrames, value.motion.cueExitFrames, value.motion.atomEnterFrames, value.motion.activeResponseFrames,
+ value.motion.slideDistancePx, value.motion.loopPeriodFrames, value.motion.loopIntensity,
];
if (nonNegative.some((item) => !Number.isFinite(item) || item < 0)
|| value.placement.x > 1 || value.placement.y > 1 || value.placement.width <= 0 || value.placement.width > 1
|| value.typography.fontSizePx <= 0 || value.layout.lineHeight <= 0
- || !Number.isSafeInteger(value.motion.cueTransitionFrames) || value.motion.activeScale <= 0
+ || !Number.isSafeInteger(value.motion.cueEnterFrames) || !Number.isSafeInteger(value.motion.cueExitFrames)
+ || !Number.isSafeInteger(value.motion.atomEnterFrames) || !Number.isSafeInteger(value.motion.loopPeriodFrames)
+ || !Number.isSafeInteger(value.motion.activeResponseFrames)
+ || !Number.isSafeInteger(value.activeBox.transitionFrames) || value.motion.loopPeriodFrames <= 0
+ || value.motion.activeScale <= 0
|| !Number.isFinite(value.motion.activeScale) || !Number.isFinite(value.layout.letterSpacingPx)) {
throw new Error("Fine Caption parameters contain invalid numeric bounds");
}
@@ -229,6 +325,10 @@ export function assertFineCaptionParameters(value: FineCaptionParameters): void
}
assertColor(value.cueBox.background, "Fine Caption background");
assertColor(value.cueBox.borderColor, "Fine Caption border color");
+ assertColor(value.underline.color, "Fine Caption underline color");
+ assertColor(value.activeUnderline.color, "Fine Caption active underline color");
+ assertColor(value.activeBox.background, "Fine Caption active box background");
+ assertColor(value.activeBox.borderColor, "Fine Caption active box border color");
assertPaint(value.basePaint, "Fine Caption base Paint");
assertPaint(value.activePaint, "Fine Caption active Paint");
}
diff --git a/packages/caption-fine/src/surface.ts b/packages/caption-fine/src/surface.ts
index e04c3d43..d95ebc6e 100644
--- a/packages/caption-fine/src/surface.ts
+++ b/packages/caption-fine/src/surface.ts
@@ -1,6 +1,6 @@
import { captionTypes } from "@narratage/caption";
-import { assertFontArtifactRef, mediaTypes } from "@narratage/media";
-import type { FontArtifactRef } from "@narratage/media";
+import { assertFontArtifactRef, assertFontStackRef, mediaTypes } from "@narratage/media";
+import type { FontArtifactRef, FontStackRef } from "@narratage/media";
import { narrativeTypes } from "@narratage/narrative";
import { programSpaceTypes } from "@narratage/program-space";
import { semanticMapTypes } from "@narratage/semantic-map";
@@ -68,10 +68,20 @@ function exactFonts(
const result: FontArtifactRef[] = [];
const primary = element.attributes.font;
if (primary !== undefined) {
- result.push(inline<FontArtifactRef>(
- reference(element, "font", mediaTypes.fontArtifact, resolveReference),
- `${element.name}.font`,
- ));
+ if (typeof primary !== "object" || primary.kind !== "reference") {
+ throw new Error(`${element.name}.font must be a whole-value reference`);
+ }
+ const resolved = resolveReference(primary.path);
+ if (resolved === undefined) throw new Error(`${element.name}.font cannot resolve ${primary.path}`);
+ if (sameType(resolved.type, mediaTypes.fontArtifact)) {
+ result.push(inline<FontArtifactRef>(resolved, `${element.name}.font`));
+ } else if (sameType(resolved.type, mediaTypes.fontStack)) {
+ const stack = inline<FontStackRef>(resolved, `${element.name}.font`);
+ assertFontStackRef(stack, `${element.name}.font`);
+ result.push(...stack.faces);
+ } else {
+ throw new Error(`${element.name}.font has the wrong type`);
+ }
}
for (const child of element.children) {
if (child.kind === "text") {
diff --git a/packages/caption-fine/src/types.ts b/packages/caption-fine/src/types.ts
index 6cf17a87..0a161598 100644
--- a/packages/caption-fine/src/types.ts
+++ b/packages/caption-fine/src/types.ts
@@ -2,6 +2,11 @@ import type { FontArtifactRef } from "@narratage/media";
export type FineCaptionGlyphPaint = {
readonly fill: string;
+ readonly gradient?: {
+ readonly from: string;
+ readonly to: string;
+ readonly angleDeg: number;
+ };
readonly opacity: number;
readonly stroke: {
readonly color: string;
@@ -14,6 +19,12 @@ export type FineCaptionGlyphPaint = {
readonly offsetYPx: number;
readonly blurPx: number;
};
+ readonly longShadow: {
+ readonly color: string;
+ readonly opacity: number;
+ readonly distancePx: number;
+ readonly angleDeg: number;
+ };
readonly glow: {
readonly color: string;
readonly opacity: number;
@@ -21,6 +32,42 @@ export type FineCaptionGlyphPaint = {
};
};
+export type FineCaptionUnderline = {
+ readonly mode: "off" | "always";
+ readonly color: string;
+ readonly thicknessPx: number;
+ readonly offsetPx: number;
+};
+
+export type FineCaptionActiveUnderline = Omit<FineCaptionUnderline, "mode"> & {
+ readonly mode: "off" | "current" | "trail";
+};
+
+export type FineCaptionBoxPaint = {
+ readonly mode: "off" | "current" | "trail";
+ readonly continuity: "isolated" | "joined";
+ readonly background: string;
+ readonly borderColor: string;
+ readonly borderWidthPx: number;
+ readonly paddingXPx: number;
+ readonly paddingYPx: number;
+ readonly radiusPx: number;
+ readonly enter: "none" | "fade" | "pop";
+ readonly exit: "none" | "fade" | "pop";
+ readonly transitionFrames: number;
+};
+
+export type FineCaptionOneShotMotion =
+ | "none"
+ | "fade"
+ | "pop"
+ | "spring"
+ | "slide-left"
+ | "slide-right"
+ | "slide-up"
+ | "slide-down"
+ | "blur-in";
+
export type FineCaptionParameters = {
readonly contract: "svml.caption-fine-parameters@1";
readonly stackingOrder: number;
@@ -43,10 +90,13 @@ export type FineCaptionParameters = {
readonly fontSizePx: number;
readonly fontWeight: number;
readonly fontStyle: "normal" | "italic" | "oblique";
+ readonly textTransform: "none" | "uppercase" | "lowercase";
readonly exactFonts?: readonly FontArtifactRef[];
};
readonly basePaint: FineCaptionGlyphPaint;
readonly activePaint: FineCaptionGlyphPaint;
+ readonly underline: FineCaptionUnderline;
+ readonly activeUnderline: FineCaptionActiveUnderline;
readonly cueBox: {
readonly background: string;
readonly borderColor: string;
@@ -59,11 +109,22 @@ export type FineCaptionParameters = {
readonly mode: "off" | "current" | "trail";
readonly transition: "step" | "wipe";
};
+ readonly activeBox: FineCaptionBoxPaint;
readonly motion: {
- readonly cueEnter: "none" | "fade";
- readonly cueExit: "none" | "fade";
- readonly cueTransitionFrames: number;
- readonly atomReveal: "all" | "on-start";
+ readonly cueEnter: FineCaptionOneShotMotion;
+ readonly cueExit: FineCaptionOneShotMotion;
+ readonly cueEnterFrames: number;
+ readonly cueExitFrames: number;
+ readonly atomEnter: FineCaptionOneShotMotion;
+ readonly atomEnterFrames: number;
+ readonly atomReveal: "all" | "on-start" | "typewriter";
+ readonly activeResponse: "none" | "scale" | "pop" | "spring";
+ readonly activeResponseFrames: number;
readonly activeScale: number;
+ readonly slideDistancePx: number;
+ readonly loop: "none" | "shake" | "wobble" | "glow-pulse";
+ readonly loopTarget: "cue" | "active-atom";
+ readonly loopPeriodFrames: number;
+ readonly loopIntensity: number;
};
};
diff --git a/packages/caption-fine/test/caption-fine.test.ts b/packages/caption-fine/test/caption-fine.test.ts
index db172181..c5d33965 100644
--- a/packages/caption-fine/test/caption-fine.test.ts
+++ b/packages/caption-fine/test/caption-fine.test.ts
@@ -88,7 +88,11 @@ test("Fine resolves the complete orthogonal Paint, anchor, karaoke and motion su
"letter-spacing": -1.5,
"word-gap": 11,
"font-style": "italic",
+ "text-transform": "uppercase",
opacity: 0.9,
+ "gradient-from": "#FFFFFF",
+ "gradient-to": "#55CCFF",
+ "gradient-angle": 120,
"stroke-color": "#101010",
"stroke-width": 3,
"shadow-color": "#000000",
@@ -99,11 +103,22 @@ test("Fine resolves the complete orthogonal Paint, anchor, karaoke and motion su
"glow-color": "#5CE1E6",
"glow-opacity": 0.6,
"glow-blur": 12,
+ "long-shadow-color": "#111827",
+ "long-shadow-opacity": 0.45,
+ "long-shadow-distance": 14,
+ "long-shadow-angle": 35,
+ underline: "always",
+ "underline-color": "#A7F3D0",
+ "underline-thickness": 3,
+ "underline-offset": 6,
"border-color": "#FFFFFF80",
"border-width": 2,
karaoke: "trail",
"karaoke-transition": "wipe",
"active-fill": "#FFDD00",
+ "active-gradient-from": "#FFF176",
+ "active-gradient-to": "#FF6F00",
+ "active-gradient-angle": 90,
"active-opacity": 0.95,
"active-stroke-color": "#401000",
"active-stroke-width": 1,
@@ -115,11 +130,39 @@ test("Fine resolves the complete orthogonal Paint, anchor, karaoke and motion su
"active-glow-color": "#FFFFFF",
"active-glow-opacity": 0.7,
"active-glow-blur": 10,
- "cue-enter": "fade",
- "cue-exit": "fade",
- "cue-transition-frames": 6,
- "atom-reveal": "on-start",
- "active-scale": 1.08,
+ "active-long-shadow-color": "#7C2D12",
+ "active-long-shadow-opacity": 0.5,
+ "active-long-shadow-distance": 8,
+ "active-long-shadow-angle": 45,
+ "active-underline": "current",
+ "active-underline-color": "#FFFFFF",
+ "active-underline-thickness": 4,
+ "active-underline-offset": 7,
+ "active-box": "trail",
+ "active-box-continuity": "joined",
+ "active-box-background": "#FACC15CC",
+ "active-box-border-color": "#FFFFFF80",
+ "active-box-border-width": 2,
+ "active-box-padding": "5 9",
+ "active-box-radius": 10,
+ "active-box-enter": "pop",
+ "active-box-exit": "fade",
+ "active-box-transition-frames": 4,
+ "cue-enter": "spring",
+ "cue-exit": "blur-in",
+ "cue-enter-frames": 6,
+ "cue-exit-frames": 6,
+ "atom-enter": "slide-up",
+ "atom-enter-frames": 5,
+ "atom-reveal": "typewriter",
+ "active-response": "spring",
+ "active-response-frames": 7,
+ "active-scale": 1.12,
+ "slide-distance": 20,
+ loop: "wobble",
+ "loop-target": "active-atom",
+ "loop-period-frames": 14,
+ "loop-intensity": 0.8,
},
});
@@ -128,13 +171,27 @@ test("Fine resolves the complete orthogonal Paint, anchor, karaoke and motion su
});
assert.equal(parameters.layout.direction, "rtl");
assert.equal(parameters.typography.fontStyle, "italic");
+ assert.equal(parameters.typography.textTransform, "uppercase");
+ assert.deepEqual(parameters.basePaint.gradient, { from: "#FFFFFF", to: "#55CCFF", angleDeg: 120 });
assert.equal(parameters.basePaint.stroke.widthPx, 3);
assert.equal(parameters.basePaint.glow.blurPx, 12);
+ assert.equal(parameters.basePaint.longShadow.distancePx, 14);
assert.equal(parameters.activePaint.fill, "#FFDD00");
assert.equal(parameters.activePaint.shadow.offsetYPx, 2);
+ assert.equal(parameters.underline.mode, "always");
+ assert.equal(parameters.activeUnderline.mode, "current");
+ assert.equal(parameters.activeBox.continuity, "joined");
+ assert.deepEqual(parameters.activeBox, {
+ mode: "trail", continuity: "joined", background: "#FACC15CC", borderColor: "#FFFFFF80",
+ borderWidthPx: 2, paddingXPx: 9, paddingYPx: 5, radiusPx: 10,
+ enter: "pop", exit: "fade", transitionFrames: 4,
+ });
assert.deepEqual(parameters.karaoke, { mode: "trail", transition: "wipe" });
assert.deepEqual(parameters.motion, {
- cueEnter: "fade", cueExit: "fade", cueTransitionFrames: 6, atomReveal: "on-start", activeScale: 1.08,
+ cueEnter: "spring", cueExit: "blur-in", cueEnterFrames: 6, cueExitFrames: 6,
+ atomEnter: "slide-up", atomEnterFrames: 5, atomReveal: "typewriter",
+ activeResponse: "spring", activeResponseFrames: 7, activeScale: 1.12, slideDistancePx: 20,
+ loop: "wobble", loopTarget: "active-atom", loopPeriodFrames: 14, loopIntensity: 0.8,
});
});
@@ -152,7 +209,8 @@ test("karaoke uses one active overlay per whole Atom and never invents Dual Text
"active-scale": 1.04,
"cue-enter": "fade",
"cue-exit": "fade",
- "cue-transition-frames": 4,
+ "cue-enter-frames": 4,
+ "cue-exit-frames": 4,
},
});
const program = resolveCaptionProgram(display, "karaoke-captions", style, []);
@@ -197,6 +255,10 @@ test("Fine rejects unknown or obsolete Recipe dimensions instead of silently acc
...recipe,
properties: { ...recipe.properties, important: true },
}), /unknown property important/u);
+ assert.throws(() => fineCaptionStyle("half-gradient", {
+ ...recipe,
+ properties: { ...recipe.properties, "gradient-from": "#FFFFFF" },
+ }), /requires both from and to/u);
});
test("an exact Font is explicit Style input and reaches every base and active glyph", () => {
@@ -292,3 +354,143 @@ test("current/trail by step/wipe have four distinct frame-exact Atom histories",
assert.equal(at(trailWipe, 10, "clip-path"), "inset(0 0% 0 0)");
assert.equal(at(trailWipe, 20, "clip-path"), "inset(0 0% 0 0)");
});
+
+test("full Fine Paint and layered motion lower to terminal Visual IR without changing Caption truth", () => {
+ const narrative = parseScript("full.svml", "<line>Every authored atom stays intact.</line>");
+ const display = captionDisplaySequence(narrative, "full.caption");
+ const style = fineCaptionStyle("full", {
+ ...recipe,
+ properties: {
+ ...recipe.properties,
+ "text-transform": "uppercase",
+ "gradient-from": "#FFFFFF", "gradient-to": "#60A5FA", "gradient-angle": 120,
+ "long-shadow-color": "#172554", "long-shadow-opacity": 0.55,
+ "long-shadow-distance": 8, "long-shadow-angle": 45,
+ underline: "always", "underline-color": "#A7F3D0", "underline-thickness": 2, "underline-offset": 5,
+ karaoke: "trail", "karaoke-transition": "wipe",
+ "active-gradient-from": "#FDE047", "active-gradient-to": "#F97316", "active-gradient-angle": 90,
+ "active-underline": "current", "active-underline-color": "#FFFFFF",
+ "active-box": "trail", "active-box-continuity": "joined", "active-box-background": "#F59E0BCC",
+ "active-box-padding": "4 7", "active-box-radius": 8,
+ "cue-enter": "spring", "cue-enter-frames": 5, "cue-exit": "blur-in", "cue-exit-frames": 5,
+ "atom-enter": "slide-up", "atom-enter-frames": 4, "atom-reveal": "typewriter",
+ "active-response": "pop", "active-response-frames": 4, "active-scale": 1.12,
+ loop: "wobble", "loop-target": "active-atom", "loop-period-frames": 8, "loop-intensity": 1,
+ },
+ });
+ const program = resolveCaptionProgram(display, "full-program", style, []);
+ const projection: TimedCaptionProjection = {
+ contract: "svml.timed-caption-projection@1",
+ displaySequenceId: display.id,
+ cues: [{
+ id: "cue:full", runId: program.runs[0]!.id, styleId: style.id, segmentId: "line",
+ startSec: 0, endSec: 4,
+ atoms: display.atoms.map((atom, index) => ({ atomId: atom.id, startSec: index, endSec: index + 1 })),
+ fields: [],
+ }],
+ };
+ const space = sealProgramSpace({
+ contract: "svml.program-space@1", durationSec: 4, frameRate: { numerator: 10, denominator: 1 },
+ });
+ const elements = renderFineCaption(projection, program, display, space).presents[0]!.elements;
+ const base = elements.find((element) => element.id === "atom-1-base-1");
+ assert.equal(base?.kind, "text");
+ assert.ok(base?.style.some(({ name }) => name === "background-image"));
+ assert.ok(base?.style.some(({ name, value }) => name === "text-transform" && value === "uppercase"));
+ assert.ok(base?.style.some(({ name }) => name === "text-decoration-thickness"));
+ assert.ok(base?.style.some(({ name, value }) => name === "text-shadow" && String(value).split(",").length >= 8));
+ const activeGlyph = elements.find((element) => element.id === "atom-1-active-1");
+ assert.equal(activeGlyph?.kind, "text");
+ assert.ok(activeGlyph?.style.some(({ name }) => name === "background-image"));
+ const joined = elements.filter((element) => element.attributes?.some((attribute) =>
+ attribute.name === "data-caption-active-box" && attribute.value === "joined"));
+ assert.equal(joined.length, display.atoms.length);
+ const joinedText = elements.find((element) => element.id === `joined-box-${display.atoms.length}-text`);
+ assert.equal(joinedText?.kind, "text");
+ assert.ok(joinedText?.style.some(({ name, value }) => name === "box-decoration-break" && value === "clone"));
+ assert.ok(elements.find((element) => element.id === "cue-motion")?.animation);
+ assert.ok(elements.find((element) => element.id === "atom-1-typewriter")?.animation?.keyframes.some((keyframe) =>
+ keyframe.style.some(({ name }) => name === "clip-path")));
+ assert.ok(elements.find((element) => element.id === "atom-1-loop")?.animation);
+ assert.ok(elements.find((element) => element.id === "atom-1-response")?.animation);
+ assert.equal(elements.filter((element) => element.attributes?.some((attribute) =>
+ attribute.name === "data-caption-active-underline")).length, display.atoms.length);
+});
+
+test("glyph, underline and Pill activation are independent channels", () => {
+ const narrative = parseScript("channels.svml", "<line>Read this now.</line>");
+ const display = captionDisplaySequence(narrative, "channels.caption");
+ const style = fineCaptionStyle("channels", {
+ ...recipe,
+ properties: {
+ ...recipe.properties,
+ karaoke: "trail",
+ "active-underline": "trail",
+ "active-box": "current",
+ "active-box-continuity": "joined",
+ "active-box-background": "#FFD54ACC",
+ "active-box-padding": "3 6",
+ },
+ });
+ const program = resolveCaptionProgram(display, "channels-program", style, []);
+ const projection: TimedCaptionProjection = {
+ contract: "svml.timed-caption-projection@1", displaySequenceId: display.id,
+ cues: [{
+ id: "cue:channels", runId: program.runs[0]!.id, styleId: style.id, segmentId: "line",
+ startSec: 0, endSec: 3,
+ atoms: display.atoms.map((atom, index) => ({ atomId: atom.id, startSec: index, endSec: index + 1 })),
+ fields: [],
+ }],
+ };
+ const space = sealProgramSpace({
+ contract: "svml.program-space@1", durationSec: 3, frameRate: { numerator: 10, denominator: 1 },
+ });
+ const elements = renderFineCaption(projection, program, display, space).presents[0]!.elements;
+ assert.equal(elements.filter((element) => element.attributes?.some((attribute) =>
+ attribute.name === "data-caption-karaoke" && attribute.value === "trail")).length, display.atoms.length);
+ assert.equal(elements.filter((element) => element.attributes?.some((attribute) =>
+ attribute.name === "data-caption-active-underline" && attribute.value === "trail")).length, display.atoms.length);
+ const boxes = elements.filter((element) => element.attributes?.some((attribute) =>
+ attribute.name === "data-caption-active-box"));
+ assert.equal(boxes.length, display.atoms.length);
+ assert.equal(boxes.every((element) => element.attributes?.some((attribute) => attribute.value === "isolated")), true);
+});
+
+test("every declared one-shot and loop motion lowers through the same wrapper vocabulary", () => {
+ const narrative = parseScript("motions.svml", "<line>Motion stays local.</line>");
+ const display = captionDisplaySequence(narrative, "motions.caption");
+ const space = sealProgramSpace({
+ contract: "svml.program-space@1", durationSec: 3, frameRate: { numerator: 10, denominator: 1 },
+ });
+ const render = (id: string, properties: Readonly<Record<string, string | number>>) => {
+ const style = fineCaptionStyle(id, { ...recipe, properties: { ...recipe.properties, ...properties } });
+ const program = resolveCaptionProgram(display, `${id}-program`, style, []);
+ const projection: TimedCaptionProjection = {
+ contract: "svml.timed-caption-projection@1", displaySequenceId: display.id,
+ cues: [{
+ id: `cue:${id}`, runId: program.runs[0]!.id, styleId: style.id, segmentId: "line",
+ startSec: 0, endSec: 3,
+ atoms: display.atoms.map((atom, index) => ({ atomId: atom.id, startSec: index, endSec: index + 1 })),
+ fields: [],
+ }],
+ };
+ return renderFineCaption(projection, program, display, space).presents[0]!.elements;
+ };
+ for (const kind of [
+ "fade", "pop", "spring", "slide-left", "slide-right", "slide-up", "slide-down", "blur-in",
+ ] as const) {
+ const elements = render(`enter-${kind}`, { "cue-enter": kind, "cue-enter-frames": 6 });
+ assert.ok(elements.find((element) => element.id === "cue-motion")?.animation, `${kind} emitted no Cue animation`);
+ }
+ for (const kind of ["shake", "wobble", "glow-pulse"] as const) {
+ const elements = render(`loop-${kind}`, { loop: kind, "loop-target": "cue", "loop-period-frames": 8 });
+ assert.ok(elements.find((element) => element.id === "cue-loop")?.animation, `${kind} emitted no loop animation`);
+ }
+ for (const kind of ["scale", "pop", "spring"] as const) {
+ const elements = render(`response-${kind}`, {
+ "active-response": kind, "active-response-frames": 5, "active-scale": 1.12,
+ });
+ assert.ok(elements.find((element) => element.id === "atom-1-response")?.animation,
+ `${kind} emitted no active response`);
+ }
+});
diff --git a/packages/fonts-open/README.md b/packages/fonts-open/README.md
index d4760762..69d7d7e7 100644
--- a/packages/fonts-open/README.md
+++ b/packages/fonts-open/README.md
@@ -1,38 +1,77 @@
# `@narratage/fonts-open`
-Local workspace package exposing a curated OFL-1.1 font catalog as exact `FontArtifactRef` values.
-The Fontsource `5.3.0` dependencies carry the actual bytes and license files. Installation may use
-the package registry; author compilation and rendering never download fonts or inspect system font
-directories.
+Private pre-release workspace package exposing 109 redistributable open font families as exact,
+content-addressed `FontArtifactRef` values. The installed packages carry their font bytes and license
+files. Author compilation and rendering never download fonts or inspect system font directories.
-This is currently a private workspace package, not an npm release. A developer who pulls this
-repository gets it with the ordinary `pnpm install`, then includes `@narratage/fonts-open` in the
-project's explicit `lock-packages` selection. There is no global font installation step.
+A developer who pulls this repository gets the catalog with the ordinary `pnpm install`, then
+includes `@narratage/fonts-open` in the project's explicit `lock-packages` selection. Nothing is
+installed globally and this package has not been published to npm.
+
+## One exact face
```svml
<import as="fonts" from="@narratage/fonts-open@1"/>
-<fonts:Face id="latin" family="inter" weight="700" style="normal"/>
-<fonts:Face id="cjk" family="noto-sans-sc" weight="700" style="normal"/>
-<fonts:Face id="emoji" family="noto-emoji" weight="700" style="normal"/>
+<fonts:Face id="headline" family="archivo-black" weight="400" style="normal"/>
+```
+
+`family` is a finite catalog identifier. Weight and style must exist in that family; the package
+never snaps to a nearby weight and never silently substitutes an italic face.
+
+## A convenient multilingual and Emoji stack
+
+Emoji is normally a fallback of the chosen text face, not a separate style. `Stack` packages that
+intent into one reusable Author Graph value:
+
+```svml
+<fonts:Stack id="caption-fonts"
+ family="inter" weight="700" style="normal" emoji="color">
+ <fonts:Fallback family="noto-sans-sc" weight="700" style="normal"/>
+</fonts:Stack>
+
+<caption-fine:Style id="caption" recipe={studio.caption.primary}
+ font={caption-fonts}/>
```
-Available families:
-
-| Family | Weight | Style | Intended use |
-|---|---:|---|---|
-| `inter` | 100–900 | normal, italic | neutral UI and dialogue |
-| `montserrat` | 100–900 | normal, italic | geometric social captions |
-| `dm-sans` | 100–1000 | normal, italic | friendly product video |
-| `manrope` | 200–800 | normal | compact modern captions |
-| `poppins` | 100–900 | normal, italic | rounded geometric display |
-| `bebas-neue` | 400 | normal | condensed headline |
-| `playfair-display` | 400–900 | normal, italic | editorial display |
-| `source-serif-4` | 200–900 | normal, italic | readable serif |
-| `noto-sans-sc` | 100–900 | normal | Simplified Chinese sans |
-| `noto-serif-sc` | 200–900 | normal | Simplified Chinese serif |
-| `noto-emoji` | 300–700 | normal | monochrome emoji/symbol fallback |
-
-CJK and emoji faces consist of several Unicode-range WOFF2 sources but remain one logical face.
-Only faces referenced by the Author Graph enter that Build's transfer bundle and ArtifactStore.
-This package is private and unpublished while the repository remains pre-release.
+The resulting order is Inter, Noto Sans SC, then Noto Color Emoji. `emoji="color"` selects the
+pinned COLRv1 face verified in HyperFrames' Chromium renderer; `emoji="mono"` selects the
+weight-400 monochrome Noto Emoji face. Emoji stays explicit—omitting `emoji` adds no bytes. Extra
+`Fallback` children can select Arabic, Hebrew, Devanagari, Thai, Japanese, Korean or any other
+catalog family with their own honest weight/style.
+
+The package does not rewrite author text to force presentation. For characters that have both text
+and Emoji forms, write the real Unicode Emoji sequence (normally the character followed by VS16,
+for example `☎️`) when color presentation is intended. Ordinary pictographic Emoji such as `🌐`
+already have Emoji presentation. This preserves the author's exact display text while avoiding
+platform-font guesses.
+
+`Stack` is only authoring convenience. Its output is the generic `FontStackRef` media contract, so
+other packages may produce or consume the same ordered exact-face value. Caption Fine does not know
+about Fontsource, Noto or COLRv1.
+
+## Catalog
+
+The exported `openFontFamilies` map includes `label`, `category`, `intendedUse`, exact availability
+and license metadata; `openFontFamiliesByCategory` is suitable for a frontend picker.
+
+| Category | Count | Families |
+|---|---:|---|
+| Handwriting | 11 | `architects-daughter`, `caveat`, `coming-soon`, `handlee`, `kalam`, `patrick-hand`, `permanent-marker`, `playpen-sans`, `shadows-into-light`, `shantell-sans`, `short-stack` |
+| Script | 3 | `pacifico`, `pinyon-script`, `satisfy` |
+| Display | 16 | `abril-fatface`, `alfa-slab-one`, `anton`, `archivo-black`, `bangers`, `bebas-neue`, `black-ops-one`, `bungee`, `dm-serif-display`, `fredoka`, `league-spartan`, `lilita-one`, `luckiest-guy`, `oswald`, `righteous`, `unbounded` |
+| Sans | 35 | `archivo`, `barlow`, `barlow-condensed`, `cabin`, `dm-sans`, `figtree`, `fira-sans-condensed`, `geist`, `instrument-sans`, `inter`, `josefin-sans`, `jost`, `kanit`, `lato`, `lexend`, `manrope`, `montserrat`, `mulish`, `noto-sans`, `nunito-sans`, `onest`, `open-sans`, `outfit`, `plus-jakarta-sans`, `poppins`, `quicksand`, `raleway`, `rethink-sans`, `roboto`, `roboto-condensed`, `rubik`, `sora`, `space-grotesk`, `urbanist`, `work-sans` |
+| Serif | 16 | `bodoni-moda`, `cinzel`, `cormorant-garamond`, `crimson-pro`, `eb-garamond`, `fraunces`, `gloock`, `instrument-serif`, `libre-baskerville`, `lora`, `merriweather`, `newsreader`, `playfair-display`, `roboto-slab`, `source-serif-4`, `vollkorn` |
+| Monospace | 6 | `fira-code`, `geist-mono`, `ibm-plex-mono`, `jetbrains-mono`, `roboto-mono`, `space-mono` |
+| CJK | 15 | `liu-jian-mao-cao`, `long-cang`, `ma-shan-zheng`, `noto-sans-hk`, `noto-sans-jp`, `noto-sans-kr`, `noto-sans-sc`, `noto-sans-tc`, `noto-serif-jp`, `noto-serif-kr`, `noto-serif-sc`, `noto-serif-tc`, `zcool-kuaile`, `zcool-qingke-huangyou`, `zcool-xiaowei` |
+| World scripts | 5 | `noto-naskh-arabic`, `noto-sans-arabic`, `noto-sans-devanagari`, `noto-sans-hebrew`, `noto-sans-thai` |
+| Emoji | 2 | `noto-color-emoji`, `noto-emoji` |
+
+Latin variable faces intentionally load the compact Latin subset. CJK, world-script and Emoji
+families preserve every Unicode-range shard from their installed CSS as one logical face. Only
+faces referenced by the Author Graph enter a Build transfer bundle and ArtifactStore.
+
+Every catalog entry is either SIL OFL 1.1 or Apache 2.0. Tests compare the declared license against
+the installed package's own metadata. The four private/local Twinit fonts were intentionally not
+migrated: public redistribution requires an independently verified license, and brand fonts remain
+explicit `<media:Font>` author assets.
diff --git a/packages/fonts-open/package.json b/packages/fonts-open/package.json
index 1cf38045..f616b893 100644
--- a/packages/fonts-open/package.json
+++ b/packages/fonts-open/package.json
@@ -10,17 +10,115 @@
"activation": "./src/activation.ts"
},
"dependencies": {
+ "@fontsource-variable/archivo": "5.3.0",
+ "@fontsource-variable/bodoni-moda": "5.3.0",
+ "@fontsource-variable/cabin": "5.3.0",
+ "@fontsource-variable/caveat": "5.3.0",
+ "@fontsource-variable/cinzel": "5.3.0",
+ "@fontsource-variable/cormorant-garamond": "5.3.0",
+ "@fontsource-variable/crimson-pro": "5.3.0",
"@fontsource-variable/dm-sans": "5.3.0",
+ "@fontsource-variable/eb-garamond": "5.3.0",
+ "@fontsource-variable/figtree": "5.3.0",
+ "@fontsource-variable/fira-code": "5.3.0",
+ "@fontsource-variable/fraunces": "5.3.0",
+ "@fontsource-variable/fredoka": "5.3.0",
+ "@fontsource-variable/geist": "5.3.0",
+ "@fontsource-variable/geist-mono": "5.3.0",
+ "@fontsource-variable/instrument-sans": "5.3.0",
"@fontsource-variable/inter": "5.3.0",
+ "@fontsource-variable/jetbrains-mono": "5.3.0",
+ "@fontsource-variable/josefin-sans": "5.3.0",
+ "@fontsource-variable/jost": "5.3.0",
+ "@fontsource-variable/league-spartan": "5.3.0",
+ "@fontsource-variable/lexend": "5.3.0",
+ "@fontsource-variable/libre-baskerville": "5.3.0",
+ "@fontsource-variable/lora": "5.3.0",
"@fontsource-variable/manrope": "5.3.0",
+ "@fontsource-variable/merriweather": "5.3.0",
"@fontsource-variable/montserrat": "5.3.0",
+ "@fontsource-variable/mulish": "5.3.0",
+ "@fontsource-variable/newsreader": "5.3.0",
"@fontsource-variable/noto-emoji": "5.3.0",
+ "@fontsource-variable/noto-naskh-arabic": "5.3.0",
+ "@fontsource-variable/noto-sans": "5.3.0",
+ "@fontsource-variable/noto-sans-arabic": "5.3.0",
+ "@fontsource-variable/noto-sans-devanagari": "5.3.0",
+ "@fontsource-variable/noto-sans-hebrew": "5.3.0",
+ "@fontsource-variable/noto-sans-hk": "5.3.0",
+ "@fontsource-variable/noto-sans-jp": "5.3.0",
+ "@fontsource-variable/noto-sans-kr": "5.3.0",
"@fontsource-variable/noto-sans-sc": "5.3.0",
+ "@fontsource-variable/noto-sans-tc": "5.3.0",
+ "@fontsource-variable/noto-sans-thai": "5.3.0",
+ "@fontsource-variable/noto-serif-jp": "5.3.0",
+ "@fontsource-variable/noto-serif-kr": "5.3.0",
"@fontsource-variable/noto-serif-sc": "5.3.0",
+ "@fontsource-variable/noto-serif-tc": "5.3.0",
+ "@fontsource-variable/nunito-sans": "5.3.0",
+ "@fontsource-variable/onest": "5.3.0",
+ "@fontsource-variable/open-sans": "5.3.0",
+ "@fontsource-variable/oswald": "5.3.0",
+ "@fontsource-variable/outfit": "5.3.0",
"@fontsource-variable/playfair-display": "5.3.0",
+ "@fontsource-variable/playpen-sans": "5.3.0",
+ "@fontsource-variable/plus-jakarta-sans": "5.3.0",
+ "@fontsource-variable/quicksand": "5.3.0",
+ "@fontsource-variable/raleway": "5.3.0",
+ "@fontsource-variable/rethink-sans": "5.3.0",
+ "@fontsource-variable/roboto": "5.3.0",
+ "@fontsource-variable/roboto-condensed": "5.3.0",
+ "@fontsource-variable/roboto-mono": "5.3.0",
+ "@fontsource-variable/roboto-slab": "5.3.0",
+ "@fontsource-variable/rubik": "5.3.0",
+ "@fontsource-variable/shantell-sans": "5.3.0",
+ "@fontsource-variable/sora": "5.3.0",
"@fontsource-variable/source-serif-4": "5.3.0",
+ "@fontsource-variable/space-grotesk": "5.3.0",
+ "@fontsource-variable/unbounded": "5.3.0",
+ "@fontsource-variable/urbanist": "5.3.0",
+ "@fontsource-variable/vollkorn": "5.3.0",
+ "@fontsource-variable/work-sans": "5.3.0",
+ "@fontsource/abril-fatface": "5.3.0",
+ "@fontsource/alfa-slab-one": "5.3.0",
+ "@fontsource/anton": "5.3.0",
+ "@fontsource/architects-daughter": "5.3.0",
+ "@fontsource/archivo-black": "5.3.0",
+ "@fontsource/bangers": "5.3.0",
+ "@fontsource/barlow": "5.3.0",
+ "@fontsource/barlow-condensed": "5.3.0",
"@fontsource/bebas-neue": "5.3.0",
+ "@fontsource/black-ops-one": "5.3.0",
+ "@fontsource/bungee": "5.3.0",
+ "@fontsource/coming-soon": "5.3.0",
+ "@fontsource/dm-serif-display": "5.3.0",
+ "@fontsource/fira-sans-condensed": "5.3.0",
+ "@fontsource/gloock": "5.3.0",
+ "@fontsource/handlee": "5.3.0",
+ "@fontsource/ibm-plex-mono": "5.3.0",
+ "@fontsource/instrument-serif": "5.3.0",
+ "@fontsource/kalam": "5.3.0",
+ "@fontsource/kanit": "5.3.0",
+ "@fontsource/lato": "5.3.0",
+ "@fontsource/lilita-one": "5.3.0",
+ "@fontsource/liu-jian-mao-cao": "5.3.0",
+ "@fontsource/long-cang": "5.3.0",
+ "@fontsource/luckiest-guy": "5.3.0",
+ "@fontsource/ma-shan-zheng": "5.3.0",
+ "@fontsource/pacifico": "5.3.0",
+ "@fontsource/patrick-hand": "5.3.0",
+ "@fontsource/permanent-marker": "5.3.0",
+ "@fontsource/pinyon-script": "5.3.0",
"@fontsource/poppins": "5.3.0",
+ "@fontsource/righteous": "5.3.0",
+ "@fontsource/satisfy": "5.3.0",
+ "@fontsource/shadows-into-light": "5.3.0",
+ "@fontsource/short-stack": "5.3.0",
+ "@fontsource/space-mono": "5.3.0",
+ "@fontsource/zcool-kuaile": "5.3.0",
+ "@fontsource/zcool-qingke-huangyou": "5.3.0",
+ "@fontsource/zcool-xiaowei": "5.3.0",
+ "@infolektuell/noto-color-emoji": "0.2.0",
"@narratage/media": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/text": "workspace:*"
diff --git a/packages/fonts-open/src/activation.ts b/packages/fonts-open/src/activation.ts
index a3bd990c..1d2a436a 100644
--- a/packages/fonts-open/src/activation.ts
+++ b/packages/fonts-open/src/activation.ts
@@ -2,7 +2,9 @@ import { createTextSurfaceHostFacet } from "@narratage/text";
import {
decodeOpenFontFaceSurface,
+ decodeOpenFontStackSurface,
fontsOpenFaceSurfaceImplementationDigest,
+ fontsOpenStackSurfaceImplementationDigest,
fontsOpenManifest,
fontsOpenModuleRef,
} from "./index.js";
@@ -14,13 +16,22 @@ export const svmlPackage = {
manifest: fontsOpenManifest,
specifiers: ["@narratage/fonts-open", "@narratage/fonts-open@1"],
}],
- hostFacets: [createTextSurfaceHostFacet({
- module: fontsOpenModuleRef,
- surface: "face",
- mode: "structured",
- implementationDigest: fontsOpenFaceSurfaceImplementationDigest,
- handler: decodeOpenFontFaceSurface,
- })],
+ hostFacets: [
+ createTextSurfaceHostFacet({
+ module: fontsOpenModuleRef,
+ surface: "face",
+ mode: "structured",
+ implementationDigest: fontsOpenFaceSurfaceImplementationDigest,
+ handler: decodeOpenFontFaceSurface,
+ }),
+ createTextSurfaceHostFacet({
+ module: fontsOpenModuleRef,
+ surface: "stack",
+ mode: "structured",
+ implementationDigest: fontsOpenStackSurfaceImplementationDigest,
+ handler: decodeOpenFontStackSurface,
+ }),
+ ],
};
export default svmlPackage;
diff --git a/packages/fonts-open/src/catalog.ts b/packages/fonts-open/src/catalog.ts
index a1a846dd..4c35cb3c 100644
--- a/packages/fonts-open/src/catalog.ts
+++ b/packages/fonts-open/src/catalog.ts
@@ -1,6 +1,24 @@
export type OpenFontStyle = "normal" | "italic";
-type VariableSingleFamily = {
+export type OpenFontCategory =
+ | "handwriting"
+ | "script"
+ | "display"
+ | "sans"
+ | "serif"
+ | "monospace"
+ | "cjk"
+ | "world"
+ | "emoji";
+
+type FamilyMetadata = {
+ readonly label: string;
+ readonly category: OpenFontCategory;
+ readonly intendedUse: string;
+ readonly license: "OFL-1.1" | "Apache-2.0";
+};
+
+type VariableSingleFamily = FamilyMetadata & {
readonly kind: "variable-single";
readonly packageName: string;
readonly fileStem: string;
@@ -9,7 +27,7 @@ type VariableSingleFamily = {
readonly styles: readonly OpenFontStyle[];
};
-type VariableSplitFamily = {
+type VariableSplitFamily = FamilyMetadata & {
readonly kind: "variable-split";
readonly packageName: string;
readonly css: string;
@@ -18,7 +36,7 @@ type VariableSplitFamily = {
readonly styles: readonly ["normal"];
};
-type StaticFamily = {
+type StaticFamily = FamilyMetadata & {
readonly kind: "static";
readonly packageName: string;
readonly fileStem: string;
@@ -26,54 +44,263 @@ type StaticFamily = {
readonly styles: readonly OpenFontStyle[];
};
-export type OpenFontFamily = VariableSingleFamily | VariableSplitFamily | StaticFamily;
+type StaticSplitFamily = FamilyMetadata & {
+ readonly kind: "static-split";
+ readonly packageName: string;
+ readonly weights: readonly number[];
+ readonly styles: readonly OpenFontStyle[];
+};
+
+type ExternalSplitFamily = FamilyMetadata & {
+ readonly kind: "external-split";
+ readonly packageName: string;
+ readonly css: string;
+ readonly weights: readonly number[];
+ readonly styles: readonly OpenFontStyle[];
+};
+
+export type OpenFontFamily =
+ | VariableSingleFamily
+ | VariableSplitFamily
+ | StaticFamily
+ | StaticSplitFamily
+ | ExternalSplitFamily;
+
+const variable = (
+ id: string,
+ label: string,
+ category: OpenFontCategory,
+ minimumWeight: number,
+ maximumWeight: number,
+ styles: readonly OpenFontStyle[],
+ intendedUse: string,
+ license: FamilyMetadata["license"] = "OFL-1.1",
+): VariableSingleFamily => ({
+ kind: "variable-single",
+ packageName: `@fontsource-variable/${id}`,
+ fileStem: `${id}-latin-wght`,
+ minimumWeight,
+ maximumWeight,
+ styles,
+ label,
+ category,
+ intendedUse,
+ license,
+});
-/** Curated OFL-1.1 families useful for product, social, editorial and multilingual video. */
+const variableSplit = (
+ id: string,
+ label: string,
+ category: OpenFontCategory,
+ minimumWeight: number,
+ maximumWeight: number,
+ intendedUse: string,
+): VariableSplitFamily => ({
+ kind: "variable-split",
+ packageName: `@fontsource-variable/${id}`,
+ css: "wght.css",
+ minimumWeight,
+ maximumWeight,
+ styles: ["normal"],
+ label,
+ category,
+ intendedUse,
+ license: "OFL-1.1",
+});
+
+const staticFont = (
+ id: string,
+ label: string,
+ category: OpenFontCategory,
+ weights: readonly number[],
+ styles: readonly OpenFontStyle[],
+ intendedUse: string,
+ license: FamilyMetadata["license"] = "OFL-1.1",
+): StaticFamily => ({
+ kind: "static",
+ packageName: `@fontsource/${id}`,
+ fileStem: `${id}-latin`,
+ weights,
+ styles,
+ label,
+ category,
+ intendedUse,
+ license,
+});
+
+const staticSplit = (
+ id: string,
+ label: string,
+ category: OpenFontCategory,
+ weights: readonly number[],
+ styles: readonly OpenFontStyle[],
+ intendedUse: string,
+): StaticSplitFamily => ({
+ kind: "static-split",
+ packageName: `@fontsource/${id}`,
+ weights,
+ styles,
+ label,
+ category,
+ intendedUse,
+ license: "OFL-1.1",
+});
+
+const externalSplit = (
+ packageName: string,
+ css: string,
+ label: string,
+ category: OpenFontCategory,
+ weights: readonly number[],
+ styles: readonly OpenFontStyle[],
+ intendedUse: string,
+): ExternalSplitFamily => ({
+ kind: "external-split",
+ packageName,
+ css,
+ weights,
+ styles,
+ label,
+ category,
+ intendedUse,
+ license: "OFL-1.1",
+});
+
+const normal = ["normal"] as const;
+const romanItalic = ["normal", "italic"] as const;
+
+/**
+ * Reproducible open faces intended for video typography. Latin variable faces load their compact
+ * Latin subset. Script-complete CJK, world-script and emoji faces preserve Fontsource's complete
+ * Unicode-range shards as one logical face.
+ */
export const openFontFamilies = {
- inter: {
- kind: "variable-single", packageName: "@fontsource-variable/inter", fileStem: "inter-latin-wght",
- minimumWeight: 100, maximumWeight: 900, styles: ["normal", "italic"],
- },
- montserrat: {
- kind: "variable-single", packageName: "@fontsource-variable/montserrat", fileStem: "montserrat-latin-wght",
- minimumWeight: 100, maximumWeight: 900, styles: ["normal", "italic"],
- },
- "dm-sans": {
- kind: "variable-single", packageName: "@fontsource-variable/dm-sans", fileStem: "dm-sans-latin-wght",
- minimumWeight: 100, maximumWeight: 1_000, styles: ["normal", "italic"],
- },
- manrope: {
- kind: "variable-single", packageName: "@fontsource-variable/manrope", fileStem: "manrope-latin-wght",
- minimumWeight: 200, maximumWeight: 800, styles: ["normal"],
- },
- "playfair-display": {
- kind: "variable-single", packageName: "@fontsource-variable/playfair-display", fileStem: "playfair-display-latin-wght",
- minimumWeight: 400, maximumWeight: 900, styles: ["normal", "italic"],
- },
- "source-serif-4": {
- kind: "variable-single", packageName: "@fontsource-variable/source-serif-4", fileStem: "source-serif-4-latin-wght",
- minimumWeight: 200, maximumWeight: 900, styles: ["normal", "italic"],
- },
- poppins: {
- kind: "static", packageName: "@fontsource/poppins", fileStem: "poppins-latin",
- weights: [100, 200, 300, 400, 500, 600, 700, 800, 900], styles: ["normal", "italic"],
- },
- "bebas-neue": {
- kind: "static", packageName: "@fontsource/bebas-neue", fileStem: "bebas-neue-latin",
- weights: [400], styles: ["normal"],
- },
- "noto-sans-sc": {
- kind: "variable-split", packageName: "@fontsource-variable/noto-sans-sc", css: "wght.css",
- minimumWeight: 100, maximumWeight: 900, styles: ["normal"],
- },
- "noto-serif-sc": {
- kind: "variable-split", packageName: "@fontsource-variable/noto-serif-sc", css: "wght.css",
- minimumWeight: 200, maximumWeight: 900, styles: ["normal"],
- },
- "noto-emoji": {
- kind: "variable-split", packageName: "@fontsource-variable/noto-emoji", css: "wght.css",
- minimumWeight: 300, maximumWeight: 700, styles: ["normal"],
- },
+ // Handwriting and casual lettering.
+ "architects-daughter": staticFont("architects-daughter", "Architects Daughter", "handwriting", [400], normal, "casual annotations"),
+ caveat: variable("caveat", "Caveat", "handwriting", 400, 700, normal, "warm handwritten captions"),
+ "coming-soon": staticFont("coming-soon", "Coming Soon", "handwriting", [400], normal, "informal notes", "Apache-2.0"),
+ handlee: staticFont("handlee", "Handlee", "handwriting", [400], normal, "light handwritten copy"),
+ kalam: staticFont("kalam", "Kalam", "handwriting", [300, 400, 700], normal, "confident handwritten copy"),
+ "patrick-hand": staticFont("patrick-hand", "Patrick Hand", "handwriting", [400], normal, "friendly handwritten captions"),
+ "permanent-marker": staticFont("permanent-marker", "Permanent Marker", "handwriting", [400], normal, "marker headlines", "Apache-2.0"),
+ "playpen-sans": variable("playpen-sans", "Playpen Sans", "handwriting", 100, 800, normal, "playful product and education video"),
+ "shadows-into-light": staticFont("shadows-into-light", "Shadows Into Light", "handwriting", [400], normal, "airy handwritten notes"),
+ "shantell-sans": variable("shantell-sans", "Shantell Sans", "handwriting", 300, 800, romanItalic, "expressive informal captions"),
+ "short-stack": staticFont("short-stack", "Short Stack", "handwriting", [400], normal, "compact handwritten labels"),
+
+ // Formal and brush scripts.
+ pacifico: staticFont("pacifico", "Pacifico", "script", [400], normal, "friendly brush titles"),
+ "pinyon-script": staticFont("pinyon-script", "Pinyon Script", "script", [400], normal, "formal editorial titles"),
+ satisfy: staticFont("satisfy", "Satisfy", "script", [400], normal, "casual brush titles", "Apache-2.0"),
+
+ // High-impact display faces.
+ "abril-fatface": staticFont("abril-fatface", "Abril Fatface", "display", [400], normal, "editorial headlines"),
+ "alfa-slab-one": staticFont("alfa-slab-one", "Alfa Slab One", "display", [400], normal, "heavy slab headlines"),
+ anton: staticFont("anton", "Anton", "display", [400], normal, "dense vertical-video headlines"),
+ "archivo-black": staticFont("archivo-black", "Archivo Black", "display", [400], normal, "ranking cards and bold labels"),
+ bangers: staticFont("bangers", "Bangers", "display", [400], normal, "comic impact titles"),
+ "bebas-neue": staticFont("bebas-neue", "Bebas Neue", "display", [400], normal, "condensed headlines"),
+ "black-ops-one": staticFont("black-ops-one", "Black Ops One", "display", [400], normal, "stencil and gaming titles"),
+ bungee: staticFont("bungee", "Bungee", "display", [400], normal, "poster-like display copy"),
+ "dm-serif-display": staticFont("dm-serif-display", "DM Serif Display", "display", [400], romanItalic, "high-contrast editorial display"),
+ fredoka: variable("fredoka", "Fredoka", "display", 300, 700, normal, "rounded playful headlines"),
+ "league-spartan": variable("league-spartan", "League Spartan", "display", 100, 900, normal, "geometric all-purpose display"),
+ "lilita-one": staticFont("lilita-one", "Lilita One", "display", [400], normal, "friendly heavy titles"),
+ "luckiest-guy": staticFont("luckiest-guy", "Luckiest Guy", "display", [400], normal, "energetic comic titles", "Apache-2.0"),
+ oswald: variable("oswald", "Oswald", "display", 200, 700, normal, "compact headlines and lower thirds"),
+ righteous: staticFont("righteous", "Righteous", "display", [400], normal, "retro geometric titles"),
+ unbounded: variable("unbounded", "Unbounded", "display", 200, 900, normal, "futuristic brand headlines"),
+
+ // Sans-serif workhorses and contemporary brand faces.
+ archivo: variable("archivo", "Archivo", "sans", 100, 900, romanItalic, "dense information layouts"),
+ barlow: staticFont("barlow", "Barlow", "sans", [100, 200, 300, 400, 500, 600, 700, 800, 900], romanItalic, "neutral product and UI copy"),
+ "barlow-condensed": staticFont("barlow-condensed", "Barlow Condensed", "sans", [100, 200, 300, 400, 500, 600, 700, 800, 900], romanItalic, "narrow social captions"),
+ cabin: variable("cabin", "Cabin", "sans", 400, 700, romanItalic, "humanist dialogue"),
+ "dm-sans": variable("dm-sans", "DM Sans", "sans", 100, 1_000, romanItalic, "friendly product video"),
+ figtree: variable("figtree", "Figtree", "sans", 300, 900, romanItalic, "clean modern captions"),
+ "fira-sans-condensed": staticFont("fira-sans-condensed", "Fira Sans Condensed", "sans", [100, 200, 300, 400, 500, 600, 700, 800, 900], romanItalic, "compact explanatory copy"),
+ geist: variable("geist", "Geist", "sans", 100, 900, romanItalic, "minimal technology branding"),
+ "instrument-sans": variable("instrument-sans", "Instrument Sans", "sans", 400, 700, romanItalic, "refined modern branding"),
+ inter: variable("inter", "Inter", "sans", 100, 900, romanItalic, "neutral UI and dialogue"),
+ jost: variable("jost", "Jost", "sans", 100, 900, romanItalic, "geometric brand copy"),
+ "josefin-sans": variable("josefin-sans", "Josefin Sans", "sans", 100, 700, romanItalic, "fashion and lifestyle titles"),
+ kanit: staticFont("kanit", "Kanit", "sans", [100, 200, 300, 400, 500, 600, 700, 800, 900], romanItalic, "technical condensed captions"),
+ lato: staticFont("lato", "Lato", "sans", [100, 300, 400, 700, 900], romanItalic, "humanist general-purpose copy"),
+ lexend: variable("lexend", "Lexend", "sans", 100, 900, normal, "high-legibility captions"),
+ manrope: variable("manrope", "Manrope", "sans", 200, 800, normal, "compact modern captions"),
+ montserrat: variable("montserrat", "Montserrat", "sans", 100, 900, romanItalic, "geometric social captions"),
+ mulish: variable("mulish", "Mulish", "sans", 200, 900, romanItalic, "soft readable captions"),
+ "noto-sans": variable("noto-sans", "Noto Sans", "sans", 100, 900, romanItalic, "broad Latin, Greek and Cyrillic coverage"),
+ "nunito-sans": variable("nunito-sans", "Nunito Sans", "sans", 200, 900, romanItalic, "rounded friendly dialogue"),
+ onest: variable("onest", "Onest", "sans", 100, 900, normal, "clean product storytelling"),
+ "open-sans": variable("open-sans", "Open Sans", "sans", 300, 800, romanItalic, "highly readable general copy"),
+ outfit: variable("outfit", "Outfit", "sans", 100, 900, normal, "geometric creator captions"),
+ "plus-jakarta-sans": variable("plus-jakarta-sans", "Plus Jakarta Sans", "sans", 200, 800, romanItalic, "polished startup branding"),
+ poppins: staticFont("poppins", "Poppins", "sans", [100, 200, 300, 400, 500, 600, 700, 800, 900], romanItalic, "rounded geometric display"),
+ quicksand: variable("quicksand", "Quicksand", "sans", 300, 700, normal, "soft lifestyle captions"),
+ raleway: variable("raleway", "Raleway", "sans", 100, 900, romanItalic, "elegant brand copy"),
+ "rethink-sans": variable("rethink-sans", "Rethink Sans", "sans", 400, 800, romanItalic, "contemporary brand captions"),
+ roboto: variable("roboto", "Roboto", "sans", 100, 900, romanItalic, "neutral general-purpose video"),
+ "roboto-condensed": variable("roboto-condensed", "Roboto Condensed", "sans", 100, 900, romanItalic, "space-efficient captions"),
+ rubik: variable("rubik", "Rubik", "sans", 300, 900, romanItalic, "friendly rounded interfaces"),
+ sora: variable("sora", "Sora", "sans", 100, 800, normal, "technology and product video"),
+ "space-grotesk": variable("space-grotesk", "Space Grotesk", "sans", 300, 700, normal, "editorial technology branding"),
+ urbanist: variable("urbanist", "Urbanist", "sans", 100, 900, romanItalic, "modern lifestyle video"),
+ "work-sans": variable("work-sans", "Work Sans", "sans", 100, 900, romanItalic, "screen-first explanatory copy"),
+
+ // Serif and editorial faces.
+ "bodoni-moda": variable("bodoni-moda", "Bodoni Moda", "serif", 400, 900, romanItalic, "fashion editorial titles"),
+ cinzel: variable("cinzel", "Cinzel", "serif", 400, 900, normal, "classical display titles"),
+ "cormorant-garamond": variable("cormorant-garamond", "Cormorant Garamond", "serif", 300, 700, romanItalic, "literary editorial copy"),
+ "crimson-pro": variable("crimson-pro", "Crimson Pro", "serif", 200, 900, romanItalic, "readable editorial captions"),
+ "eb-garamond": variable("eb-garamond", "EB Garamond", "serif", 400, 800, romanItalic, "classic editorial copy"),
+ fraunces: variable("fraunces", "Fraunces", "serif", 100, 900, romanItalic, "expressive editorial titles"),
+ gloock: staticFont("gloock", "Gloock", "serif", [400], normal, "dramatic high-contrast titles"),
+ "instrument-serif": staticFont("instrument-serif", "Instrument Serif", "serif", [400], romanItalic, "contemporary editorial titles"),
+ "libre-baskerville": variable("libre-baskerville", "Libre Baskerville", "serif", 400, 700, romanItalic, "traditional readable copy"),
+ lora: variable("lora", "Lora", "serif", 400, 700, romanItalic, "warm narrative captions"),
+ merriweather: variable("merriweather", "Merriweather", "serif", 300, 900, romanItalic, "screen-readable long copy"),
+ newsreader: variable("newsreader", "Newsreader", "serif", 200, 800, romanItalic, "news and documentary editorial"),
+ "playfair-display": variable("playfair-display", "Playfair Display", "serif", 400, 900, romanItalic, "editorial display"),
+ "roboto-slab": variable("roboto-slab", "Roboto Slab", "serif", 100, 900, normal, "sturdy explanatory titles", "Apache-2.0"),
+ "source-serif-4": variable("source-serif-4", "Source Serif 4", "serif", 200, 900, romanItalic, "readable serif"),
+ vollkorn: variable("vollkorn", "Vollkorn", "serif", 400, 900, romanItalic, "bookish narrative copy"),
+
+ // Monospaced faces.
+ "fira-code": variable("fira-code", "Fira Code", "monospace", 300, 700, normal, "code and technical overlays"),
+ "geist-mono": variable("geist-mono", "Geist Mono", "monospace", 100, 900, romanItalic, "minimal technical labels"),
+ "ibm-plex-mono": staticFont("ibm-plex-mono", "IBM Plex Mono", "monospace", [100, 200, 300, 400, 500, 600, 700], romanItalic, "editorial technical overlays"),
+ "jetbrains-mono": variable("jetbrains-mono", "JetBrains Mono", "monospace", 100, 800, romanItalic, "code demonstrations"),
+ "roboto-mono": variable("roboto-mono", "Roboto Mono", "monospace", 100, 700, romanItalic, "neutral measurements and code"),
+ "space-mono": staticFont("space-mono", "Space Mono", "monospace", [400, 700], romanItalic, "retro technical titles"),
+
+ // Complete CJK faces and display lettering. These retain all Unicode-range shards.
+ "long-cang": staticSplit("long-cang", "龙藏体 / Long Cang", "cjk", [400], normal, "expressive Chinese brush copy"),
+ "liu-jian-mao-cao": staticSplit("liu-jian-mao-cao", "刘建毛草 / Liu Jian Mao Cao", "cjk", [400], normal, "Chinese cursive display"),
+ "ma-shan-zheng": staticSplit("ma-shan-zheng", "马善政毛笔体", "cjk", [400], normal, "Chinese brush titles"),
+ "noto-sans-hk": variableSplit("noto-sans-hk", "Noto Sans HK", "cjk", 100, 900, "Hong Kong Traditional Chinese"),
+ "noto-sans-jp": variableSplit("noto-sans-jp", "Noto Sans JP", "cjk", 100, 900, "Japanese sans-serif"),
+ "noto-sans-kr": variableSplit("noto-sans-kr", "Noto Sans KR", "cjk", 100, 900, "Korean sans-serif"),
+ "noto-sans-sc": variableSplit("noto-sans-sc", "Noto Sans SC", "cjk", 100, 900, "Simplified Chinese sans-serif"),
+ "noto-sans-tc": variableSplit("noto-sans-tc", "Noto Sans TC", "cjk", 100, 900, "Traditional Chinese sans-serif"),
+ "noto-serif-jp": variableSplit("noto-serif-jp", "Noto Serif JP", "cjk", 200, 900, "Japanese serif"),
+ "noto-serif-kr": variableSplit("noto-serif-kr", "Noto Serif KR", "cjk", 200, 900, "Korean serif"),
+ "noto-serif-sc": variableSplit("noto-serif-sc", "Noto Serif SC", "cjk", 200, 900, "Simplified Chinese serif"),
+ "noto-serif-tc": variableSplit("noto-serif-tc", "Noto Serif TC", "cjk", 200, 900, "Traditional Chinese serif"),
+ "zcool-kuaile": staticSplit("zcool-kuaile", "站酷快乐体", "cjk", [400], normal, "playful Chinese display"),
+ "zcool-qingke-huangyou": staticSplit("zcool-qingke-huangyou", "站酷庆科黄油体", "cjk", [400], normal, "geometric Chinese display"),
+ "zcool-xiaowei": staticSplit("zcool-xiaowei", "站酷小薇体", "cjk", [400], normal, "Chinese editorial display"),
+
+ // Complete non-Latin script faces.
+ "noto-naskh-arabic": variableSplit("noto-naskh-arabic", "Noto Naskh Arabic", "world", 400, 700, "Arabic serif and traditional copy"),
+ "noto-sans-arabic": variableSplit("noto-sans-arabic", "Noto Sans Arabic", "world", 100, 900, "Arabic sans-serif"),
+ "noto-sans-devanagari": variableSplit("noto-sans-devanagari", "Noto Sans Devanagari", "world", 100, 900, "Devanagari sans-serif"),
+ "noto-sans-hebrew": variableSplit("noto-sans-hebrew", "Noto Sans Hebrew", "world", 100, 900, "Hebrew sans-serif"),
+ "noto-sans-thai": variableSplit("noto-sans-thai", "Noto Sans Thai", "world", 100, 900, "Thai sans-serif"),
+
+ // Emoji. Color is fixed at 400; monochrome remains variable for typographic treatments.
+ "noto-color-emoji": externalSplit("@infolektuell/noto-color-emoji", "index.css", "Noto Color Emoji", "emoji", [400], normal, "full-color COLRv1 emoji fallback"),
+ "noto-emoji": variableSplit("noto-emoji", "Noto Emoji", "emoji", 300, 700, "monochrome emoji and symbols"),
} as const satisfies Readonly<Record<string, OpenFontFamily>>;
export type OpenFontFamilyName = keyof typeof openFontFamilies;
@@ -81,3 +308,10 @@ export type OpenFontFamilyName = keyof typeof openFontFamilies;
export const openFontFamilyNames = Object.freeze(
Object.keys(openFontFamilies).sort() as OpenFontFamilyName[],
);
+
+export const openFontFamiliesByCategory = Object.freeze(Object.fromEntries(
+ (["handwriting", "script", "display", "sans", "serif", "monospace", "cjk", "world", "emoji"] as const)
+ .map((category) => [category, Object.freeze(openFontFamilyNames.filter(
+ (name) => openFontFamilies[name].category === category,
+ ))]),
+) as Readonly<Record<OpenFontCategory, readonly OpenFontFamilyName[]>>);
diff --git a/packages/fonts-open/src/index.ts b/packages/fonts-open/src/index.ts
index a457f31a..8eb04f19 100644
--- a/packages/fonts-open/src/index.ts
+++ b/packages/fonts-open/src/index.ts
@@ -1,16 +1,19 @@
export {
openFontFamilies,
+ openFontFamiliesByCategory,
openFontFamilyNames,
} from "./catalog.js";
export type {
OpenFontFamily,
+ OpenFontCategory,
OpenFontFamilyName,
OpenFontStyle,
} from "./catalog.js";
export {
fontsOpenFaceSurfaceImplementationDigest,
+ fontsOpenStackSurfaceImplementationDigest,
fontsOpenManifest,
fontsOpenManifestDigest,
fontsOpenModuleRef,
} from "./manifest.js";
-export { decodeOpenFontFaceSurface } from "./surface.js";
+export { decodeOpenFontFaceSurface, decodeOpenFontStackSurface } from "./surface.js";
diff --git a/packages/fonts-open/src/manifest.ts b/packages/fonts-open/src/manifest.ts
index 8a114dc4..20455452 100644
--- a/packages/fonts-open/src/manifest.ts
+++ b/packages/fonts-open/src/manifest.ts
@@ -5,7 +5,10 @@ import type { ModuleManifest } from "@narratage/protocol";
export const fontsOpenModuleRef = { name: "@narratage/fonts-open", version: "0.0.0-dev" } as const;
export const fontsOpenFaceSurfaceImplementationDigest = digestOf(
- "@narratage/fonts-open/fontsource-5.3.0-face-surface@1",
+ "@narratage/fonts-open/pinned-open-face-surface@1",
+);
+export const fontsOpenStackSurfaceImplementationDigest = digestOf(
+ "@narratage/fonts-open/pinned-open-exact-stack-surface@1",
);
export const fontsOpenManifest: ModuleManifest = {
@@ -25,6 +28,16 @@ export const fontsOpenManifest: ModuleManifest = {
locator: "@narratage/fonts-open/face-surface",
digest: fontsOpenFaceSurfaceImplementationDigest,
},
+ }, {
+ name: "stack",
+ tag: "Stack",
+ mode: "structured",
+ outputs: [mediaTypes.fontStack],
+ implementation: {
+ kind: "trusted-frontend-surface",
+ locator: "@narratage/fonts-open/stack-surface",
+ digest: fontsOpenStackSurfaceImplementationDigest,
+ },
}],
producers: [],
};
diff --git a/packages/fonts-open/src/surface.ts b/packages/fonts-open/src/surface.ts
index 343dd220..5a54f3d1 100644
--- a/packages/fonts-open/src/surface.ts
+++ b/packages/fonts-open/src/surface.ts
@@ -2,8 +2,12 @@ import { readFileSync } from "node:fs";
import { readFile } from "node:fs/promises";
import { createRequire } from "node:module";
-import { assertFontArtifactRef, mediaTypes } from "@narratage/media";
-import type { FontArtifactRef } from "@narratage/media";
+import {
+ assertFontArtifactRef,
+ assertFontStackRef,
+ mediaTypes,
+} from "@narratage/media";
+import type { FontArtifactRef, FontStackRef } from "@narratage/media";
import type { StructuredElement, StructuredSurfaceHandler } from "@narratage/text";
import {
@@ -18,13 +22,17 @@ import type {
const require = createRequire(import.meta.url);
-function attributes(element: StructuredElement): void {
- const names = Object.keys(element.attributes).sort();
- if (names.join(",") !== "family,id,style,weight") {
- throw new Error(`${element.name} requires exactly id, family, weight and style`);
- }
- if (element.children.some((child) => child.kind === "element" || child.value.trim())) {
- throw new Error(`${element.name} does not accept children`);
+function attributes(
+ element: StructuredElement,
+ required: readonly string[],
+ optional: readonly string[] = [],
+): void {
+ const names = Object.keys(element.attributes);
+ const allowed = new Set([...required, ...optional]);
+ if (required.some((name) => element.attributes[name] === undefined)
+ || names.some((name) => !allowed.has(name))) {
+ const suffix = optional.length === 0 ? "" : `, with optional ${optional.join(", ")}`;
+ throw new Error(`${element.name} requires exactly ${required.join(", ")}${suffix}`);
}
}
@@ -34,22 +42,21 @@ function stringAttribute(element: StructuredElement, name: string): string {
return value.trim();
}
-function requestedFace(element: StructuredElement): {
- readonly id: string;
+type RequestedFace = {
readonly familyName: OpenFontFamilyName;
readonly family: OpenFontFamily;
readonly weight: number;
readonly style: OpenFontStyle;
-} {
- attributes(element);
- const id = stringAttribute(element, "id");
+};
+
+function requestedFace(element: StructuredElement): RequestedFace {
const familyName = stringAttribute(element, "family") as OpenFontFamilyName;
if (!openFontFamilyNames.includes(familyName)) {
throw new Error(`${element.name}.family must be one of ${openFontFamilyNames.join(", ")}`);
}
const family: OpenFontFamily = openFontFamilies[familyName];
const weight = Number(stringAttribute(element, "weight"));
- const validWeight = family.kind === "static"
+ const validWeight = family.kind === "static" || family.kind === "static-split" || family.kind === "external-split"
? family.weights.includes(weight)
: Number.isSafeInteger(weight) && weight >= family.minimumWeight && weight <= family.maximumWeight;
if (!validWeight) throw new Error(`${element.name}.weight is unavailable for ${familyName}`);
@@ -57,39 +64,53 @@ function requestedFace(element: StructuredElement): {
if (!(family.styles as readonly OpenFontStyle[]).includes(style)) {
throw new Error(`${element.name}.style is unavailable for ${familyName}`);
}
- return { id, familyName, family, weight, style };
+ return { familyName, family, weight, style };
}
-function oneFile(family: OpenFontFamily & { readonly fileStem: string }, weight: number, style: OpenFontStyle): string {
+function oneFile(
+ family: OpenFontFamily & { readonly fileStem: string },
+ weight: number,
+ style: OpenFontStyle,
+): string {
const filename = family.kind === "static"
? `${family.fileStem}-${weight}-${style}.woff2`
: `${family.fileStem}-${style}.woff2`;
return require.resolve(`${family.packageName}/files/${filename}`);
}
-function splitFiles(family: OpenFontFamily & { readonly kind: "variable-split" }): readonly {
- readonly path: string;
- readonly unicodeRange: string;
-}[] {
- const cssPath = require.resolve(`${family.packageName}/${family.css}`);
- const css = readFileSync(cssPath, "utf8");
- return [...css.matchAll(/@font-face\s*\{([\s\S]*?)\}/gu)].map((match) => {
+function splitFiles(
+ family: OpenFontFamily & { readonly kind: "variable-split" | "static-split" | "external-split" },
+ weight: number,
+ style: OpenFontStyle,
+): readonly { readonly path: string; readonly unicodeRange: string }[] {
+ const css = family.kind === "variable-split"
+ ? family.css
+ : family.kind === "external-split"
+ ? family.css
+ : `${weight}${style === "italic" ? "-italic" : ""}.css`;
+ const cssPath = require.resolve(`${family.packageName}/${css}`);
+ const contents = readFileSync(cssPath, "utf8");
+ return [...contents.matchAll(/@font-face\s*\{([\s\S]*?)\}/gu)].map((match) => {
const body = match[1]!;
- const file = /src:\s*url\((?:['"])?\.\/files\/([^)'";]+)(?:['"])?\)/u.exec(body)?.[1];
+ const file = /src:\s*url\((?:['"])?\.\/files\/([^)'";]+\.woff2)(?:['"])?\)/u.exec(body)?.[1];
const unicodeRange = /unicode-range:\s*([^;]+);/u.exec(body)?.[1]?.replace(/\s+/gu, "");
if (file === undefined || unicodeRange === undefined) {
- throw new Error(`${family.packageName}/${family.css} contains an unsupported @font-face`);
+ throw new Error(`${family.packageName}/${css} contains an unsupported @font-face`);
}
return { path: require.resolve(`${family.packageName}/files/${file}`), unicodeRange };
});
}
-export const decodeOpenFontFaceSurface: StructuredSurfaceHandler = async ({ element, resolveAsset }) => {
- const request = requestedFace(element);
- const files = request.family.kind === "variable-split"
- ? splitFiles(request.family)
+async function materializeFace(
+ request: RequestedFace,
+ element: StructuredElement,
+ resolveAsset: Parameters<StructuredSurfaceHandler>[0]["resolveAsset"],
+): Promise<FontArtifactRef> {
+ const files = request.family.kind === "variable-split" || request.family.kind === "static-split"
+ || request.family.kind === "external-split"
+ ? splitFiles(request.family, request.weight, request.style)
: [{ path: oneFile(request.family, request.weight, request.style) }];
- const sources: FontArtifactRef["sources"] = await Promise.all(files.map(async (file) => {
+ const resolvedSources: FontArtifactRef["sources"] = await Promise.all(files.map(async (file) => {
const bytes = Uint8Array.from(await readFile(file.path));
const basename = file.path.split("/").at(-1)!;
const resolved = await resolveAsset({
@@ -103,16 +124,48 @@ export const decodeOpenFontFaceSurface: StructuredSurfaceHandler = async ({ elem
...("unicodeRange" in file ? { unicodeRange: file.unicodeRange } : {}),
};
}));
+ const byArtifact = new Map<string, FontArtifactRef["sources"][number]>();
+ for (const source of resolvedSources) {
+ const existing = byArtifact.get(source.artifact.digest);
+ if (existing === undefined) {
+ byArtifact.set(source.artifact.digest, source);
+ continue;
+ }
+ if (existing.unicodeRange === undefined || source.unicodeRange === undefined) continue;
+ byArtifact.set(source.artifact.digest, {
+ artifact: existing.artifact,
+ unicodeRange: `${existing.unicodeRange},${source.unicodeRange}`,
+ });
+ }
const font: FontArtifactRef = {
contract: "svml.font-artifact@1",
- sources,
+ sources: [...byArtifact.values()],
weight: request.weight,
style: request.style,
};
- assertFontArtifactRef(font, `${element.name}.${request.id}`);
+ assertFontArtifactRef(font, `${element.name}.${request.familyName}`);
+ return font;
+}
+
+function localName(name: string): string {
+ const colon = name.lastIndexOf(":");
+ return colon < 0 ? name : name.slice(colon + 1);
+}
+
+function emptyChildren(element: StructuredElement): void {
+ if (element.children.some((child) => child.kind === "element" || child.value.trim())) {
+ throw new Error(`${element.name} does not accept children`);
+ }
+}
+
+export const decodeOpenFontFaceSurface: StructuredSurfaceHandler = async ({ element, resolveAsset }) => {
+ attributes(element, ["id", "family", "weight", "style"]);
+ emptyChildren(element);
+ const id = stringAttribute(element, "id");
+ const font = await materializeFace(requestedFace(element), element, resolveAsset);
return {
records: [{
- id: request.id,
+ id,
type: mediaTypes.fontArtifact,
value: { kind: "inline", value: font },
range: element.range,
@@ -121,3 +174,52 @@ export const decodeOpenFontFaceSurface: StructuredSurfaceHandler = async ({ elem
fragments: [],
};
};
+
+/**
+ * Compact exact-font-stack authoring. Emoji stays explicit but no longer requires a separate Face
+ * declaration and Fallback reference for every Style.
+ */
+export const decodeOpenFontStackSurface: StructuredSurfaceHandler = async ({ element, resolveAsset }) => {
+ attributes(element, ["id", "family", "weight", "style"], ["emoji"]);
+ const id = stringAttribute(element, "id");
+ const faces: FontArtifactRef[] = [await materializeFace(requestedFace(element), element, resolveAsset)];
+
+ for (const child of element.children) {
+ if (child.kind === "text") {
+ if (child.value.trim()) throw new Error(`${element.name} accepts only Fallback children`);
+ continue;
+ }
+ if (localName(child.name) !== "Fallback") throw new Error(`${element.name} accepts only Fallback children`);
+ attributes(child, ["family", "weight", "style"]);
+ emptyChildren(child);
+ faces.push(await materializeFace(requestedFace(child), child, resolveAsset));
+ }
+
+ const emoji = element.attributes.emoji;
+ if (emoji !== undefined) {
+ if (emoji !== "color" && emoji !== "mono") {
+ throw new Error(`${element.name}.emoji must be color or mono`);
+ }
+ const familyName: OpenFontFamilyName = emoji === "color" ? "noto-color-emoji" : "noto-emoji";
+ const family = openFontFamilies[familyName];
+ faces.push(await materializeFace({
+ familyName,
+ family,
+ weight: 400,
+ style: "normal",
+ }, element, resolveAsset));
+ }
+
+ const stack: FontStackRef = { contract: "svml.font-stack@1", faces };
+ assertFontStackRef(stack, `${element.name}.${id}`);
+ return {
+ records: [{
+ id,
+ type: mediaTypes.fontStack,
+ value: { kind: "inline", value: stack },
+ range: element.range,
+ }],
+ components: [],
+ fragments: [],
+ };
+};
diff --git a/packages/fonts-open/test/fonts-open.test.ts b/packages/fonts-open/test/fonts-open.test.ts
index 1702eaf0..b77f2fbd 100644
--- a/packages/fonts-open/test/fonts-open.test.ts
+++ b/packages/fonts-open/test/fonts-open.test.ts
@@ -1,26 +1,30 @@
import assert from "node:assert/strict";
import { createHash } from "node:crypto";
+import { readFileSync } from "node:fs";
+import { createRequire } from "node:module";
import test from "node:test";
import {
decodeOpenFontFaceSurface,
+ decodeOpenFontStackSurface,
+ openFontFamilies,
+ openFontFamiliesByCategory,
openFontFamilyNames,
} from "@narratage/fonts-open";
-import type { FontArtifactRef } from "@narratage/media";
+import type { FontArtifactRef, FontStackRef } from "@narratage/media";
+import type { StructuredElement, StructuredSurfaceHandler } from "@narratage/text";
+const require = createRequire(import.meta.url);
const range = { start: 0, end: 80 };
-async function decode(family: string, weight: string, style: string) {
+async function decode(
+ handler: StructuredSurfaceHandler,
+ element: StructuredElement,
+) {
const requests: { readonly from: string; readonly bytes: Uint8Array }[] = [];
- const output = await decodeOpenFontFaceSurface({
+ const output = await handler({
sourceName: "main.svml",
- element: {
- kind: "element",
- name: "fonts:Face",
- attributes: { id: "selected", family, weight, style },
- children: [],
- range,
- },
+ element,
resolveReference: () => undefined,
resolveAsset(request) {
assert.ok(request.bytes);
@@ -38,18 +42,75 @@ async function decode(family: string, weight: string, style: string) {
});
const stored = output.records[0]!.value;
assert.equal(stored.kind, "inline");
- return { font: stored.kind === "inline" ? stored.value as unknown as FontArtifactRef : undefined!, requests };
+ return { value: stored.kind === "inline" ? stored.value : undefined!, requests, output };
+}
+
+async function decodeFace(family: string, weight: string, style: string) {
+ const result = await decode(decodeOpenFontFaceSurface, {
+ kind: "element",
+ name: "fonts:Face",
+ attributes: { id: "selected", family, weight, style },
+ children: [],
+ range,
+ });
+ return { ...result, font: result.value as unknown as FontArtifactRef };
}
-test("the open catalog covers eleven useful OFL families", () => {
- assert.deepEqual(openFontFamilyNames, [
- "bebas-neue", "dm-sans", "inter", "manrope", "montserrat", "noto-emoji",
- "noto-sans-sc", "noto-serif-sc", "playfair-display", "poppins", "source-serif-4",
- ]);
+test("the catalog exposes 109 publishable open families with frontend metadata", () => {
+ assert.equal(openFontFamilyNames.length, 109);
+ assert.equal(Object.values(openFontFamiliesByCategory).flat().length, 109);
+ for (const family of Object.values(openFontFamilies)) {
+ assert.ok(family.label);
+ assert.ok(family.intendedUse);
+ assert.ok(["OFL-1.1", "Apache-2.0"].includes(family.license));
+ }
+});
+
+test("every open font from the Twinit catalog is represented without private local fonts", () => {
+ const migrated = [
+ "caveat", "permanent-marker", "shadows-into-light", "shantell-sans", "playpen-sans",
+ "short-stack", "kalam", "patrick-hand", "handlee", "coming-soon", "architects-daughter",
+ "pinyon-script", "pacifico", "satisfy", "bebas-neue", "anton", "archivo-black", "oswald",
+ "league-spartan", "fredoka", "lilita-one", "bungee", "black-ops-one", "bangers",
+ "luckiest-guy", "righteous", "barlow-condensed", "roboto-condensed", "fira-sans-condensed",
+ "dm-sans", "kanit", "rubik", "montserrat", "poppins", "inter", "lato", "nunito-sans",
+ "manrope", "urbanist", "raleway", "work-sans", "playfair-display", "roboto-slab",
+ "abril-fatface", "cormorant-garamond", "libre-baskerville", "noto-sans-sc", "noto-sans-jp",
+ "noto-serif-sc", "ma-shan-zheng", "zcool-kuaile", "zcool-qingke-huangyou",
+ ];
+ assert.deepEqual(migrated.filter((name) => !openFontFamilyNames.includes(name as never)), []);
+});
+
+test("catalog license metadata matches every installed Fontsource package", () => {
+ for (const [name, family] of Object.entries(openFontFamilies)) {
+ const packagePath = require.resolve(`${family.packageName}/package.json`);
+ const packageJson = JSON.parse(readFileSync(packagePath, "utf8")) as { readonly license: string };
+ assert.equal(packageJson.license, family.license, name);
+ }
+});
+
+test("every declared family, static weight and style can materialize exact bytes", async () => {
+ for (const name of openFontFamilyNames) {
+ const family = openFontFamilies[name];
+ const weights = family.kind === "static" || family.kind === "static-split" || family.kind === "external-split"
+ ? family.weights
+ : [family.minimumWeight];
+ for (const weight of weights) {
+ for (const style of family.styles) {
+ const { font, requests } = await decodeFace(name, String(weight), style);
+ assert.ok(font.sources.length > 0, `${name} ${weight} ${style}`);
+ const uniqueBytes = new Set(requests.map(
+ (request) => createHash("sha256").update(request.bytes).digest("hex"),
+ ));
+ assert.equal(uniqueBytes.size, font.sources.length, `${name} ${weight} ${style}`);
+ assert.equal(new Set(requests.map((request) => request.from)).size, requests.length, name);
+ }
+ }
+ }
});
test("one Latin variable face contributes one exact installed source", async () => {
- const { font, requests } = await decode("inter", "700", "italic");
+ const { font, requests } = await decodeFace("inter", "700", "italic");
assert.equal(font.weight, 700);
assert.equal(font.style, "italic");
assert.equal(font.sources.length, 1);
@@ -58,21 +119,51 @@ test("one Latin variable face contributes one exact installed source", async ()
});
test("one CJK face preserves every Fontsource Unicode-range source", async () => {
- const { font, requests } = await decode("noto-sans-sc", "700", "normal");
+ const { font, requests } = await decodeFace("noto-sans-sc", "700", "normal");
assert.equal(font.sources.length, 101);
assert.equal(requests.length, 101);
assert.equal(font.sources.every((source) => source.unicodeRange?.startsWith("U+") === true), true);
assert.ok(requests.reduce((total, request) => total + request.bytes.byteLength, 0) > 4_000_000);
});
-test("emoji remains one logical fallback face over its installed Unicode slices", async () => {
- const { font } = await decode("noto-emoji", "700", "normal");
- assert.equal(font.sources.length, 10);
- assert.equal(font.weight, 700);
+test("static split CJK and color emoji faces retain their complete installed shards", async () => {
+ const cjk = await decodeFace("zcool-kuaile", "400", "normal");
+ assert.ok(cjk.font.sources.length > 10);
+ const color = await decodeFace("noto-color-emoji", "400", "normal");
+ assert.equal(color.font.sources.length, 11);
+ assert.ok(color.requests.reduce((total, request) => total + request.bytes.byteLength, 0) > 1_500_000);
+});
+
+test("Stack makes exact CJK and emoji fallback a single reusable author edge", async () => {
+ const result = await decode(decodeOpenFontStackSurface, {
+ kind: "element",
+ name: "fonts:Stack",
+ attributes: { id: "caption-fonts", family: "inter", weight: "700", style: "normal", emoji: "color" },
+ children: [{
+ kind: "element",
+ name: "fonts:Fallback",
+ attributes: { family: "noto-sans-sc", weight: "700", style: "normal" },
+ children: [],
+ range,
+ }],
+ range,
+ });
+ const stack = result.value as unknown as FontStackRef;
+ assert.equal(stack.contract, "svml.font-stack@1");
+ assert.equal(stack.faces.length, 3);
+ assert.equal(stack.faces[0]!.weight, 700);
+ assert.equal(stack.faces[1]!.sources.length, 101);
+ assert.equal(stack.faces[2]!.sources.length, 11);
+ assert.equal(stack.faces[2]!.weight, 400);
});
-test("unavailable family, weight and style combinations fail before reading bytes", async () => {
- await assert.rejects(async () => await decode("comic-sans", "700", "normal"), /family must be one of/u);
- await assert.rejects(async () => await decode("bebas-neue", "700", "normal"), /weight is unavailable/u);
- await assert.rejects(async () => await decode("manrope", "700", "italic"), /style is unavailable/u);
+test("unavailable family, weight, style and emoji combinations fail before reading bytes", async () => {
+ await assert.rejects(async () => await decodeFace("comic-sans", "700", "normal"), /family must be one of/u);
+ await assert.rejects(async () => await decodeFace("bebas-neue", "700", "normal"), /weight is unavailable/u);
+ await assert.rejects(async () => await decodeFace("manrope", "700", "italic"), /style is unavailable/u);
+ await assert.rejects(async () => await decode(decodeOpenFontStackSurface, {
+ kind: "element", name: "fonts:Stack",
+ attributes: { id: "bad", family: "inter", weight: "700", style: "normal", emoji: "surprise" },
+ children: [], range,
+ }), /emoji must be color or mono/u);
});
diff --git a/packages/hyperframes/test/browser-visual.test.ts b/packages/hyperframes/test/browser-visual.test.ts
index c1fafcec..96582ed5 100644
--- a/packages/hyperframes/test/browser-visual.test.ts
+++ b/packages/hyperframes/test/browser-visual.test.ts
@@ -179,6 +179,28 @@ function matchingPixels(
return count;
}
+function longestHorizontalRun(
+ rgba: Buffer,
+ width: number,
+ height: number,
+ predicate: (red: number, green: number, blue: number, alpha: number) => boolean,
+): number {
+ let longest = 0;
+ for (let y = 0; y < height; y += 1) {
+ let run = 0;
+ for (let x = 0; x < width; x += 1) {
+ const index = (y * width + x) * 4;
+ if (predicate(rgba[index]!, rgba[index + 1]!, rgba[index + 2]!, rgba[index + 3]!)) {
+ run += 1;
+ longest = Math.max(longest, run);
+ } else {
+ run = 0;
+ }
+ }
+ }
+ return longest;
+}
+
test("locked font and straight-alpha Surface survive one real Hyperframes browser frame", {
skip: !enabled || localFont === undefined,
timeout: 120_000,
@@ -429,6 +451,85 @@ test("Fine Caption exact font, wrapping and all karaoke modes survive real brows
}
});
+test("Fine Caption joined trail Pill follows real wrapped browser line fragments", {
+ skip: !enabled || localFont === undefined,
+ timeout: 120_000,
+}, async () => {
+ assert(localFont !== undefined);
+ const temp = await mkdtemp(path.join(os.tmpdir(), "svml-caption-fine-pill-"));
+ try {
+ const width = 480;
+ const height = 280;
+ const space = sealProgramSpace({
+ contract: "svml.program-space@1", durationSec: 6, frameRate: { numerator: 10, denominator: 1 },
+ });
+ const narrative = parseScript("pill.svml", "<line>Every caption word joins across lines.</line>");
+ const display = captionDisplaySequence(narrative, "pill.caption");
+ const fontBytes = await import("node:fs/promises").then(({ readFile }) => readFile(localFont));
+ const font: FontArtifactRef = {
+ contract: "svml.font-artifact@1",
+ sources: [{ artifact: { kind: "blob", digest: digest(fontBytes), size: fontBytes.byteLength, mediaType: "font/ttf" } }],
+ weight: 400,
+ style: "normal",
+ };
+ const recipe: SvsRecipe = {
+ contract: "svml.svs-recipe@1",
+ path: "caption.joined-pill",
+ properties: {
+ "cue-min-words": 1, "cue-max-words": 8,
+ "stack-order": 20, x: 0.5, y: 0.5, width: 0.5,
+ "anchor-x": "center", "anchor-y": "center",
+ font: "Exact Test Font", weight: 400, size: 36, "line-height": 1.5,
+ align: "left", fill: "#FFFFFF", background: "#00000000", padding: "0 0", radius: 0,
+ "word-gap": 8,
+ "active-box": "trail", "active-box-continuity": "joined",
+ "active-box-background": "#00FF00", "active-box-padding": "3 7", "active-box-radius": 7,
+ },
+ };
+ const style = fineCaptionStyle("joined-pill", recipe, [font]);
+ const program = resolveCaptionProgram(display, "joined-pill-program", style, []);
+ const projection: TimedCaptionProjection = {
+ contract: "svml.timed-caption-projection@1", displaySequenceId: display.id,
+ cues: [{
+ id: "joined-pill-cue", runId: program.runs[0]!.id, styleId: style.id, segmentId: "line",
+ startSec: 0, endSec: 6,
+ atoms: display.atoms.map((atom, index) => ({ atomId: atom.id, startSec: index, endSec: index + 1 })),
+ fields: [],
+ }],
+ };
+ const track = renderFineCaption(projection, program, display, space);
+ const document = compileHyperframesDocument(sealComposition({
+ contract: "svml.composition@1",
+ id: "caption-fine-joined-pill",
+ canvas: { width, height, clearColor: "#000000" },
+ tracks: [track],
+ }), space);
+ await copyFile(localFont, path.join(temp, "caption.ttf"));
+ await writeFile(path.join(temp, "index.html"), materializeHyperframesHtml(document, (artifact) => {
+ if (artifact.digest === font.sources[0]!.artifact.digest) return "./caption.ttf";
+ throw new Error(`Unexpected joined-Pill Artifact ${artifact.digest}`);
+ }));
+ const output = path.join(temp, "frames");
+ await mkdir(output);
+ const render = spawnSync(process.execPath, [
+ hyperframesCli, "render", temp,
+ "--format", "png-sequence", "--output", output, "--fps", "10", "--workers", "1",
+ "--no-browser-gpu", "--no-best-effort", "--quiet",
+ ], { encoding: "utf8", timeout: 110_000 });
+ assert.equal(render.status, 0, `${render.stdout}\n${render.stderr}`);
+ const frames = await collectPngs(output);
+ assert.equal(frames.length, 60);
+ const rgba = decodedRgba(frames.at(-1)!, width, height);
+ const isGreen = (red: number, green: number, blue: number) => green > 170 && red < 100 && blue < 100;
+ assert.ok(matchingPixels(rgba, width, { left: 0, top: 0, right: width, bottom: height }, isGreen) > 1_000,
+ "joined trail Pill painted too few background pixels");
+ assert.ok(longestHorizontalRun(rgba, width, height, isGreen) > 100,
+ "joined trail Pill remained separate per-Atom capsules instead of one line fragment");
+ } finally {
+ await rm(temp, { recursive: true, force: true });
+ }
+});
+
test("installed open fonts render CJK, emoji and independent stroke, shadow and glow Paint", {
skip: !enabled,
timeout: 120_000,
@@ -446,7 +547,7 @@ test("installed open fonts render CJK, emoji and independent stroke, shadow and
const installed = await Promise.all([
installedOpenFont("inter", 700, "normal"),
installedOpenFont("noto-sans-sc", 700, "normal"),
- installedOpenFont("noto-emoji", 400, "normal"),
+ installedOpenFont("noto-color-emoji", 400, "normal"),
]);
const fonts = installed.map(({ font }) => font);
const fontBytes = new Map<Digest, Uint8Array>();
@@ -533,6 +634,9 @@ test("installed open fonts render CJK, emoji and independent stroke, shadow and
"the exact CJK fallback did not paint its glyphs");
assert.ok(matchingPixels(rgba, width, { left: width / 2, top: 0, right: width, bottom: height / 2 }, visible) > 100,
"the exact emoji fallback did not paint its glyphs");
+ assert.ok(matchingPixels(rgba, width, { left: width / 2, top: 0, right: width, bottom: height / 2 },
+ (red, green, blue) => Math.max(red, green, blue) - Math.min(red, green, blue) > 35) > 50,
+ "the exact color emoji fallback painted no chromatic pixels");
const paintRegion = { left: 0, top: height / 2, right: width, bottom: height };
assert.ok(matchingPixels(rgba, width, paintRegion, (red, green, blue) => red > 150 && green < 120 && blue < 120) > 100,
"stroke Paint did not produce red pixels");
diff --git a/packages/media/README.md b/packages/media/README.md
index 0d0e5dcd..85429efe 100644
--- a/packages/media/README.md
+++ b/packages/media/README.md
@@ -6,7 +6,8 @@ Author-facing media declarations for the neutral `@narratage/media` contract mod
capability. Image and Audio emit one content-addressed `BlobArtifact`; Font wraps the same immutable
bytes with exact weight/style metadata as a one-source `FontArtifactRef`. A logical font face may
also contain several exact Unicode-range sources when another package, such as
-`@narratage/fonts-open`, owns a sharded installed font. Media declarations do not open files themselves,
+`@narratage/fonts-open`, owns a sharded installed font. `FontStackRef` is the generic ordered value
+for one primary face followed by exact glyph fallbacks. Media declarations do not open files themselves,
inspect media, call a Provider or promote declared audio to speech. The consuming author package
decides whether an audio artifact is a voice reference, soundtrack, evidence source or something
else, and which visual component uses an exact Font.
diff --git a/packages/media/src/index.ts b/packages/media/src/index.ts
index fd3db7e4..7c248428 100644
--- a/packages/media/src/index.ts
+++ b/packages/media/src/index.ts
@@ -6,7 +6,7 @@ export {
export { mediaComponent } from "./component.js";
export { sealMediaInspection, sealMediaStreamSelection, sealMuxedMedia, sealRenderedVisual, sealSynchronizedMedia, sealTimelineAudio, verifyMediaInspection, verifyMediaStreamSelection, verifyMuxedMedia, verifyRenderedVisual, verifySynchronizedMedia, verifyTimelineAudio } from "./identity.js";
export { mediaDependency, mediaManifest, mediaManifestDigest, mediaModuleRef, mediaSurfaceImplementationDigests, mediaTypes, mediaValidatorDigests } from "./manifest.js";
-export { compositableSurfaceSchema, fontArtifactSchema, mediaArtifactSchema, mediaInspectionSchema, mediaStreamSelectionSchema, muxedMediaSchema, renderedVisualSchema, synchronizedMediaSchema, timelineAudioSchema } from "./schema.js";
-export { assertCompositableSurfaceRef, assertFontArtifactRef } from "./render.js";
+export { compositableSurfaceSchema, fontArtifactSchema, fontStackSchema, mediaArtifactSchema, mediaInspectionSchema, mediaStreamSelectionSchema, muxedMediaSchema, renderedVisualSchema, synchronizedMediaSchema, timelineAudioSchema } from "./schema.js";
+export { assertCompositableSurfaceRef, assertFontArtifactRef, assertFontStackRef } from "./render.js";
export type * from "./render.js";
export type * from "./types.js";
diff --git a/packages/media/src/manifest.ts b/packages/media/src/manifest.ts
index 474ed7a4..ea901e0d 100644
--- a/packages/media/src/manifest.ts
+++ b/packages/media/src/manifest.ts
@@ -1,13 +1,14 @@
import { artifactDependency, artifactTypes } from "@narratage/artifact";
import { digestOf } from "@narratage/protocol";
import type { ModuleManifest, TypeRef } from "@narratage/protocol";
-import { compositableSurfaceSchema, fontArtifactSchema, mediaArtifactSchema, mediaInspectionSchema, mediaStreamSelectionSchema, muxedMediaSchema, renderedVisualSchema, synchronizedMediaSchema, timelineAudioSchema } from "./schema.js";
+import { compositableSurfaceSchema, fontArtifactSchema, fontStackSchema, mediaArtifactSchema, mediaInspectionSchema, mediaStreamSelectionSchema, muxedMediaSchema, renderedVisualSchema, synchronizedMediaSchema, timelineAudioSchema } from "./schema.js";
export const mediaModuleRef = { name: "@narratage/media", version: "0.0.0-dev" } as const;
export const mediaTypes = {
artifact: { module: mediaModuleRef, name: "MediaArtifactRef" }, inspection: { module: mediaModuleRef, name: "MediaInspection" },
streamSelection: { module: mediaModuleRef, name: "MediaStreamSelection" }, synchronized: { module: mediaModuleRef, name: "SynchronizedMedia" },
renderedVisual: { module: mediaModuleRef, name: "RenderedVisual" }, timelineAudio: { module: mediaModuleRef, name: "TimelineAudio" },
muxed: { module: mediaModuleRef, name: "MuxedMedia" }, fontArtifact: { module: mediaModuleRef, name: "FontArtifactRef" },
+ fontStack: { module: mediaModuleRef, name: "FontStackRef" },
compositableSurface: { module: mediaModuleRef, name: "CompositableSurfaceRef" }, blobArtifact: artifactTypes.blob,
} satisfies Record<string, TypeRef>;
export const mediaValidatorDigests = {
@@ -31,7 +32,8 @@ export const mediaManifest: ModuleManifest = {
{ name: mediaTypes.renderedVisual.name, schema: renderedVisualSchema, validator: validator("@narratage/media/validate-rendered-visual", mediaValidatorDigests.renderedVisual) },
{ name: mediaTypes.timelineAudio.name, schema: timelineAudioSchema, validator: validator("@narratage/media/validate-timeline-audio", mediaValidatorDigests.timelineAudio) },
{ name: mediaTypes.muxed.name, schema: muxedMediaSchema, validator: validator("@narratage/media/validate-muxed-media", mediaValidatorDigests.muxed) },
- { name: mediaTypes.fontArtifact.name, schema: fontArtifactSchema }, { name: mediaTypes.compositableSurface.name, schema: compositableSurfaceSchema },
+ { name: mediaTypes.fontArtifact.name, schema: fontArtifactSchema }, { name: mediaTypes.fontStack.name, schema: fontStackSchema },
+ { name: mediaTypes.compositableSurface.name, schema: compositableSurfaceSchema },
], capabilities: [],
surfaces: [
{ name: "image", tag: "Image", mode: "structured", outputs: [artifactTypes.blob], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/media/image-surface", digest: mediaSurfaceImplementationDigests.image } },
diff --git a/packages/media/src/render.ts b/packages/media/src/render.ts
index 9b8d6fec..09edc54b 100644
--- a/packages/media/src/render.ts
+++ b/packages/media/src/render.ts
@@ -25,6 +25,12 @@ export type FontArtifactRef = {
readonly style: "normal" | "italic" | "oblique";
};
+/** Ordered exact font faces. The first face is primary; the remainder are glyph fallbacks. */
+export type FontStackRef = {
+ readonly contract: "svml.font-stack@1";
+ readonly faces: readonly FontArtifactRef[];
+};
+
export type CompositableSurfaceRef = {
readonly contract: "svml.compositable-surface@1";
readonly artifact: BlobRef;
@@ -80,6 +86,22 @@ export function assertFontArtifactRef(value: FontArtifactRef, label = "FontArtif
}
}
+export function assertFontStackRef(value: FontStackRef, label = "FontStackRef"): void {
+ if (value.contract !== "svml.font-stack@1") throw new Error(`${label} contract is unsupported.`);
+ if (value.faces.length === 0) throw new Error(`${label} faces are empty.`);
+ const identities = new Set<string>();
+ for (const [index, face] of value.faces.entries()) {
+ assertFontArtifactRef(face, `${label}.faces.${index}`);
+ const identity = JSON.stringify({
+ sources: face.sources.map((source) => [source.artifact.digest, source.unicodeRange ?? null]),
+ weight: face.weight,
+ style: face.style,
+ });
+ if (identities.has(identity)) throw new Error(`${label} repeats an exact face.`);
+ identities.add(identity);
+ }
+}
+
export function assertCompositableSurfaceRef(
value: CompositableSurfaceRef,
label = "CompositableSurfaceRef",
diff --git a/packages/media/src/schema.ts b/packages/media/src/schema.ts
index 59d36aab..b886b3c4 100644
--- a/packages/media/src/schema.ts
+++ b/packages/media/src/schema.ts
@@ -69,6 +69,8 @@ const fontSourceSchema: ValueSchema = object({
export const fontArtifactSchema: ValueSchema = object({ contract: { schema: { kind: "literal", value: "svml.font-artifact@1" } },
sources: { schema: { kind: "array", minItems: 1, items: fontSourceSchema } },
weight: { schema: { kind: "number", integer: true, minimum: 1, maximum: 1_000 } }, style: { schema: { kind: "string", enum: ["normal", "italic", "oblique"] } } });
+export const fontStackSchema: ValueSchema = object({ contract: { schema: { kind: "literal", value: "svml.font-stack@1" } },
+ faces: { schema: { kind: "array", minItems: 1, items: fontArtifactSchema } } });
const surfaceTiming: ValueSchema = { kind: "oneOf", variants: [
object({ kind: { schema: { kind: "literal", value: "still" } } }),
object({ kind: { schema: { kind: "literal", value: "frames" } }, frameRate: { schema: rational }, frameCount: { schema: { kind: "number", integer: true, minimum: 1 } } }),
diff --git a/packages/video-cli/test/cli.test.ts b/packages/video-cli/test/cli.test.ts
index fbf01f91..461f36f3 100644
--- a/packages/video-cli/test/cli.test.ts
+++ b/packages/video-cli/test/cli.test.ts
@@ -167,13 +167,10 @@ test("an installed open-font package supplies a multilingual exact stack without
<import as="caption-fine" from="@narratage/caption-fine@1"/>
<import as="studio" source="./studio.svs"/>
- <fonts:Face id="caption-font" family="inter" weight="700" style="normal"/>
- <fonts:Face id="caption-cjk" family="noto-sans-sc" weight="700" style="normal"/>
- <fonts:Face id="caption-symbols" family="noto-emoji" weight="400" style="normal"/>
- <caption-fine:Style id="primary-caption" recipe={studio.caption.primary} font={caption-font}>
- <caption-fine:Fallback font={caption-cjk}/>
- <caption-fine:Fallback font={caption-symbols}/>
- </caption-fine:Style>
+ <fonts:Stack id="caption-fonts" family="inter" weight="700" style="normal" emoji="color">
+ <fonts:Fallback family="noto-sans-sc" weight="700" style="normal"/>
+ </fonts:Stack>
+ <caption-fine:Style id="primary-caption" recipe={studio.caption.primary} font={caption-fonts}/>
</svml>`, "utf8");
let output = "";
@@ -185,7 +182,7 @@ test("an installed open-font package supplies a multilingual exact stack without
assert.equal(result.ok, true);
assert.deepEqual(
result.exports.map((item) => item.name).sort(),
- ["caption-cjk", "caption-font", "caption-symbols", "primary-caption"],
+ ["caption-fonts", "primary-caption"],
);
});
diff --git a/packages/visual-ir/src/style.ts b/packages/visual-ir/src/style.ts
index 9a8bff30..2d6bd530 100644
--- a/packages/visual-ir/src/style.ts
+++ b/packages/visual-ir/src/style.ts
@@ -126,9 +126,12 @@ export const VISUAL_STYLE_NAMES_V1 = [
"row-gap",
"text-align",
"text-decoration",
+ "text-decoration-color",
+ "text-decoration-thickness",
"text-overflow",
"text-shadow",
"text-transform",
+ "text-underline-offset",
"top",
"transform",
"transform-origin",
@@ -150,7 +153,7 @@ const CROSS_TRACK_STYLES = new Set(["backdrop-filter", "mix-blend-mode"]);
export const VISUAL_STYLE_ENUM_VALUES_V1 = {
"box-sizing": ["border-box", "content-box"],
direction: ["ltr", "rtl"],
- display: ["block", "inline-block", "flex", "inline-flex", "grid", "inline-grid", "-webkit-box", "none"],
+ display: ["block", "inline", "inline-block", "flex", "inline-flex", "grid", "inline-grid", "-webkit-box", "none"],
"flex-direction": ["row", "row-reverse", "column", "column-reverse"],
"flex-wrap": ["nowrap", "wrap", "wrap-reverse"],
"object-fit": ["contain", "cover", "fill", "none", "scale-down"],
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 93d384f9..2f6746e0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -613,42 +613,333 @@ importers:
packages/fonts-open:
dependencies:
+ '@fontsource-variable/archivo':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/bodoni-moda':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/cabin':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/caveat':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/cinzel':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/cormorant-garamond':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/crimson-pro':
+ specifier: 5.3.0
+ version: 5.3.0
'@fontsource-variable/dm-sans':
specifier: 5.3.0
version: 5.3.0
+ '@fontsource-variable/eb-garamond':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/figtree':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/fira-code':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/fraunces':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/fredoka':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/geist':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/geist-mono':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/instrument-sans':
+ specifier: 5.3.0
+ version: 5.3.0
'@fontsource-variable/inter':
specifier: 5.3.0
version: 5.3.0
+ '@fontsource-variable/jetbrains-mono':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/josefin-sans':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/jost':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/league-spartan':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/lexend':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/libre-baskerville':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/lora':
+ specifier: 5.3.0
+ version: 5.3.0
'@fontsource-variable/manrope':
specifier: 5.3.0
version: 5.3.0
+ '@fontsource-variable/merriweather':
+ specifier: 5.3.0
+ version: 5.3.0
'@fontsource-variable/montserrat':
specifier: 5.3.0
version: 5.3.0
+ '@fontsource-variable/mulish':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/newsreader':
+ specifier: 5.3.0
+ version: 5.3.0
'@fontsource-variable/noto-emoji':
specifier: 5.3.0
version: 5.3.0
+ '@fontsource-variable/noto-naskh-arabic':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/noto-sans':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/noto-sans-arabic':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/noto-sans-devanagari':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/noto-sans-hebrew':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/noto-sans-hk':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/noto-sans-jp':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/noto-sans-kr':
+ specifier: 5.3.0
+ version: 5.3.0
'@fontsource-variable/noto-sans-sc':
specifier: 5.3.0
version: 5.3.0
+ '@fontsource-variable/noto-sans-tc':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/noto-sans-thai':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/noto-serif-jp':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/noto-serif-kr':
+ specifier: 5.3.0
+ version: 5.3.0
'@fontsource-variable/noto-serif-sc':
specifier: 5.3.0
version: 5.3.0
+ '@fontsource-variable/noto-serif-tc':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/nunito-sans':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/onest':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/open-sans':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/oswald':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/outfit':
+ specifier: 5.3.0
+ version: 5.3.0
'@fontsource-variable/playfair-display':
specifier: 5.3.0
version: 5.3.0
+ '@fontsource-variable/playpen-sans':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/plus-jakarta-sans':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/quicksand':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/raleway':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/rethink-sans':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/roboto':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/roboto-condensed':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/roboto-mono':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/roboto-slab':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/rubik':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/shantell-sans':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/sora':
+ specifier: 5.3.0
+ version: 5.3.0
'@fontsource-variable/source-serif-4':
specifier: 5.3.0
version: 5.3.0
+ '@fontsource-variable/space-grotesk':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/unbounded':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/urbanist':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/vollkorn':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource-variable/work-sans':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/abril-fatface':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/alfa-slab-one':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/anton':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/architects-daughter':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/archivo-black':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/bangers':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/barlow':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/barlow-condensed':
+ specifier: 5.3.0
+ version: 5.3.0
'@fontsource/bebas-neue':
specifier: 5.3.0
version: 5.3.0
+ '@fontsource/black-ops-one':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/bungee':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/coming-soon':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/dm-serif-display':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/fira-sans-condensed':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/gloock':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/handlee':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/ibm-plex-mono':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/instrument-serif':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/kalam':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/kanit':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/lato':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/lilita-one':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/liu-jian-mao-cao':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/long-cang':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/luckiest-guy':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/ma-shan-zheng':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/pacifico':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/patrick-hand':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/permanent-marker':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/pinyon-script':
+ specifier: 5.3.0
+ version: 5.3.0
'@fontsource/poppins':
specifier: 5.3.0
version: 5.3.0
- '@narratage/core':
- specifier: workspace:*
- version: link:../core
+ '@fontsource/righteous':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/satisfy':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/shadows-into-light':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/short-stack':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/space-mono':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/zcool-kuaile':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/zcool-qingke-huangyou':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@fontsource/zcool-xiaowei':
+ specifier: 5.3.0
+ version: 5.3.0
+ '@infolektuell/noto-color-emoji':
+ specifier: 0.2.0
+ version: 0.2.0
'@narratage/media':
specifier: workspace:*
version: link:../media
@@ -2556,54 +2847,303 @@ packages:
cpu: [x64]
os: [win32]
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-HogK8FJelrD1o7TlZlkIVtHgc20bO5PZRWE7mUeUTdMN055alznQV6/00J00IBeu8FQAH4s3zW9UJNvKExXf+g==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-yTDXk4+/J8I20KjtkHBbXDQNeE5PR3BZa0gv/YRza+kyxsz+mmg0la/n/hsr6+WvSfVP7Lc8lRTjHGIYwBW43A==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-VDe9LHdI/XrmYDPCgBVkY+9ZLxAZFrTD3KhpJ/I0y3Ug9uCMDiNr0uKRaI7l1s1InANj1xH/Nsc7mOjkFJfK9w==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-Q3mjghoYIlXgwqBPJKZ4q6f3zu921Gq7UU76r9Z+NAmhapHfX130GIFpOCYf8vt2SIcgCi9RHDT7anfJKg/kiA==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-eFcU0TwaAP5QESF2pV8VoOPJJXJ6sSGm/6mXMwqTdMBPAJMaLhfa6oISHuOtFeddsoHP9RYm4Io0j1j3mNEz2Q==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-rgZJ/5w3hi60swAPnrOXpZf5wEH6NTrvm4H8D9Y4b1QIFUqlX14eM3QTMU/eAznjfh0eXpO1QUqsFhiy58aoMg==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-CmtGOKsw1H/JcXOcncu8SWOnhWlyLaAMbCVlG9yR5kz95hrxYU3A1+0DxdRbz/MFhCJGxchgqwPxLAlL0cWvdQ==}
+
'@fontsource-variable/[email protected]':
resolution: {integrity: sha512-BpUG5bqePiDFMBM4ZtLSlPdAIOM990uB1dlXzIf4aw21yQR7BmykedLXXXMqGWsR18aMLOsbWccwJNh3ztTQaA==}
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-656OJsA9Vv24yhqRZFEzXnzS2AYgKdEILLgHJYLzzXndgcWFKfSXFqzbRI5/6Yk1Yt7UfWrUeppE5nRQPQMwlQ==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-VRVodD7OiG7apQwE8/2fMjaqpY/a0qRJqL5HtYj8CKIVps+9amaFcdfKmDIf7iqYQx6iPLlArVXAfKeIZmVcNQ==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-ZhvHeknlicraKVSJBa1NrJnXDVByUkC407zwgELYfmnx3p9g8vwIPfQCxx8YD3K7dAeCdLuHJOHlpMfRsIcApQ==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-9BYGySn4AHEJdgp9Z28tQ3X+laJMEOITXkQarZXeloWQZDq5oOvXJ3kDA8c7MGIfpogIaZfjrQBqmda8POOCKA==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-13w98iw2RcmYfZQRZPLSu+0YJK3HHm5A2XrpU26moFIAePmfiKfvkmEJUgkc8r5GNR+pbDijOueS1KdGAMAWmQ==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-vBbuwDEo9AkrqADMXOrlAR3DFcJi4/JxeuU43FoiQERnNwsfXNnvxvReZG02cQKmyk4DZkZdBZX3oTDvy2zBAw==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-j0m+vLQuG5XAYoHtGCVu0spvlGreR3EzpECUVzkFmI1mTVnAO38l/NEPDCFgZ177JxzYJCLSmTQibIiYPilGrA==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-u4gKbDBTNFGkg997tfQn3eHOhHuquWUFTRT/rwzuKtrxX5P2ekfs2x+LgBPP4P32+cC+vUwF1Cr+IdRoPQbrGw==}
+
'@fontsource-variable/[email protected]':
resolution: {integrity: sha512-OupL48va4JNofb97w6NYeF9S7W/kHNKM0Er8Dem5nqi4jeOLrVJDoE8tZEpnMJmtkvNbB1EIPPwHcdkF6b1oUA==}
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-F32xpS2NsGYoQi2ADSkKTgpJj7ozajsGgDJ8woTnqjmIB+dxDIqImjl4pXZVEExu8UFZ2ndhmX18EBS/hdz3Lw==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-duVgkuzE/co4iuIfJ7jM2qX0ED3b6qdY+SlSjNMs6zfhz7EE7kJxV0qF65hQCv1kN0A20j4FwsGAYJvfpU+iSg==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-9FS8iBMJnfyPqQOi9dfMjSwYBIWd0kBD3/jl8VvtbIMY2pK+CSp3oAaTLS1V60rDoM7AfyPvuT+IUfJfGeCTKg==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-dn7OVujDOZ6//Bs0TEhi7QTZvwOJ8YNdNfviT29AC219TKaimMpWtyMGTCdN7IB3ho6HxQj7VEbolHah2tER3g==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-3SXtiZ8rFbT0oaPzEboCG5RM3jtyhpNxandh1jWNLqvrJRfV/eP3R+GGw+o5e3hS1uqmAGutKxSvaWG5oyrimA==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-lIjXwDhcdr0OxSdzlAU4G7Tnny1LhgAiPFdp3/PjwRMqYt2JLU6pQiLwz/M5lRBs/kRtHwxknPUqRt37AnqPFg==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-2ph8KiZ8Bn141hWuC3ErtpJ+Ui8p2MJQn8TJNRSRmLmnCIOCtHfiBM9R7WLRPeUG/q6hXyHOxWQ8DvRSX+ixvQ==}
+
'@fontsource-variable/[email protected]':
resolution: {integrity: sha512-6D5dgokHsWDDMtmXHznKa0hK229NN+1a4BLPmUCLqcO1Pw5EEhWY5RFt0AcXnVRAljFFPfRtLkJePQj6LSsV6g==}
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-wK7S4NtPXWUWll/sZCdub93pqSCnFkpKFbnoOE8fh+9Ut6JFjgkc9UlBxHJ0RVMkDpoWwGwMwYYTMvd3G9aAXA==}
+
'@fontsource-variable/[email protected]':
resolution: {integrity: sha512-7PaZoxaxrWLAyrhO46v65An9LhUhfkTExWLhfbywYZCnZEgg/W1rEHnlNmZKjNZ3nJTVYyicqxlJt10z/26yTA==}
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-CLh1WAcz2noJmoAun0/dsE7+0ZO6Kq/MBd+x00CcZ9dmThXqYqdhSssXGOdqb3G9YVaeGOmVkMS5yrZd1BHr9Q==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-rrzYi43qMpbzwuFtf9OkWH8sxAPVPcQQQEwXpPtwaKYeJ8yVg5aLs5kawmo1f2Q1t1M38TLmEKCkGVDsYwgdFw==}
+
'@fontsource-variable/[email protected]':
resolution: {integrity: sha512-omw94ZtSEOTYPyNFIgMeFMTLhry0GA6VgOWATfcuvKgUvV4TxPwoKnaWFMDbZtp41HTXPntoMYpbxZQhv0TPCw==}
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-Ot0G5iln5MeLPKp1WNt6AGi4KHbPIVm0GEow2ED6rZ+8Rao+OuswhX4D+RPerc3aQ6teneLdqXSL8VPGorJvGg==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-Rz8+DBzza3//cmN+DBQajJhx3x+Dx12eUgnQsTOgPWbOT0+In6APmE8z4I/QQnUWfAx+s8l93+60qDT5vJH1sA==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-52XBcJS3jRvZ5ugFXJvdKgffXPYnN08LeodXkgCbepOdMKVRVTQu1yj071cq8S3zmUwT6w6XKKXRSQlQkwwNNg==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-jGIZ2EOCTtT1ZhLthz6nEpPXGMniSPI/0tv5CDFDZ7MPYyoj6FskW7WJ0YTyesFADdzjx7F2Pg5W1PWD6y9UFw==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-rnFumK0uvcJHoBGRah7j88W8XpdrKTKjUQIp565vLuWl01ZkDRJLutDnCDc2JosPwgLudVA0byNEh8ICGUcl3A==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-XVL9GfGBRjj523v9w3Bctu4mNq7E5rUa+AMZm8DK1EM3LAGlKC3DZMvuqkLn4DB4TwwoAjcsJUCiRpUTDzzOkw==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-h863ZOIVMKjX0PSr0hLMUp/SjrwOul2yp0f5P61avqXdhqDABSkakzG2Ee07d3W8gVYgS9dMmxULdCkoN09f1A==}
+
'@fontsource-variable/[email protected]':
resolution: {integrity: sha512-lNar1dF7Ik/lHNPo/7JWG0TolXY29LtsqYgMvEysooZ5bsO9uH4shJmRrwyJ3PjyTPljhpMJEK0jDuLSU4vJ1w==}
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-sniyvTx+yRXlce9bjBV0i3kBG3/YFJiz6SZA9plNJLCR4TbY8il+G759gAXWHZu01eAclbJEN2YR+qbQjZTjkg==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-jHEC1vo8gD09GKf8jtH1IMoPqWmQQSKH3gkyD3ibCIMEkVpEqJ9NJ2c181VHKbTHXc7Wu9CbuBU3yjQNvpbEbw==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-e3ZuxzY9AL2psXPZlhwhnYrHUHv6PMoyK9MQ7croF0CUgURLqu9EMjW7q2FgVLwij1tjLsIHQrnwQ8aUcg4BiA==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-+kD6gj7RhZ8bjA8WxT5UxnwqWUCcFhCaM2t30zjKTS1sAXbDmJEdj+mrCEYIof1SjDy43VElQQCITouTvrGNuA==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-sy7jHCFyLRfo86KbolWCUDuWYroUvbUZqxQikjOv1F6+rOjS5PtGPS9MLB5MBCCB1gcKfBaZKzKCu3I0OqOqnw==}
+
'@fontsource-variable/[email protected]':
resolution: {integrity: sha512-7LcN2NEf4HDjoSkGWc79WqDDyMK8JvSPdA/gsHjJpZ8l9A9mcK/GQTazp3klmkBwJooy0eqeNvlmaZFXPupHrA==}
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-V2teMMI26OmWNJd1d2o7J1DdsnMkyo/wwBoEnME3Qk6FDJ9KuTqpMuaeI3a/Sj3h0iAtmp2gKcg8phRdm4CyAw==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-Vk1PSfckNDwgw2yGcsvJP3o/0zEW8Rp6KzbD8Ql/6iRHQshnhhAjt+cSIfAUyp5vQuSlleGHFW2LfYaaex0diw==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-K4Es0F3M+iFnVY5mfunimhPSk1Uvl3eyovQVWjtf8oS00a7WSrSg2BD5Bh/pAcAZUe4ocV4M08dg5tvCULBJ7Q==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-VOfhZfLIOBVa6K/dTEu7scqQXYdGa4jBX8quFpQ0S6574B+W2EOBJf9PkqyVtMEI7WWIWNEbpvPc3vY1mN2mmQ==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-sSZzcTeaQGNyZbTVlS4tNNHElK38UktFLqKd6NQDLFCBV27320rQC3kXSZVytYm1PPjKmPxqVaGwqj7LEKUWQw==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-fPb5XnYK0k7SbR++HEmm4+ZqDszmLKQ+sPRUr8oQ/KNC0vy6r6hazJFe8iYozv4cqlHbvJ/JECkJWrfDodUMVQ==}
+
'@fontsource-variable/[email protected]':
resolution: {integrity: sha512-IHdzTvE8eGIXHteZql7KXoqdc3Gfm+Zs1u4XlSC3MeplkwviT3sx/P6gI0tLwg/xIYLF4ZJYveZ5V+bl9cnDwA==}
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-IoqGZSrVkaGXgD61IGkSOF0nTNmb8I4gyxZxpuHXCocAj4he5sL4oLWy1BmyiZiDv0pUeopaKQv9Q2Zpnse87Q==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-/l/4r0yyWK9JzAlmA0LiYgGgmJe/Gswt4jTJEzr5QhJfwMbvJZDmYWyW0M4X7yCK69BajMVlV/Lx8g7WDc1+sw==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-EMyoXnGC0uIbjyHDB01MTJoQuODsMo7Q/4XLEwN97YJEeV1WIVFI0QBiW2exGnxvhnMHb+IwQ9E5QZDgGMWCHw==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-aSV2k+V6Zz+od0dHpBOzkVxEzmgEdiXcxDfant39jLOx+T89dielQRrZylukwK3Fp+FY255gPqz67ruOfs1rqA==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-TxcGrNeylZZ3eL5WuNxvm1OLOMOrmYTRZcqMUoYhOfpcMgvE6PhssC6JGkPHhN93phU569RLD8cSykOjyHCuxg==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-RpYyF6G0h0nsVcCDLRIbZbK+l8cVDoe1PVbzvzVhtLzCiPqIEEGDs9xB9ZWPJawKS4bJzpKn42KgZFISF/AOuQ==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-h5r+KY/6qy8JEOj33JgcrFO81YAnvrc1EAwMpl/EPJLb2OIvOy0/jmB5M7qs7x/uXk5JUP5Ux4LrkeOK7faHkQ==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-eByKAjLM9td0qsXCOZhlUGfhsjen//epd6/cAJOg+o73RtYBijrI1jz+lTp2X0ebwTCLmKB1+Kt/QiRMgmNPTw==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-BoaaZiQf8fgtxv07KXkTwx1bKz/EoqIlTXq2OOKKXINxp6qXWdnlChqV+hSaDANS49yyUASFl3OVBMMDTCIHFA==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-yQUf8qle24MJYA+EuauyF+cqjjN6I715nGjitt3sGmwZA0XfA4fWJcLq1C/diREZl4Qzn1E80nLMc0ipC/a4Lg==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-FPdHvSi6cngE/DMVCm7Xlls70U0b4/NMJLlcAPvVoq6eot1X8tNOZMRc22Rh9KoAfmmBz7yjsSXvpsYmkhXXVQ==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-h8kHta4Z8SkfUGeI82TUy1n3rbrKpBRGwuk4t4qCwto5oEHxlbOFD2yGP+Df5fbmTXwKGn+o667vYp0E4K8Whw==}
+
'@fontsource-variable/[email protected]':
resolution: {integrity: sha512-9vch9WqxjaaA+1o9Ur8pOgIGbCYLjRReOUel23A6lOpD1syptgjtkORevvNmldJ5kGXQL29onQUqI5Ltz0s3bQ==}
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-2IxmvfB08i9vnGB3Ym/AXvhRE+8XOjWMXIyDum03c+tPwH0FUoMNQfGpU8NXPxjbws0Vvss3AH0Zqt4oJBBAdw==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-ea565Ncn4r7gPdBEHcmaF31V11hDfkL7b/JCklLobQbMfbu2ZZQrVWNgdeEFWFLqNh36yhieZWOgxdAnMTzrLg==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-riHbcRgoOhEdCwVw3n3R1JLEwvRD1N9GlXtBcwl/UJ2KabfyDBuryE2Yq10308QJgbXw3F/IFF+VoMuuqwVfIA==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-EYzMw2FGZXrR6oB7A3/pck3HY2ZjIGfoTFIZV5OsXexLu0nqPELuCmOoS7oQiQ6TkNjlQ3UgUIU24tNvxEKzcw==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-le8h/OIIuhm5Z7TdvuMw0yKg2gaCZUiMec8zaumsVVjzeJRBPEF0bQI/MkaZDHCVzZDvZoP/O2LiGOSfDLSbaw==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-voKCJEhGGZNdlk+OS3uFRSDV/HWbs6TAy7qKe9wXq96Uzwadfksyk5eyXLa1T5FkEazBgpHRMRSFBKfA3rbKbg==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-J/ANFZ7S9CbZClr/QhMjmBtpFmmKipVkEXHj20aurR5uqJPCBChVPJn1/kx6vtrwnfnDY0kQaYSTYasSt4GruA==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-OR1D5n124n2XRs66SbX7IjcOSptljEJE8FcDNnlni2y1/M6KpTx7cU2PIWzTSsBj4WFkHPw24On8qw3qkQZuTw==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-uezOgAlbhmf9nDW69VYq31lXNA+0uRFWXBGCSFWLXVcrNESFHpNjvu11kJss1PMsfH/YKz1hnnYB+JSNI/t+ew==}
+
'@fontsource/[email protected]':
resolution: {integrity: sha512-7EsTIQ+Blf96ktpzTUpI7msi+u9/AJxM/GZxOSkEubVd1jSTrFSTNxMgfpX/8rQsjZ+19a+qvRbtcTEp5J/72g==}
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-tSRpmWwkqrO9PCqo9wjA/99/5sLOIWm5cf51G3ooEHd8qZus8sVSSJoWp/7EvM5rIgZMjKRG6XtY9yeisKxE7g==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-RA7MmIx0v3eQ6Gcf74qLVLOwLB0GpPOzx+eU9iG/AmCnSJGcIWYeU8y6CEMGZ210MGwGg5CZhzLkkvyZdTTk1g==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-tGR0y6QObRtKv71MOth44222+mdNFM/ZWFWDV1VLzNbG4oK9PNRlyJzmkck4vHAi9ibHBXgt4SlY51amFP55CA==}
+
'@fontsource/[email protected]':
resolution: {integrity: sha512-nCxMEb9Bg9sjNWm9TIOsvHKDMLRUfEZPWpLgYu6m9KavZZVSA/WoHzI5wROwqA+eNwEi/PNBAcB5Co7HA3S0Cw==}
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-kDqkJFtvMErjajEeMXv6nyIW3t6UKb5usW+1/sQox9vA5q8dyMpAdAW9tU6+aIWo6xIQlatqNrfUlrBdJu6D4A==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-vKwbDE7yMrqfGxgFan+diPLwgWp9j4FGYaLm+OhUoqYO6Pr02QIi/p0KiTW0E/7uiXqfTd6cMj+/E4h2sc3Ocg==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-a5SW74ZAVTiGhu3Ml+rRvySYiW4kCXps+CTfPGIoEMbOl11Cy2xOF5UE2Pxlili4fGYrd/bAStaDFqbtEemx6A==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-ecRclUcYeto9fB7ghkB36H4MtUoaUYFjjornWYYeLCMHzaWEDPk2kIWgZOq0mKBNRxclRSieKcFeLonlMYDTKg==}
+
'@fontsource/[email protected]':
resolution: {integrity: sha512-VplwHpB8FLuzl+4G5LDci1b3Z4SghiuXH8XEgaxjnOb5aue5mEt1njmDKeO6iyLeGa73LffU7PC7hzncLRx0ZA==}
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-aYiPJnAwfvhHW1Yra+YPGdFvhvJhQax1wHb6aa6979ixPe51CspvxgZTJ8JNfIs3Gu7UcclUl6d2MuDnw1wsdg==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-vGvBRavw/y3aTCsz1uTNydQjCfRLGNOnSpmn/Qs3EZDqPAKBg6Id4OdHGnWLWXQ57IkzuNk/e9+KdMze+azOxA==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-bginDzMq4WhtYCcCR5O/WUh6mjXgZ17miwY4mSCR6+Z5iXaUGc71GuFHdFKsZBTO+9CZqRRfXaGtTSz4IIf29Q==}
+
'@fontsource/[email protected]':
resolution: {integrity: sha512-eTgnZjZEGk1QtD3ZstF+Vclo2HLAni8YMy34/DxllwZvyz1lR/1RF/xTiAquOBO7MvqBx8D2Ig2WCPMVfdZu7Q==}
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-mDiaIg0u67sYV59fie92Wz4sM8UiVlbL7fLxnFPCKkX15DMASEnQTREbaP5S5/3DCcsoAOcQ0sV9E4AeY4QqYQ==}
+
'@fontsource/[email protected]':
resolution: {integrity: sha512-RofMylZmjlJEfELXeNHFWBRcSs75rGU/6bV2S2jfnvv/3rPXPGe0LgUJTklcHZ9lM4OZmAVFhcJPnACfb91A3g==}
'@fontsource/[email protected]':
resolution: {integrity: sha512-fqDfB5I9f1p1TV486aUgB9t8zP84P0O1FtQR5Ol9vjwPy+S+EIGlVYm1cvj2W5shcZMTg2nZFdVMoH5wFu8a1A==}
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-FDkVoDfPDCSN/eO81FOYtUI67eMgpVBJmjBtAqSL0PmEhJyeFY2biC+CR+yEttksgXR9+swpFdYmQTyjwBq80Q==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-XrVxf5NWb8QLAEbQS2GYir3AY0WbOLr5Q80fWurnoFWXyc7CWvioGNPC2dxRGZKocMUXbwGhuK+sJqWkRLAWNA==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-0WhF/4rhrw+ErIyneKvhHn2YAl+xf8GDtllgOgOzDmeaSlLQtjpChXaQOpWhG2BchQW0WJy2zLV12Hdg0ndOMw==}
+
'@fontsource/[email protected]':
resolution: {integrity: sha512-gqedetX+UlaiJgLiPnOzWGB1sY3OtNhS8YMjTy2D73AcsagIqpdIizssr1MStcUYf3D/zzanECuXawIgMGZxDg==}
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-bNW3tD+m5pOsAQpW/NvtRbFthFe+B73hDJK2DLLCFCtF+1p+UMBgo7ibxdcb9Sftr06LKAVbt080wiMdSqGbOg==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-OaFm4okm77XoGA9jp1J89tDjdWlzb68yJCUL7LV75QxUWF/qOBRVqmhP7XFFsgcn/PL+nc2dPvRGT/8yit5LZg==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-lCcBJb+LWZpYCVtGvQRiZPy5/EaGPuYLycpJXUIOz28EYGGqhTVWBRqY6ucaW8l1F8gvfjutY1PoAPUrFiP0wg==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-wCtuVkExxmKeW0FngmKVTcCK9T0elvjoP4/ZZaINqsUjlk9CB17Rr9FQ6pIDlN4nzouDMGSuqYvge3VoKqslPA==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-3p0aUEYOFBa4mvHIRDksZZ9Uf35jQdq5mpwp6NZHiNYt/jDj/g83OwTAWjzy+9ZJAxYC9NLLobIKuW1BEcnv0Q==}
+
'@fontsource/[email protected]':
resolution: {integrity: sha512-iQPDtZOnmM5ih4JBGaMSXisRap0ixb9bAUw2hDtY7EjVfaqiiNlKtVuJl9XclxUwtwMMHNcWXfQR6zI9x05+Tg==}
@@ -2616,12 +3156,45 @@ packages:
'@fontsource/[email protected]':
resolution: {integrity: sha512-0AVHzTTVJSxWDOxPKSfMeHhZeBFDU3cmgrcOb76ZEyhGo0+xgyG3GsLF3h9+X8w0IX7G4jzjJgFQEBiWdX6VgA==}
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-bWv0fHR1n36p7scRn+maaEaVeQCOq9yvfVfjyAeUzKrK4Y/3qiRAEj4hJgfxj/sjgZZGkeHyKPrbWdDaZtpCVw==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-V8C38IlIFfdWg0Xtri3F7sLCVpm069rUwn6w4n+oyn38gt7H4arOJmuReg3tAw1Q6jHqZp89wTnAAJagq4Atxw==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-ZO/NtYW4SCc/iY8N3dmjWyDITcXJ/vhWZFgnwRcvzwCKKnScMrM/a2/6VHlsjCVuIgmPzNrCFbedEYhv+/jJBg==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-ilhy4l5apzyDkfuKb7PZBUT5Sf6nfxucdXT5TQ0wQDyWtDPlouLy1lQq3lMEPk1lPsHHVrd11EkPnEG8FqDgUA==}
+
'@fontsource/[email protected]':
resolution: {integrity: sha512-cms1nM7U6SN8epIV1WMVOV8VsA645aSm3wHfzIQnkk188U341ThbJGSl2Sv54V29gnDbT2arMPfLzvVIIVCceQ==}
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-xr3w0E1jtc7xoXLfgJrcaKqWjvh5XiAAthVLrl9v9HKC7TfwMy3nARytetfi2GIgo51+aWsEJ51Uyd3XEXbj/A==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-dQ+Cy85XdwYnwlzWcbkmA2Qkpxam0ZHDaGm/qoGHlyHKRVgM/BJN8RLHpRm31R0REFBQe5Yl8Ke5oTdpcKdPIA==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-3dvv0i8/ZwLMY08AAlTLivHUdNQYB6Fxe92d7BZiGbHY2GQnCxEd8JC9CBzxTiP4iyWNa6OZn9LXF+xjc9LaGw==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-nhIm4HgWq6AsM9Sg32OrsC298avDiDhqoMRMYpv5T5OSCIpAwPXpnIgJYJVLzkSC9hOqhKxX5NGZ2ViaDM+7MQ==}
+
'@fontsource/[email protected]':
resolution: {integrity: sha512-FrpBMOVWn3PRdRHlrZWC55X3kZG/2BTH7SM5ZyS/bky3iKya2BturI5lk+t0RoDQL2JyHzURsVq/EisCsxpI5A==}
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-jn4vpQ6QSVEckUn7uk5a9XcZMxEksTRqljmeE1VKRGMjGd6VoXdMyLGSdnTXSVwZLCCEHaIcm/2cdQuwvasJ9w==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-6/ld8x/knq1NjDQxLSyg9pDnBPOmtWDb30ZTFk+n8OxfkBoUvPAxh3aV/6+UFGmA5CekJfcgpUwd2/x/weLvSQ==}
+
+ '@fontsource/[email protected]':
+ resolution: {integrity: sha512-iRuUPl9ONFbYzi6JcEshpE4VedINyzQ4hv0Z5XEt0cB0pMPiQeqc2Qvv1NwJCNzkPwG02VCdcO+cF2K8ylYn2A==}
+
'@google/[email protected]':
resolution: {integrity: sha512-gwSvbpiN/17O9TbsqSsE/OzZcpv5Fo4RQjdngGgogtuB9RsyJ8ZHhX5KjHj1bp5N9snN2eK8LDGXSaWW2hof8Q==}
engines: {node: '>=20.0.0'}
@@ -2837,6 +3410,9 @@ packages:
cpu: [x64]
os: [win32]
+ '@infolektuell/[email protected]':
+ resolution: {integrity: sha512-B6kpvqeD0ukTR7sydGKpktvO3VhZkOwQxAdLLGPdSHxQxREa2+sH6B9ODop6quPGjhmsZkJ/hL01rQ8At5xDew==}
+
'@isaacs/[email protected]':
resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==}
engines: {node: '>=18.0.0'}
@@ -4780,38 +5356,204 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
'@fontsource-variable/[email protected]': {}
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
'@fontsource-variable/[email protected]': {}
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
'@fontsource-variable/[email protected]': {}
+ '@fontsource-variable/[email protected]': {}
+
'@fontsource-variable/[email protected]': {}
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
'@fontsource-variable/[email protected]': {}
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
'@fontsource-variable/[email protected]': {}
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
'@fontsource-variable/[email protected]': {}
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
'@fontsource-variable/[email protected]': {}
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
'@fontsource-variable/[email protected]': {}
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
'@fontsource/[email protected]': {}
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
'@fontsource/[email protected]': {}
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
'@fontsource/[email protected]': {}
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
'@fontsource/[email protected]': {}
+ '@fontsource/[email protected]': {}
+
'@fontsource/[email protected]': {}
'@fontsource/[email protected]': {}
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
'@fontsource/[email protected]': {}
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
'@fontsource/[email protected]': {}
'@fontsource/[email protected]': {}
@@ -4820,10 +5562,32 @@ snapshots:
'@fontsource/[email protected]': {}
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
'@fontsource/[email protected]': {}
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
'@fontsource/[email protected]': {}
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
+ '@fontsource/[email protected]': {}
+
'@google/[email protected]':
dependencies:
google-auth-library: 10.9.1
@@ -5066,6 +5830,8 @@ snapshots:
optional: true
+ '@infolektuell/[email protected]': {}
+
'@isaacs/[email protected]':
dependencies:
minipass: 7.1.3
diff --git a/spec/caption-fine.md b/spec/caption-fine.md
index 3ce26d45..77678dd1 100644
--- a/spec/caption-fine.md
+++ b/spec/caption-fine.md
@@ -31,8 +31,10 @@ Composition, Visual IR or Core while their existing public contracts can express
## Complete orthogonal surface
-The complete restrained family has these independent dimensions. Properties not listed here are
-not deferred accidents: they are deliberate non-goals for this family.
+Fine owns one single-font Cue/Atom layout tree. Its dimensions are independent: a Recipe may combine
+gradient glyphs, a current-word box, trail text, an underline and local motion without selecting a
+different renderer. A new package is warranted only when a look changes the layout tree or requires
+planner fields—for example dual-font editorial layout—not when it merely adds Paint or local motion.
### 1. Cue planning
@@ -61,40 +63,58 @@ must be a separately connected component whose failure is explicit in the graph.
### 3. Typography
- `font`, `weight`, `size`, `font-style: normal | italic | oblique`
+- `text-transform: none | uppercase | lowercase`
+
+Text transform is terminal presentation only. It never changes `CaptionDisplaySequence`, planner
+input, Word/Atom identity, speech correspondence or timing.
The Recipe's `font` property is a readable family label and an environment fallback. For a
reproducible build the author imports exact installed faces from `@narratage/fonts-open`, or declares
-custom/brand bytes with `<media:Font>`. The primary face passes through `font=`; ordered
-`<caption-fine:Fallback>` children add CJK, emoji or other glyph coverage:
+custom/brand bytes with `<media:Font>`. `font=` accepts one exact face with ordered Style-owned
+Fallback children, or one reusable generic `FontStackRef`. The compact open-font path is:
```svml
-<caption-fine:Style id="primary" recipe={studio.caption.primary} font={latin}>
- <caption-fine:Fallback font={cjk}/>
- <caption-fine:Fallback font={symbols}/>
-</caption-fine:Style>
+<fonts:Stack id="caption-fonts" family="inter" weight="700" style="normal" emoji="color">
+ <fonts:Fallback family="noto-sans-sc" weight="700" style="normal"/>
+</fonts:Stack>
+<caption-fine:Style id="primary" recipe={studio.caption.primary} font={caption-fonts}/>
```
The primary face must declare the Recipe's exact weight/style. A fallback preserves its own honest
face metadata—for example a 700-weight Latin primary may use a 400-weight symbol fallback. Exact
duplicate faces are rejected. One logical face may contain several content-addressed Unicode-range
-sources, as the installed CJK and emoji fonts do. Fine puts this ordered `FontArtifactRef` stack only
+sources, as the installed CJK and Emoji fonts do. Fine expands `FontStackRef` into the same ordered
+exact faces and puts them only
on its terminal text elements; Caption, Core and unrelated graph values remain unchanged. Omitting
`font=` is an explicit environment-bound prototype path, not a Runtime font-selection policy.
CJK speech may be authored directly. A display-only emoji still needs explicit speech
correspondence, for example `<🌐 | globe>`; Script correctly refuses to invent a spoken token for a
-bare symbol. This is timing truth, not a font limitation.
+bare symbol. A character with both text and Emoji presentation uses the exact authored Unicode
+sequence (for example `☎️` with VS16); no lowerer rewrites display text to force color. This is
+timing and text truth, not a font limitation.
-### 4. Base glyph Paint
+### 4. Base and active glyph Paint
-- solid `fill` and `opacity`
+- solid `fill`, or `gradient-from`, `gradient-to`, `gradient-angle`
+- `opacity`
- one outline: `stroke-color`, `stroke-width`
-- one shadow: color, opacity, x/y offset and blur
-- one glow: color, opacity and blur
-
-Shadow and glow are two independently authored contributions lowered into one deterministic
-`text-shadow` declaration. Multiple arbitrary layers, textures, gradients, bevel, extrusion and
-long-shadow generators are outside this restrained family.
+- one shadow: `shadow-color`, `shadow-opacity`, `shadow-x`, `shadow-y`, `shadow-blur`
+- one bounded directional long shadow: `long-shadow-color`, `long-shadow-opacity`,
+ `long-shadow-distance`, `long-shadow-angle`
+- one glow: `glow-color`, `glow-opacity`, `glow-blur`
+- one base underline: `underline: off | always`, `underline-color`, `underline-thickness`,
+ `underline-offset`
+
+Every active Paint name uses the `active-` prefix. For example `active-gradient-from`,
+`active-long-shadow-distance` and `active-glow-blur` describe the active glyph without changing
+the base glyph.
+
+Base and active Paint have the same shape. A gradient replaces the solid fill for that layer; it
+does not replace the active overlay or the karaoke transition. Drop shadow, long shadow and glow are
+independent authored contributions lowered into one deterministic `text-shadow` declaration. Long
+shadow expansion is implementation-bounded, so one Recipe cannot create an unbounded CSS payload.
+Multiple arbitrary shadow layers, textures, bevel and free-form extrusion remain outside Fine.
### 5. Cue box Paint
@@ -105,29 +125,50 @@ long-shadow generators are outside this restrained family.
Backdrop sampling is forbidden because it would make this Track inspect another Track's pixels.
-### 6. Karaoke Paint and timing
+### 6. Activation channels, karaoke Paint and timing
-- `karaoke: off | current | trail`
-- `karaoke-transition: step | wipe`
-- a complete active glyph Paint with the same fill/opacity/stroke/shadow/glow shape as base Paint
+- active glyph state: `karaoke: off | current | trail`
+- active glyph transition: `karaoke-transition: step | wipe`
+- active box state: `active-box: off | current | trail`
+- active box continuity: `active-box-continuity: isolated | joined`
+- active box Paint: `active-box-background`, border, padding and radius
+- active box motion: `active-box-enter`, `active-box-exit`, `active-box-transition-frames`
+- active underline state: `active-underline: off | current | trail`, plus color, thickness and offset
-`current` activates only the Atom whose measured window contains the frame. `trail` retains every
-activated Atom through the end of the Cue. `step` swaps the whole Atom; `wipe` reveals its active
-layer across that Atom's measured window. RTL reverses the wipe direction.
+Activation state and decoration geometry are deliberately separate. `current` activates only the
+Atom whose measured window contains the frame. `trail` retains every activated Atom through the end
+of the Cue. `step` swaps the whole active glyph layer; `wipe` reveals it across the Atom's measured
+window. RTL reverses the wipe direction. Glyphs, boxes and underlines may choose different state
+policies, so the old Twinit behavior—trail text with a current-only pill—is directly expressible.
+
+An isolated box paints one box per activated Atom. A joined trail paints the one ordered activated
+prefix as continuous inline fragments: atoms on the same rendered line share one background, while
+each wrapped line receives its own end caps. Browser line layout, not upstream metadata, determines
+the fragments. Fine never propagates measured line boxes through the graph.
Karaoke is deliberately Atom-grained. In ordinary text an Atom is normally one visible Word. In
`<45% | forty five percent>` the authored visible `45%` is one Atom and activates as one unit. In a
multi-word display Atom, the whole authored Atom activates together. No downstream package invents
internal Word timestamps that the author and audio evidence never supplied.
-### 7. Restrained local motion
+### 7. Layered local motion
+
+- Cue enter/exit: `none | fade | pop | spring | slide-left | slide-right | slide-up | slide-down | blur-in`
+- Atom entry: the same one-shot vocabulary
+- Atom reveal: `all | on-start | typewriter`
+- active response: `none | scale | pop | spring`
+- active-box enter/exit: `none | fade | pop`
+- continuous local loop: `none | shake | wobble | glow-pulse`, targeted at the Cue or active Atom
-- Cue enter/exit: `none | fade`, with one frame duration
-- Atom reveal: `all | on-start`
-- active Atom scale
+The flat Recipe names are `cue-enter`, `cue-exit`, their independent `*-frames`; `atom-enter`,
+`atom-enter-frames`, `atom-reveal`; `active-response`, `active-response-frames`, `active-scale`;
+`slide-distance`; and `loop`, `loop-target`, `loop-period-frames`, `loop-intensity`.
-These motions affect only Fine's own elements. Typewriter, bounce, rotation, path motion and random
-variation are intentionally excluded until a concrete reusable style needs them.
+Cue, Atom entry, active response and loop own separate wrappers, so their transforms compose instead
+of overwriting one another. Typewriter reveals authored display graphemes inside a whole Atom; it is
+visual interpolation, not a claim of character timestamps and never changes Atom boundaries.
+Continuous motion is a bounded deterministic frame function with no random input. Bounce, arbitrary
+rotation, path motion and random variation remain outside Fine.
## One renderer, one layout tree
@@ -135,16 +176,20 @@ Static and karaoke output share this structure:
```text
placement
-└── cue box
- ├── atom
- │ ├── base words
- │ └── active overlay (only when karaoke is enabled)
- │ └── active words
- └── atom ...
+└── cue motion
+ └── cue box
+ ├── joined/isolated decoration underlay
+ └── cue loop
+ └── atom entry
+ └── active response
+ ├── base words
+ └── active glyph/underline overlay
```
-The active overlay reuses the same Atom geometry; karaoke does not fork a second DOM renderer.
-Every animation lowers to frame-addressed `VisualTrack` keyframes before HyperFrames sees it.
+The decoration underlay repeats only the same transparent glyph geometry required to obtain honest
+browser line fragments. It does not create another text truth. Active overlays reuse the same Atom
+geometry. Every animation lowers to finite frame-addressed `VisualTrack` keyframes before
+HyperFrames sees it.
## Defaults and compatibility
@@ -153,8 +198,11 @@ planning, geometry, typography and its visible box. New dimensions are optional
complete immutable parameter object:
- top-left anchor, LTR, normal font, zero letter spacing and a one-quarter-em word gap;
-- no stroke, shadow, glow or border;
-- karaoke off, Cue motion off, all Atoms visible, scale 1;
+- no stroke, shadow, long shadow, glow, underline or border;
+- solid fill, text transform none;
+- active glyph, active box and active underline off;
+- Cue/Atom/box motion and loops off, all Atoms visible; active response scale defaults to 1.08 when
+ that response channel is enabled;
- when karaoke is enabled without another active Paint, active fill defaults to `#FFD54A` and the
other active Paint dimensions inherit base Paint.
@@ -170,8 +218,12 @@ The complete design was delivered progressively rather than as incompatible vers
2. **Timed lowering** — current/trail, step/wipe, Cue fades, Atom reveal and active scale using only
proven whole-Atom time.
3. **Reproducibility evidence** — an ordered exact Font Artifact stack, CJK, emoji/symbol fallback,
- multiline wrapping, outline, shadow, glow and all four karaoke modes have real browser/pixel
+ multiline wrapping, outline, shadow, glow and all four glyph karaoke modes have real browser/pixel
witnesses. `max-lines` was deliberately rejected rather than deferred.
+4. **Expressive Paint and motion evidence** — current-only and trail boxes, isolated and joined
+ geometry, gradient, underline, long shadow, text transform, layered one-shot motion, typewriter
+ reveal and deterministic loops each have a terminal-IR witness; joined geometry additionally has
+ a real wrapped browser/pixel witness.
No gate changes Core or common Caption. Exact font selection is an explicit author-graph reference
between the Media Font Surface and the Fine Style Surface, not metadata propagated through the
diff --git a/spec/caption-program.md b/spec/caption-program.md
index b7bd1764..7f2fec2b 100644
--- a/spec/caption-program.md
+++ b/spec/caption-program.md
@@ -144,9 +144,10 @@ Each timed Cue selects the complete rendering payload of its resolved Style. One
renderer returns one ordinary `VisualTrack`. In the first contract, all Styles in one Program use
the same rendering family.
-`@narratage/caption-fine` is the first official family. It declares no fields and owns restrained
-uniform Cue appearance plus optional whole-Atom karaoke. Another package may define field-dependent
-paint without modifying Script, Caption, Composition or Core.
+`@narratage/caption-fine` is the first official family. It declares no fields and owns one
+orthogonal single-font layout/Paint/motion system, including independent whole-Atom glyph,
+underline and Pill activation. Another package may define a different layout tree or field-dependent
+Paint without modifying Script, Caption, Composition or Core.
Film does not recognize Caption specially. It folds the resulting peer Track beside Speech,
B-roll, Text and third-party Tracks.
diff --git a/spec/track-expressiveness.md b/spec/track-expressiveness.md
index 518171e2..d6a24085 100644
--- a/spec/track-expressiveness.md
+++ b/spec/track-expressiveness.md
@@ -124,7 +124,8 @@ executable rather than package-family patches:
`packages/hyperframes/test/browser-visual.test.ts` additionally drives real Hyperframes browser
frames: installed content-addressed open fonts paint Latin, CJK and emoji/symbol glyphs through an ordered fallback
-stack; Fine Caption proves multiline wrapping, outline/shadow/glow and every karaoke mode; and a
+stack; Fine Caption proves multiline wrapping, full glyph Paint, every glyph karaoke mode and joined
+trail Pill line geometry; and a
50% straight-alpha PNG composites over a blue Track at the expected pixel values. This opt-in host
test is run with `SVML_BROWSER_TESTS=1`; it proves the current local renderer path, not every future
hosted Runtime.