@nowline/renderer 0.0.0-dev.20261020011950.gce8a91f → 0.0.0-dev.20261020015516.g0053ade

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -18,7 +18,7 @@ import type { FontFamilies, RenderOptions } from './render.js';
18
18
  * 3. `icon.kind === 'builtin'` and `name` ∈ {person, people, points,
19
19
  * time}: paint the number as `<text>`, then drop the curated SVG
20
20
  * icon at `x0` plus `iconDxTerms` (layout's `capacityIconDxTerms`:
21
- * the number's estimated width and a `0.1em` gap, sized to one em). The
21
+ * the number's estimated width and a `0.25em` gap, sized to one em). The
22
22
  * icon's `style="color:..."` propagates through the
23
23
  * `currentColor`-bound paths in the icon library.
24
24
  * 4. `icon.kind === 'literal'` (inline Unicode literal or
@@ -1 +1 @@
1
- {"version":3,"file":"item.d.ts","sourceRoot":"","sources":["../../src/svg/item.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AA0BhG,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAgB/D;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,oBAAoB,CAChC,QAAQ,EAAE,kBAAkB,EAC5B,EAAE,EAAE,MAAM,EACV,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,GACd,MAAM,CA0CR;AA0HD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAG7F;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,SAAS,GAAG,OAAO,CAEtE;AAsYD,wBAAgB,UAAU,CACtB,CAAC,EAAE,cAAc,EACjB,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,KAAK,EACd,KAAK,EAAE,YAAY,GACpB,MAAM,CAiBR"}
1
+ {"version":3,"file":"item.d.ts","sourceRoot":"","sources":["../../src/svg/item.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AA0BhG,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAgB/D;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,oBAAoB,CAChC,QAAQ,EAAE,kBAAkB,EAC5B,EAAE,EAAE,MAAM,EACV,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,GACd,MAAM,CA0CR;AA8HD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAG7F;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,SAAS,GAAG,OAAO,CAEtE;AAsYD,wBAAgB,UAAU,CACtB,CAAC,EAAE,cAAc,EACjB,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,KAAK,EACd,KAAK,EAAE,YAAY,GACpB,MAAM,CAiBR"}
package/dist/svg/item.js CHANGED
@@ -37,7 +37,7 @@ function iconXFrom(x0, capacity) {
37
37
  * 3. `icon.kind === 'builtin'` and `name` ∈ {person, people, points,
38
38
  * time}: paint the number as `<text>`, then drop the curated SVG
39
39
  * icon at `x0` plus `iconDxTerms` (layout's `capacityIconDxTerms`:
40
- * the number's estimated width and a `0.1em` gap, sized to one em). The
40
+ * the number's estimated width and a `0.25em` gap, sized to one em). The
41
41
  * icon's `style="color:..."` propagates through the
42
42
  * `currentColor`-bound paths in the icon library.
43
43
  * 4. `icon.kind === 'literal'` (inline Unicode literal or
@@ -100,9 +100,9 @@ export function renderCapacitySuffix(capacity, x0, baselineY, fontSize, fontFami
100
100
  * regardless of how wide metaText actually rendered.
101
101
  *
102
102
  * Built-in SVG icons (person/people/points/time) still need an `<svg>`
103
- * sibling outside `<text>`; layout places the icon (`capacity.iconDxTerms`,
104
- * from `capacityIconDxTerms` at its tighter `META_ICON_EM_PER_CHAR` estimate),
105
- * which still lands inside its own pessimistic spill reservation.
103
+ * sibling outside `<text>`, so their number leaves the flow too: layout's
104
+ * `capacity.iconDxTerms` (from `capacityIconDxTerms`) place both the number
105
+ * and the icon, inside the suffix's spill reservation.
106
106
  */
107
107
  function renderItemMetaLine(opts) {
108
108
  const { metaText, capacity, x, baselineY, fontSize, fontFamily, color } = opts;
@@ -143,18 +143,23 @@ function renderItemMetaLine(opts) {
143
143
  `<tspan dx="${glyphDx}">${escText(icon.text)}</tspan>` +
144
144
  '</text>');
145
145
  }
146
- // Built-in SVG icon — text element holds metaText + tspan-separated
147
- // number, then the icon SVG sits where layout placed it, at a tighter
148
- // per-character estimate than its spill detector so the icon visually
149
- // hugs the number.
146
+ // Built-in SVG icon: the number is NOT flowed after metaText, because
147
+ // the icon's x can only come from layout's estimates; a number drawn
148
+ // after the real metaText sits wherever the font put it, and the icon
149
+ // landed on it. Paint metaText, then the number and the icon both where
150
+ // layout's `iconDxTerms` place them, so they agree as on a lane badge.
151
+ const terms = capacity.iconDxTerms ?? [];
152
+ let numberX = x;
153
+ for (const term of terms.slice(0, 2))
154
+ numberX += term;
150
155
  const def = CAPACITY_ICON_SVG[icon.name];
151
156
  const iconSize = fontSize;
152
157
  const iconX = iconXFrom(x, capacity);
153
158
  const iconY = baselineY - fontSize * 0.85;
154
159
  const textPart = openText +
155
160
  escText(metaText) +
156
- `<tspan dx="${sepDx}">${escText(numberStr)}</tspan>` +
157
- '</text>';
161
+ '</text>' +
162
+ textTag({ x: num(numberX), y: num(baselineY), ...baseAttrs }, numberStr);
158
163
  const iconPart = `<svg x="${num(iconX)}" y="${num(iconY)}" width="${num(iconSize)}" height="${num(iconSize)}" viewBox="${def.viewBox}" style="color:${escAttr(color)}" aria-hidden="true">${def.body}</svg>`;
159
164
  return textPart + iconPart;
160
165
  }
@@ -344,9 +349,9 @@ function renderItemCaption(i, captionX, palette, fonts) {
344
349
  // For pure-text suffixes (multiplier, literal glyph, no glyph) the
345
350
  // unified path emits a single `<text>` element with `<tspan dx>`
346
351
  // for the gap so the suffix hugs the metaText regardless of how
347
- // wide it actually rendered. Built-in SVG icon glyphs still emit a
348
- // sibling `<svg>` but at a tighter offset than the legacy two-text
349
- // path. See `renderItemMetaLine` for the full case-by-case.
352
+ // wide it actually rendered. Built-in SVG icon glyphs emit their
353
+ // number and a sibling `<svg>` where layout placed them. See
354
+ // `renderItemMetaLine` for the full case-by-case.
350
355
  if (i.metaText || i.capacity) {
351
356
  parts.push(renderItemMetaLine({
352
357
  metaText: i.metaText,
@@ -1 +1 @@
1
- {"version":3,"file":"item.js","sourceRoot":"","sources":["../../src/svg/item.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"item.js","sourceRoot":"","sources":["../../src/svg/item.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nowline/renderer",
3
- "version": "0.0.0-dev.20261020011950.gce8a91f",
3
+ "version": "0.0.0-dev.20261020015516.g0053ade",
4
4
  "description": "Nowline renderer — draws a laid-out roadmap as an SVG image.",
5
5
  "license": "Apache-2.0",
6
6
  "engines": {
@@ -22,8 +22,8 @@
22
22
  "src/"
23
23
  ],
24
24
  "dependencies": {
25
- "@nowline/core": "0.0.0-dev.20261020011950.gce8a91f",
26
- "@nowline/layout": "0.0.0-dev.20261020011950.gce8a91f",
25
+ "@nowline/core": "0.0.0-dev.20261020015516.g0053ade",
26
+ "@nowline/layout": "0.0.0-dev.20261020015516.g0053ade",
27
27
  "langium": "~4.4.0"
28
28
  },
29
29
  "devDependencies": {
package/src/svg/item.ts CHANGED
@@ -63,7 +63,7 @@ function iconXFrom(x0: number, capacity: PositionedCapacity): number {
63
63
  * 3. `icon.kind === 'builtin'` and `name` ∈ {person, people, points,
64
64
  * time}: paint the number as `<text>`, then drop the curated SVG
65
65
  * icon at `x0` plus `iconDxTerms` (layout's `capacityIconDxTerms`:
66
- * the number's estimated width and a `0.1em` gap, sized to one em). The
66
+ * the number's estimated width and a `0.25em` gap, sized to one em). The
67
67
  * icon's `style="color:..."` propagates through the
68
68
  * `currentColor`-bound paths in the icon library.
69
69
  * 4. `icon.kind === 'literal'` (inline Unicode literal or
@@ -140,9 +140,9 @@ export function renderCapacitySuffix(
140
140
  * regardless of how wide metaText actually rendered.
141
141
  *
142
142
  * Built-in SVG icons (person/people/points/time) still need an `<svg>`
143
- * sibling outside `<text>`; layout places the icon (`capacity.iconDxTerms`,
144
- * from `capacityIconDxTerms` at its tighter `META_ICON_EM_PER_CHAR` estimate),
145
- * which still lands inside its own pessimistic spill reservation.
143
+ * sibling outside `<text>`, so their number leaves the flow too: layout's
144
+ * `capacity.iconDxTerms` (from `capacityIconDxTerms`) place both the number
145
+ * and the icon, inside the suffix's spill reservation.
146
146
  */
147
147
  function renderItemMetaLine(opts: {
148
148
  metaText: string | undefined;
@@ -197,10 +197,14 @@ function renderItemMetaLine(opts: {
197
197
  '</text>'
198
198
  );
199
199
  }
200
- // Built-in SVG icon — text element holds metaText + tspan-separated
201
- // number, then the icon SVG sits where layout placed it, at a tighter
202
- // per-character estimate than its spill detector so the icon visually
203
- // hugs the number.
200
+ // Built-in SVG icon: the number is NOT flowed after metaText, because
201
+ // the icon's x can only come from layout's estimates; a number drawn
202
+ // after the real metaText sits wherever the font put it, and the icon
203
+ // landed on it. Paint metaText, then the number and the icon both where
204
+ // layout's `iconDxTerms` place them, so they agree as on a lane badge.
205
+ const terms = capacity.iconDxTerms ?? [];
206
+ let numberX = x;
207
+ for (const term of terms.slice(0, 2)) numberX += term;
204
208
  const def = CAPACITY_ICON_SVG[icon.name];
205
209
  const iconSize = fontSize;
206
210
  const iconX = iconXFrom(x, capacity);
@@ -208,8 +212,8 @@ function renderItemMetaLine(opts: {
208
212
  const textPart =
209
213
  openText +
210
214
  escText(metaText) +
211
- `<tspan dx="${sepDx}">${escText(numberStr)}</tspan>` +
212
- '</text>';
215
+ '</text>' +
216
+ textTag({ x: num(numberX), y: num(baselineY), ...baseAttrs }, numberStr);
213
217
  const iconPart = `<svg x="${num(iconX)}" y="${num(iconY)}" width="${num(iconSize)}" height="${num(iconSize)}" viewBox="${def.viewBox}" style="color:${escAttr(color)}" aria-hidden="true">${def.body}</svg>`;
214
218
  return textPart + iconPart;
215
219
  }
@@ -424,9 +428,9 @@ function renderItemCaption(
424
428
  // For pure-text suffixes (multiplier, literal glyph, no glyph) the
425
429
  // unified path emits a single `<text>` element with `<tspan dx>`
426
430
  // for the gap so the suffix hugs the metaText regardless of how
427
- // wide it actually rendered. Built-in SVG icon glyphs still emit a
428
- // sibling `<svg>` but at a tighter offset than the legacy two-text
429
- // path. See `renderItemMetaLine` for the full case-by-case.
431
+ // wide it actually rendered. Built-in SVG icon glyphs emit their
432
+ // number and a sibling `<svg>` where layout placed them. See
433
+ // `renderItemMetaLine` for the full case-by-case.
430
434
  if (i.metaText || i.capacity) {
431
435
  parts.push(
432
436
  renderItemMetaLine({