@overpunch/vf-clamp 2.2.0 → 2.3.0

package/README.md

@@ -19,7 +19,7 @@ npm install @overpunch/vf-clamp
 | A type designer or foundry | [For type designers](#for-type-designers) — plugins for Glyphs and RoboFont, no code |
 | Building a storefront's fulfilment step | [Selling named styles safely](#selling-named-styles-safely) and the [REST API](#rest-api) |
 | A web developer trimming fonts | [Quickstart](#quickstart) |
-| Curious why this matters | The talk and paper, [*Sell the Styles, Ship the Space*](https://vfclamp.com/talk/paper) |
+| Curious why this matters | The talk and paper, [*Sell the Styles, Ship the Space*](https://vfclamp.com/paper) |
 
 ---
 
@@ -31,7 +31,7 @@ Takes a variable font (TTF, OTF, WOFF, or WOFF2) and produces one restricted var
 
 ## For foundries
 
-A variable font is usually all-or-nothing: customers buy the whole family to get one, or they buy statics and lose interpolation. A survey of 394 foundries found 22 that sell subfamily variable fonts and none that scope one to the styles a customer bought ([paper](https://vfclamp.com/talk/paper), [data](https://vfclamp.com/talk/data)). vf-clamp adds the tier in between — a variable font scoped to exactly the named instances a customer purchased, generated and delivered at checkout.
+A variable font is usually all-or-nothing: customers buy the whole family to get one, or they buy statics and lose interpolation. A survey of 394 foundries found 22 that sell subfamily variable fonts and none that scope one to the styles a customer bought ([paper](https://vfclamp.com/paper), [data](https://vfclamp.com/paper/data)). vf-clamp adds the tier in between — a variable font scoped to exactly the named instances a customer purchased, generated and delivered at checkout.
 
 **Purchase → Clamp → Deliver.** A customer buys two or more adjacent styles ([`planOutputs`](#selling-named-styles-safely) splits any other selection so no unbought style is handed over); your store POSTs the order to the [REST API](#rest-api); a scoped VF comes back in seconds with its name table rewritten to the purchased range, in the format the licence calls for.
 
@@ -39,7 +39,7 @@ Why it matters:
 
 - **A new revenue tier** — two adjacent styles become a variable purchase, not just two statics. Price a ladder: two-style VF → subfamily → full family.
 - **Licence scope you can see** — a full VF exposes every weight, including ones the customer never paid for. A clamped VF's axes, named instances and STAT entries stop at the purchased range, so the file matches the invoice. (A determined user could still extrapolate simple two-master designs past the range; the licence's terms do the enforcing.)
-- **Named for the purchase** — the name table (family, full name, PostScript name) is rewritten to the purchased range, so the file is identifiable as that range. It does not identify the order: the unique ID (name ID 3) is rewritten to `version;PostScriptName;family`, which is the same for every buyer of that range, so add a watermark or per-order ID at fulfilment if you need tracing.
+- **Named for the purchase** — the name table (family, full name, PostScript name) is rewritten to the purchased range, so the file is identifiable as that range. It does not identify the order: the unique ID (name ID 3) is rewritten to `version;PostScriptName;family`, which depends only on the output name and is the same for every buyer of that range, so add a watermark or per-order ID at fulfilment if you need tracing.
 - **Lighter files for the web** — a site that uses only Medium–Black shouldn't ship Thin–Light deadweight. Clamping drops the variation data outside the licensed range: variation across what they bought, at a smaller download — from two styles up, smaller than the statics themselves (see below).
 - **Sell bespoke cuts** — pin an axis to a coordinate that was never a named instance (a custom optical size or width) and sell that exact cut, without shipping it in the retail family.
 - **Ready for `opsz` demand** — browsers drive the optical-size axis automatically via `font-optical-sizing: auto`, keyed off the rendered point size. Delivering `opsz` clamped to a usable range keeps files small as that axis matters more.
@@ -54,7 +54,7 @@ The npm package, CLI, and editor plugins all share the same axis-constraint mode
 
 Pinning an axis outright (e.g. a fixed width or optical size) removes that axis and its variation data entirely and saves more.
 
-Against the static files a two-style buyer would otherwise get (Inter 4, fontTools instancer, WOFF2, October 2026 — [method](https://vfclamp.com/talk/paper#method)):
+Against the static files a two-style buyer would otherwise get (Inter 4, fontTools instancer, WOFF2, October 2026 — [method](https://vfclamp.com/paper#method)):
 
 | Inter, Regular + Bold | Two statics | Clamped VF (wght 400–700, opsz pinned) |
 |---|---|---|
@@ -70,7 +70,7 @@ You don't need to write code:
 - **Glyphs.app or RoboFont** — install the [Glyphs plugin](https://github.com/over-punch/vf-clamp-glyphs#installation) or [RoboFont extension](https://github.com/over-punch/vf-clamp-robofont) (install steps are in each repo's README; screenshots on [vfclamp.com](https://vfclamp.com/integrations/glyphs-robofont)). Open your source or any exported variable font, tick the named instances a customer licensed, and export: the plugin names the file for the range (e.g. *Encode Sans Light-Bold*) and writes TTF, OTF, WOFF or WOFF2. Doing this automatically at checkout needs the [REST API](#rest-api) or the npm package, which means a developer.
 - **Try it in a browser** — the [demo at vfclamp.com](https://vfclamp.com) loads Encode Sans or any variable font you drop in, lets you pick styles as if placing an order, and downloads the result.
 - **What your customer sees** — on macOS (CoreText, which Pages and Keynote use), a file clamped to Regular–Bold lists Regular, Medium, SemiBold and Bold in the font menu, with a 400–700 weight axis; apps with sliders (InDesign, Figma) show a 400–700 slider. Word on Windows is not yet tested. Ship the statics alongside — many apps still prefer them.
-- **Licensing** — most licences don't mention variable fonts yet. The paper's [*Licensing language*](https://vfclamp.com/talk/paper#licensing-language) section sets out a four-part range licence (scope on the invoice, a grant for instances inside it, an optimisation right, and a fence against widening) with real clauses from BAL, Displaay, NaN and Dalton Maag.
+- **Licensing** — most licences don't mention variable fonts yet. The paper's [*Licensing language*](https://vfclamp.com/paper#licensing-language) section sets out a four-part range licence (scope on the invoice, a grant for instances inside it, an optimisation right, and a fence against widening) with real clauses from BAL, Displaay, NaN and Dalton Maag.
 
 ---
 
@@ -264,10 +264,10 @@ async function clampFont(
 - `input` — Source variable font binary (TTF, OTF, WOFF, or WOFF2).
 - `options.outputs` — Array of `OutputConfig` entries, one per output variant.
 - `options.format` — `'ttf'` (default), `'otf'`, `'woff'`, or `'woff2'`. `'otf'` does not convert outlines: it requires a CFF/CFF2 source and throws for a TrueType-outline font.
-- `options.strict` — When `true`, throw instead of building an instances-based output whose range would include unselected named instances. Defaults to `false`.
+- `options.strict` — When `true`, throw instead of building an output whose range would include unselected named instances. An axes-only output selects none, so under `strict` it passes only if its range holds no named instance. Defaults to `false`.
 - `options.normalizeWeightAxis` — When `true`, remaps the wght axis minimum to 100 so that CSS `font-weight: 100` reaches the lightest weight. Useful for fonts whose design space starts above wght 100 (e.g. 250). Defaults to `false`.
 
-**Throws** if an instance name is not found, if `strict` rejects an output, if `'otf'` is requested for a TrueType-outline font, or if any post-processing step (STAT pruning, OS/2 update, weight normalisation, name patching) fails — a half-processed file that still carries the retail family name is never returned.
+**Throws** if an instance name is not found or is shared by several instances (ambiguous), if `strict` rejects an output, if `'otf'` is requested for a TrueType-outline font, if the font uses avar version 2 or VARC, or if any post-processing step (OS/2 update, weight normalisation, name patching) fails — a half-processed file that still carries the retail family name is never returned.
 
 **Returns**
 
@@ -433,15 +433,16 @@ X-API-Key: <your-key>
 
 | | `POST /api/clamp` | `POST /api/instances` |
 |---|---|---|
-| Body | `{ fontUrl, outputs, format? }`. Each output needs `instances`, `axes`, or both; `format` defaults to `'ttf'` | `{ fontUrl }` |
+| Body | `{ fontUrl, outputs, format?, strict? }`. Each output needs `instances`, `axes`, or both; `format` defaults to `'ttf'`; `strict` (boolean) works as in [`clampFont`](#clampfontinput-options) | `{ fontUrl }` |
 | `200` | `{ results: [{ name, data, format, size }] }`: `data` is the font **base64-encoded**, `size` is its length in **bytes** (decoded) | `{ axes: [...], instances: [...] }`, the same shape as `getInstances()` |
-| `400` | Body isn't JSON, `fontUrl` is missing, `outputs` is empty, an output has neither `instances` nor `axes`, or the font URL could not be fetched | Body isn't JSON, `fontUrl` is missing, or the font could not be fetched |
+| `400` | Body isn't JSON, `fontUrl` is missing, isn't `https`, points to a private host or is over 20 MB, `outputs` is empty, an output has neither `instances` nor `axes`, `strict` isn't a boolean, an instance name isn't in the font or is ambiguous, `'otf'` was requested for a TrueType font, the font uses avar2/VARC, or the font URL could not be fetched (15 s timeout, no redirects) | Body isn't JSON, `fontUrl` is missing, or the font could not be fetched |
 | `401` | `X-API-Key` header missing or wrong | Same |
-| `500` | Processing failed: unknown instance name, `'otf'` for a TrueType font, a post-processing error. Nothing is returned for any output if one fails | Instance extraction failed |
+| `422` | `strict: true` and an output's range would include named instances that weren't listed; the message names them | — |
+| `500` | Processing failed (a post-processing error). Nothing is returned for any output if one fails | Instance extraction failed |
 
 Every error body is `{ "error": "<message>" }`. `fontUrl` is fetched server-side, so it must be reachable without cookies; a signed, expiring URL works. The service does not store your font.
 
-**Purchase-safe orders over HTTP.** The endpoint clamps exactly the outputs you send; it doesn't accept `strict` yet. Get the font's instances from `/api/instances`, group the customer's styles locally with [`planOutputs`](#selling-named-styles-safely) (a pure function, no Pyodide needed), then send those outputs to `/api/clamp`:
+**Purchase-safe orders over HTTP.** Send `strict: true` and the endpoint refuses (`422`) any output that would hand over an unbought style. To split a customer's selection into safe outputs, get the font's instances from `/api/instances`, group them locally with [`planOutputs`](#selling-named-styles-safely) (a pure function, no Pyodide needed), then send those outputs to `/api/clamp`:
 
 ```ts
 import { planOutputs } from '@overpunch/vf-clamp'
@@ -450,7 +451,7 @@ const headers = { 'X-API-Key': KEY, 'Content-Type': 'application/json' }
 const font = await (await fetch('https://vfclamp.com/api/instances', { method: 'POST', headers, body: JSON.stringify({ fontUrl }) })).json()
 const bought = ['Regular', 'Medium', 'SemiBold', 'Bold']   // the styles on the order
 const outputs = planOutputs(font, bought, 'Inter')   // never includes a style that wasn't bought
-const { results } = await (await fetch('https://vfclamp.com/api/clamp', { method: 'POST', headers, body: JSON.stringify({ fontUrl, outputs, format: 'woff2' }) })).json()
+const { results } = await (await fetch('https://vfclamp.com/api/clamp', { method: 'POST', headers, body: JSON.stringify({ fontUrl, outputs, format: 'woff2', strict: true }) })).json()
 const files = results.map((r) => ({ name: r.name, bytes: Buffer.from(r.data, 'base64') }))
 ```
 
@@ -481,13 +482,13 @@ For higher throughput, run **N worker processes** (each with its own warm Pyodid
 For font engineers — the pipeline, in order, per output:
 
 1. **Instance** — fontTools [`varLib.instancer.instantiateVariableFont`](https://fonttools.readthedocs.io/en/latest/varLib/instancer.html) with each axis pinned (`number`) or restricted (`{ min, max }`, a range instance). Variation data outside the range is dropped and the rest renormalised; there are no "masters" in a binary VF to remove. If the range excludes an axis's default, the default moves to the nearest edge (vf-clamp logs a warning for every output), which re-bases the default outlines and metrics; such files save little over the full VF.
-2. **STAT** — the fontTools instancer drops axis values outside the range; vf-clamp then prunes STAT records for axes that were pinned out of `fvar`, so OS font menus don't surface unlicensed names.
+2. **STAT** — left to the fontTools instancer, which drops axis values outside the range. STAT design axes that aren't in `fvar` (such as Inter's `ital`) are kept, because upright/italic linking needs them. (Before 2.3.0, vf-clamp also pruned those axes; that broke the linking.)
 3. **Weight normalisation** (only with `normalizeWeightAxis`) — the wght user-space range is remapped to start at 100; avar is unchanged because normalised values are preserved. This changes registered-axis semantics, so use it only when CSS `font-weight` must reach the lightest weight.
-4. **OS/2 and head** — `usWeightClass`, `fsSelection` and `macStyle` follow the new default.
+4. **OS/2 and head** — `usWeightClass`, `fsSelection` and `macStyle` follow the new default (or the pinned weight). REGULAR is set only when the file is neither bold nor italic, and the italic bit is kept.
 5. **Names** — see the name table note under [Notes](#notes).
 6. **Encode** — WOFF or WOFF2 when requested.
 
-The engine is fontTools **4.56.0** (via [`@web-alchemy/fonttools`](https://www.npmjs.com/package/@web-alchemy/fonttools)) on **Pyodide 0.29.3** — about 15 MB on disk, none of it shipped to browsers. Fonts that rely on newer formats (avar2, VARC) may be refused by this fontTools version. Hinting is whatever the instancer keeps; most VFs ship unhinted.
+The engine is fontTools **4.56.0** (via [`@web-alchemy/fonttools`](https://www.npmjs.com/package/@web-alchemy/fonttools)) on **Pyodide 0.29.3** — about 15 MB on disk, none of it shipped to browsers. Fonts with avar version 2 or a VARC table are refused, because this fontTools version can't restrict them correctly. Hinting is whatever the instancer keeps; most VFs ship unhinted.
 
 If you already run Python, the core step is one command — vf-clamp adds the STAT, OS/2 and name handling, and runs it from Node:
 

package/dist/index.cjs

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const $=require("node:module");var T=typeof document<"u"?document.currentScript:null;const k=$.createRequire(typeof document>"u"?require("url").pathToFileURL(__filename).href:T&&T.tagName.toUpperCase()==="SCRIPT"&&T.src||new URL("index.cjs",document.baseURI).href),{preparePyodide:d,PyodideFile:x}=k("@web-alchemy/fonttools/src/pyodide.js");let b=null;async function C(){return b||(b=d().then(t=>t.runPythonAsync(`
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const U=require("node:module");var I=typeof document<"u"?document.currentScript:null;const E=U.createRequire(typeof document>"u"?require("url").pathToFileURL(__filename).href:I&&I.tagName.toUpperCase()==="SCRIPT"&&I.src||new URL("index.cjs",document.baseURI).href),{preparePyodide:d,PyodideFile:x}=E("@web-alchemy/fonttools/src/pyodide.js");let S=null;async function B(){return S||(S=d().then(e=>e.runPythonAsync(`
 from fontTools.ttLib import TTFont
 
 def vf_convert_flavor(file_options):
@@ -7,15 +7,16 @@ def vf_convert_flavor(file_options):
     font.save(file_options['output-file'])
 
 vf_convert_flavor
-`))),b}async function P(t,o){const a=await d(),e=new x({pyodide:a}),n=new x({pyodide:a});try{await e.upload(t);const i=new Map([["input-file",e.filename],["output-file",n.filename],["flavor",o]]);return(await C())(i),n.download()}finally{try{e.delete()}catch{}try{n.delete()}catch{}}}async function j(t){return P(t,"woff")}async function M(t){return P(t,"woff2")}let F=null;async function E(){return F||(F=d().then(t=>t.runPythonAsync(`
+`))),S}async function P(e,a){const t=await d(),n=new x({pyodide:t}),i=new x({pyodide:t});try{await n.upload(e);const o=new Map([["input-file",n.filename],["output-file",i.filename],["flavor",a]]);return(await B())(o),i.download()}finally{try{n.delete()}catch{}try{i.delete()}catch{}}}async function $(e){return P(e,"woff")}async function L(e){return P(e,"woff2")}let A=null;async function W(){return A||(A=d().then(e=>e.runPythonAsync(`
 import json
 from fontTools.ttLib import TTFont
 
 def get_instances_fn(input_file):
     font = TTFont(input_file)
 
+    family = font['name'].getDebugName(16) or font['name'].getDebugName(1) or ''
     if 'fvar' not in font:
-        return json.dumps({'axes': [], 'instances': []})
+        return json.dumps({'axes': [], 'instances': [], 'family': family})
 
     fvar = font['fvar']
     name_table = font['name']
@@ -39,10 +40,10 @@ def get_instances_fn(input_file):
         for i, inst in enumerate(fvar.instances)
     ]
 
-    return json.dumps({'axes': axes, 'instances': instances})
+    return json.dumps({'axes': axes, 'instances': instances, 'family': family})
 
 get_instances_fn
-`))),F}async function L(t){const o=await d(),a=t instanceof ArrayBuffer?new Uint8Array(t):t,e=new x({pyodide:o});try{await e.upload(a);const i=(await E())(e.filename);return JSON.parse(i)}finally{try{e.delete()}catch{}}}let S=null,I=null,V=null,D=null,O=null;async function z(){return S||(S=d().then(t=>t.runPythonAsync(`
+`))),A}async function M(e){const a=await d(),t=e instanceof ArrayBuffer?new Uint8Array(e):e,n=new x({pyodide:a});try{await n.upload(t);const o=(await W())(n.filename);return JSON.parse(o)}finally{try{n.delete()}catch{}}}function C(e,a){if(e===a)return e;const t=e.split(" "),n=a.split(" ");let i=0;for(;i<t.length&&i<n.length&&t[i]===n[i];)i++;let o=0;for(;o<t.length-i&&o<n.length-i&&t[t.length-1-o]===n[n.length-1-o];)o++;const r=t.slice(0,i).join(" "),s=t.slice(i,t.length-(o||0)).join(" "),h=n.slice(i,n.length-(o||0)).join(" "),y=o>0?t.slice(t.length-o).join(" "):"",f=s&&h?`${s}-${h}`:s||h;return[r,f,y].filter(Boolean).join(" ")}function T(e,a){const t=a.filter(n=>n.name===e);if(!t.length)throw new Error(`Named instance "${e}" not found in font`);if(t.length>1)throw new Error(`Named instance "${e}" is ambiguous: ${t.length} instances share that name`);return t[0]}let V=null,N=null,D=null,O=null;async function z(){return V||(V=d().then(e=>e.runPythonAsync(`
 from fontTools import ttLib
 
 def patch_font_names_fn(file_options):
@@ -53,6 +54,27 @@ def patch_font_names_fn(file_options):
 
     existing_ids = {r.nameID for r in name_table.names}
 
+    # A family name with no ASCII letters gives an empty PostScript name: fall back to the
+    # source PostScript name plus a short hash of the family name (passed in from JS).
+    if not ps_name:
+        source_ps = name_table.getDebugName(6) or 'Font'
+        ps_name = ('%s-%s' % (source_ps[:52], file_options['postscript-suffix']))[:63]
+
+    # nameID 2 must be a RIBBI style that matches OS/2 (already updated): Regular, Italic, Bold or Bold Italic.
+    fs = font['OS/2'].fsSelection if 'OS/2' in font else 0x40
+    is_italic = bool(fs & 0x01)
+    is_bold = bool(fs & 0x20)
+    ribbi = ('Bold Italic' if is_italic else 'Bold') if is_bold else ('Italic' if is_italic else 'Regular')
+
+    # nameID 17 (typographic subfamily): the name of the named instance at the new default, if any.
+    default_style = None
+    if 'fvar' in font:
+        defaults = {ax.axisTag: ax.defaultValue for ax in font['fvar'].axes}
+        for inst in font['fvar'].instances:
+            if all(abs(inst.coordinates.get(t, v) - v) < 0.01 for t, v in defaults.items()):
+                default_style = name_table.getDebugName(inst.subfamilyNameID)
+                break
+
     # nameID 1 = Family, 4 = Full name, 6 = PostScript name
     # nameID 2 = Subfamily — reset to 'Regular' so the restricted file does not
     #            collide with the source font's Subfamily in OS font caches.
@@ -70,32 +92,50 @@ def patch_font_names_fn(file_options):
 
     updates = {
         1: family_name,
-        2: 'Regular',
+        2: ribbi,
         3: unique_id,
-        4: family_name,
+        4: family_name if ribbi == 'Regular' else '%s %s' % (family_name, ribbi),
         6: ps_name,
     }
     if 16 in existing_ids:
         updates[16] = family_name
+    if 17 in existing_ids and default_style:
+        updates[17] = default_style
     if 25 in existing_ids:
         updates[25] = ps_name
 
+    # Named instances' PostScript names must follow the new prefix, e.g. Inter-Regular-Bold-Medium.
+    if 'fvar' in font:
+        for inst in font['fvar'].instances:
+            pid = getattr(inst, 'postscriptNameID', 0xFFFF)
+            if pid in (None, 0xFFFF):
+                continue
+            style = (name_table.getDebugName(inst.subfamilyNameID) or '').replace(' ', '')
+            style = ''.join(c for c in style if c.isascii() and (c.isalnum() or c == '-'))
+            updates[pid] = ('%s-%s' % (ps_name, style))[:63]
+
+    # Rewrite every platform. A Mac (platform 1) record that can't be encoded in Mac Roman is dropped
+    # rather than filled with '?'; Windows and Unicode records always carry the full name.
+    keep = []
     for record in name_table.names:
         if record.nameID not in updates:
+            keep.append(record)
             continue
         value = updates[record.nameID]
-        if record.platformID == 3:
+        if record.platformID in (0, 3):
             record.string = value.encode('utf-16-be')
         elif record.platformID == 1:
             try:
                 record.string = value.encode('mac_roman')
             except Exception:
-                record.string = value.encode('ascii', errors='replace')
+                continue
+        keep.append(record)
+    name_table.names = keep
 
     font.save(file_options['output-file'])
 
 patch_font_names_fn
-`))),S}async function W(){return I||(I=d().then(t=>t.runPythonAsync(`
+`))),V}async function q(){return N||(N=d().then(e=>e.runPythonAsync(`
 from fontTools.ttLib import TTFont
 from fontTools.varLib import instancer
 import json
@@ -104,6 +144,12 @@ def vf_clamp_instantiate(file_options, axes_json):
     font = TTFont(file_options['input-file'])
     axes_spec = json.loads(axes_json)
 
+    # The bundled fontTools can't restrict avar version 2 or VARC fonts correctly: refuse instead of mis-cutting.
+    if 'avar' in font and getattr(font['avar'], 'majorVersion', 1) >= 2:
+        raise ValueError('vf-clamp: avar version 2 fonts are not supported yet')
+    if 'VARC' in font:
+        raise ValueError('vf-clamp: fonts with a VARC table are not supported yet')
+
     limits = {}
     axes_by_tag = {ax.axisTag: ax for ax in font['fvar'].axes}
 
@@ -124,7 +170,7 @@ def vf_clamp_instantiate(file_options, axes_json):
     partial.save(file_options['output-file'])
 
 vf_clamp_instantiate
-`))),I}async function q(){return V||(V=d().then(t=>t.runPythonAsync(`
+`))),N}async function H(){return D||(D=d().then(e=>e.runPythonAsync(`
 from fontTools.ttLib import TTFont
 
 def vf_clamp_normalize_wght(file_options, new_min_str):
@@ -144,6 +190,10 @@ def vf_clamp_normalize_wght(file_options, new_min_str):
 
     old_min = wght_axis.minValue
     default = wght_axis.defaultValue
+    # With the default at the minimum there is no below-default range to stretch; leave the font as is.
+    if default <= old_min:
+        font.save(file_options['output-file'])
+        return 'skipped'
     scale = (default - new_min) / (default - old_min)
 
     def remap(v):
@@ -177,69 +227,16 @@ def vf_clamp_normalize_wght(file_options, new_min_str):
                     av.NominalValue = remap(av.NominalValue)
                     av.RangeMinValue = remap(av.RangeMinValue)
                     av.RangeMaxValue = remap(av.RangeMaxValue)
+                elif fmt == 4:
+                    for rec in getattr(av, 'AxisValueRecord', []) or []:
+                        if rec.AxisIndex == wght_idx:
+                            rec.Value = remap(rec.Value)
 
     font.save(file_options['output-file'])
+    return 'done'
 
 vf_clamp_normalize_wght
-`))),V}async function B(){return D||(D=d().then(t=>t.runPythonAsync(`
-from fontTools.ttLib import TTFont
-
-def vf_clamp_prune_stat(file_options):
-    font = TTFont(file_options['input-file'])
-
-    if 'STAT' not in font or 'fvar' not in font:
-        font.save(file_options['output-file'])
-        return
-
-    stat = font['STAT'].table
-    if not getattr(stat, 'DesignAxisRecord', None) or not stat.DesignAxisRecord.Axis:
-        font.save(file_options['output-file'])
-        return
-
-    fvar_tags = {ax.axisTag for ax in font['fvar'].axes}
-    stat_axes = list(stat.DesignAxisRecord.Axis)
-
-    # Map old STAT AxisIndex -> new index after pruning STAT axes that vanish from fvar.
-    surviving_indices = [i for i, ax in enumerate(stat_axes) if ax.AxisTag in fvar_tags]
-    if len(surviving_indices) == len(stat_axes):
-        # No axes removed — nothing to prune.
-        font.save(file_options['output-file'])
-        return
-    old_to_new = {old: new for new, old in enumerate(surviving_indices)}
-
-    # Rewrite the DesignAxisRecord.Axis list to surviving axes only.
-    stat.DesignAxisRecord.Axis = [stat_axes[i] for i in surviving_indices]
-    if hasattr(stat, 'DesignAxisCount'):
-        stat.DesignAxisCount = len(stat.DesignAxisRecord.Axis)
-
-    # Prune AxisValueArray entries that reference removed axes.
-    if stat.AxisValueArray and stat.AxisValueArray.AxisValue:
-        kept = []
-        for av in stat.AxisValueArray.AxisValue:
-            fmt = av.Format
-            if fmt in (1, 2, 3):
-                if av.AxisIndex not in old_to_new:
-                    continue  # references a removed axis
-                av.AxisIndex = old_to_new[av.AxisIndex]
-                kept.append(av)
-            elif fmt == 4:
-                inner = list(getattr(av, 'AxisValueRecord', []) or [])
-                if any(rec.AxisIndex not in old_to_new for rec in inner):
-                    continue  # whole record dies if any inner ref is dead
-                for rec in inner:
-                    rec.AxisIndex = old_to_new[rec.AxisIndex]
-                kept.append(av)
-            else:
-                # Unknown format — keep as-is to be safe.
-                kept.append(av)
-        stat.AxisValueArray.AxisValue = kept
-        if hasattr(stat, 'AxisValueCount'):
-            stat.AxisValueCount = len(kept)
-
-    font.save(file_options['output-file'])
-
-vf_clamp_prune_stat
-`))),D}async function G(){return O||(O=d().then(t=>t.runPythonAsync(`
+`))),D}async function J(){return O||(O=d().then(e=>e.runPythonAsync(`
 from fontTools.ttLib import TTFont
 
 def vf_clamp_update_os2(file_options):
@@ -250,25 +247,26 @@ def vf_clamp_update_os2(file_options):
         return
 
     wght_axis = next((ax for ax in font['fvar'].axes if ax.axisTag == 'wght'), None)
-    if wght_axis is None:
+    if wght_axis is not None:
+        # OS/2.usWeightClass valid range is 1..1000.
+        weight_class = int(round(max(1, min(1000, wght_axis.defaultValue))))
+    elif 'OS/2' in font:
+        # wght was pinned: fontTools has already set usWeightClass to the pinned weight.
+        weight_class = font['OS/2'].usWeightClass
+    else:
         font.save(file_options['output-file'])
         return
 
-    new_default = wght_axis.defaultValue
-    # OS/2.usWeightClass valid range is 1..1000.
-    weight_class = int(round(max(1, min(1000, new_default))))
-
     if 'OS/2' in font:
         os2 = font['OS/2']
         os2.usWeightClass = weight_class
-        # fsSelection bits: 0x20 = BOLD, 0x40 = REGULAR.
-        # Mirror the convention: REGULAR when usWeightClass < 600, BOLD when >= 700.
+        # fsSelection: 0x01 ITALIC (kept), 0x20 BOLD, 0x40 REGULAR. REGULAR only when neither ITALIC nor BOLD.
         fs = os2.fsSelection
         fs &= ~(0x20 | 0x40)
         if weight_class >= 700:
-            fs |= 0x20  # BOLD
-        elif weight_class < 600:
-            fs |= 0x40  # REGULAR
+            fs |= 0x20
+        elif not fs & 0x01:
+            fs |= 0x40
         os2.fsSelection = fs
 
     if 'head' in font:
@@ -284,4 +282,4 @@ def vf_clamp_update_os2(file_options):
     font.save(file_options['output-file'])
 
 vf_clamp_update_os2
-`))),O}function H(t){return t.replace(/[^A-Za-z0-9 -]/g,"").trim().split(/\s+/).join("-").replace(/^-+|-+$/g,"").slice(0,63)}async function J(t,o){if(!o)return t;const a=await d(),e=new x({pyodide:a}),n=new x({pyodide:a});try{const i=H(o);await e.upload(t);const s=new Map([["input-file",e.filename],["output-file",n.filename],["family-name",o],["postscript-name",i]]);return(await z())(s),n.download()}catch(i){throw Object.assign(new Error(`vf-clamp: name table patching failed for "${o}"`),{cause:i})}finally{try{e.delete()}catch{}try{n.delete()}catch{}}}function Z(t){return typeof t=="number"?t:t===null?null:[t.min,t.max]}async function K(t,o){const a=await d(),e=new x({pyodide:a}),n=new x({pyodide:a});try{await e.upload(t);const i=new Map([["input-file",e.filename],["output-file",n.filename]]);return(await W())(i,JSON.stringify(o)),n.download()}finally{try{e.delete()}catch{}try{n.delete()}catch{}}}async function Q(t){const o=await d(),a=new x({pyodide:o}),e=new x({pyodide:o});try{await a.upload(t);const n=new Map([["input-file",a.filename],["output-file",e.filename]]);return(await B())(n),e.download()}catch(n){throw Object.assign(new Error("vf-clamp: STAT pruning failed"),{cause:n})}finally{try{a.delete()}catch{}try{e.delete()}catch{}}}async function X(t){const o=await d(),a=new x({pyodide:o}),e=new x({pyodide:o});try{await a.upload(t);const n=new Map([["input-file",a.filename],["output-file",e.filename]]);return(await G())(n),e.download()}catch(n){throw Object.assign(new Error("vf-clamp: OS/2 and macStyle update failed"),{cause:n})}finally{try{a.delete()}catch{}try{e.delete()}catch{}}}async function Y(t,o){const a=await d(),e=new x({pyodide:a}),n=new x({pyodide:a});try{await e.upload(t);const i=new Map([["input-file",e.filename],["output-file",n.filename]]);return(await q())(i,String(o)),n.download()}catch(i){throw Object.assign(new Error("vf-clamp: wght normalisation failed"),{cause:i})}finally{try{e.delete()}catch{}try{n.delete()}catch{}}}function tt(t,o){const a=new Map(o.map(i=>[i.name,i])),e={};for(const i of t){const s=a.get(i);if(!s)throw new Error(`Named instance "${i}" not found in font`);for(const[f,c]of Object.entries(s.coordinates))e[f]?(e[f].min=Math.min(e[f].min,c),e[f].max=Math.max(e[f].max,c)):e[f]={min:c,max:c}}const n={};for(const[i,{min:s,max:f}]of Object.entries(e))n[i]=s===f?s:{min:s,max:f};return n}function et(t){return t.length>=4&&t[0]===79&&t[1]===84&&t[2]===84&&t[3]===79}async function nt(t,o){var f,c,w;if(o.outputs.length===0)return[];const a=t instanceof ArrayBuffer?new Uint8Array(t):t,e=o.format??"ttf",{instances:n,axes:i}=await L(a),s=[];for(const m of o.outputs){let _={};if((f=m.instances)!=null&&f.length&&(_=tt(m.instances,n)),m.axes&&(_={..._,...m.axes}),o.strict&&((c=m.instances)!=null&&c.length)){const p=new Set(m.instances),g=n.filter(h=>!p.has(h.name)&&i.every(y=>{const A=h.coordinates[y.tag]??y.default,v=_[y.tag];return v==null?!0:typeof v=="number"?A===v:A>=v.min&&A<=v.max})).map(h=>h.name);if(g.length)throw new Error(`vf-clamp: output "${m.name||m.instances.join(", ")}" would include unselected instances (${g.join(", ")}); use planOutputs() to split the selection`)}for(const p of i){const g=_[p.tag];if(g!=null&&typeof g=="object"){const h=g;if(p.default<h.min||p.default>h.max){const y=Math.max(h.min,Math.min(h.max,p.default));console.warn(`vf-clamp: axis "${p.tag}" default (${p.default}) is outside restricted range [${h.min}, ${h.max}] — will be clamped to ${y}`)}}}const r={};for(const[p,g]of Object.entries(_))g!==null&&(r[p]=Z(g));const u=m.name||((w=m.instances)!=null&&w.length?m.instances.length===1?m.instances[0]:`${m.instances[0]}-${m.instances[m.instances.length-1]}`:"output");let l=await K(a,r);if(e==="otf"&&!et(l))throw new Error("vf-clamp: format 'otf' needs a CFF/CFF2 source font; this font has TrueType outlines — use 'ttf'");l=await Q(l),o.normalizeWeightAxis&&(l=await Y(l,100)),l=await X(l),l=await J(l,u),e==="woff2"?l=await M(l):e==="woff"&&(l=await j(l)),s.push({name:u,buffer:l,format:e})}return s}function U(t,o){if(t===o)return t;const a=t.split(" "),e=o.split(" ");let n=0;for(;n<a.length&&n<e.length&&a[n]===e[n];)n++;let i=0;for(;i<a.length-n&&i<e.length-n&&a[a.length-1-i]===e[e.length-1-i];)i++;const s=a.slice(0,n).join(" "),f=a.slice(n,a.length-(i||0)).join(" "),c=e.slice(n,e.length-(i||0)).join(" "),w=i>0?a.slice(a.length-i).join(" "):"",m=f&&c?`${f}-${c}`:f||c;return[s,m,w].filter(Boolean).join(" ")}function R(t,o){const a={};for(const e of o){const n=t.map(i=>i.coordinates[e.tag]??e.default);a[e.tag]={min:Math.min(...n),max:Math.max(...n)}}return a}function N(t,o,a,e){return o.filter(n=>a.has(n.name)?!1:e.every(i=>{const s=n.coordinates[i.tag]??i.default,f=t[i.tag];return!f||s>=f.min&&s<=f.max}))}function at(t){return t.reduce((o,a)=>!o||a.maximum-a.minimum>o.maximum-o.minimum?a:o,void 0)}function it(t,o,a){const{axes:e,instances:n}=t,i=new Map(n.map(r=>[r.name,r])),s=[];for(const r of new Set(o)){const u=i.get(r);if(!u)throw new Error(`Named instance "${r}" not found in font`);s.push(u)}if(!s.length)return[];const f=new Set(s.map(r=>r.name));let c;if(!N(R(s,e),n,f,e).length)c=[s];else{c=s.map(u=>[u]);let r=!0;for(;r;){r=!1;t:for(let u=0;u<c.length;u++)for(let l=u+1;l<c.length;l++){const p=[...c[u],...c[l]];if(!N(R(p,e),n,f,e).length){c[u]=p,c.splice(l,1),r=!0;break t}}}}const w=at(e),m=w?[w,...e.filter(r=>r.tag!==w.tag)]:e,_=(r,u)=>{for(const l of m){const p=(r.coordinates[l.tag]??l.default)-(u.coordinates[l.tag]??l.default);if(p)return p}return 0};return c=c.map(r=>[...r].sort(_)).sort((r,u)=>_(r[0],u[0])),c.map(r=>{const u=r[0],l=r[r.length-1],p=r.length===1?u.name:U(u.name,l.name);return{name:a?`${a} ${p}`:p,instances:r.map(g=>g.name)}})}function ot(t,o){const a=new Map(t.instances.map(n=>[n.name,n])),e=o.map(n=>a.get(n)).filter(n=>!!n);return e.length?N(R(e,t.axes),t.instances,new Set(o),t.axes).map(n=>n.name):[]}exports.clampFont=nt;exports.compactName=U;exports.convertToWoff=j;exports.convertToWoff2=M;exports.getInstances=L;exports.planOutputs=it;exports.unboughtInstances=ot;
+`))),O}function G(e){const a=e.normalize("NFKD").replace(/[\u0300-\u036f]/g,"").replace(/[^A-Za-z0-9 -]/g,"").trim().split(/\s+/).join("-").replace(/-+/g,"-").replace(/^-+|-+$/g,"");return a.length<=63?a:`${a.slice(0,56).replace(/-+$/,"")}-${k(e)}`}function k(e){let a=2166136261;for(const t of e)a^=t.codePointAt(0),a=Math.imul(a,16777619)>>>0;return a.toString(36).padStart(6,"0").slice(-6)}async function K(e,a){if(!a)return e;const t=await d(),n=new x({pyodide:t}),i=new x({pyodide:t});try{const o=G(a);await n.upload(e);const r=new Map([["input-file",n.filename],["output-file",i.filename],["family-name",a],["postscript-name",o],["postscript-suffix",k(a)]]);return(await z())(r),i.download()}catch(o){throw Object.assign(new Error(`vf-clamp: name table patching failed for "${a}"`),{cause:o})}finally{try{n.delete()}catch{}try{i.delete()}catch{}}}function Z(e){return typeof e=="number"?e:e===null?null:[e.min,e.max]}async function Q(e,a){const t=await d(),n=new x({pyodide:t}),i=new x({pyodide:t});try{await n.upload(e);const o=new Map([["input-file",n.filename],["output-file",i.filename]]);return(await q())(o,JSON.stringify(a)),i.download()}finally{try{n.delete()}catch{}try{i.delete()}catch{}}}async function X(e){const a=await d(),t=new x({pyodide:a}),n=new x({pyodide:a});try{await t.upload(e);const i=new Map([["input-file",t.filename],["output-file",n.filename]]);return(await J())(i),n.download()}catch(i){throw Object.assign(new Error("vf-clamp: OS/2 and macStyle update failed"),{cause:i})}finally{try{t.delete()}catch{}try{n.delete()}catch{}}}async function Y(e,a){const t=await d(),n=new x({pyodide:t}),i=new x({pyodide:t});try{await n.upload(e);const o=new Map([["input-file",n.filename],["output-file",i.filename]]);return(await H())(o,String(a))==="skipped"&&console.warn("vf-clamp: normalizeWeightAxis skipped: the weight default is the axis minimum, so there is no lower range to remap"),i.download()}catch(o){throw Object.assign(new Error("vf-clamp: wght normalisation failed"),{cause:o})}finally{try{n.delete()}catch{}try{i.delete()}catch{}}}function ee(e,a){const t={};for(const i of e){const o=T(i,a);for(const[r,s]of Object.entries(o.coordinates))t[r]?(t[r].min=Math.min(t[r].min,s),t[r].max=Math.max(t[r].max,s)):t[r]={min:s,max:s}}const n={};for(const[i,{min:o,max:r}]of Object.entries(t))n[i]=o===r?o:{min:o,max:r};return n}function te(e){return e.length>=4&&e[0]===79&&e[1]===84&&e[2]===84&&e[3]===79}async function ne(e,a){var h,y;if(a.outputs.length===0)return[];const t=e instanceof ArrayBuffer?new Uint8Array(e):e,n=a.format??"ttf",{instances:i,axes:o,family:r}=await M(t),s=[];for(const f of a.outputs){let l={};if((h=f.instances)!=null&&h.length&&(l=ee(f.instances,i)),f.axes&&(l={...l,...f.axes}),a.strict){const _=new Set((f.instances??[]).map(p=>T(p,i))),w=i.filter(p=>!_.has(p)&&o.every(b=>{const F=p.coordinates[b.tag]??b.default,v=l[b.tag];return v==null?!0:typeof v=="number"?F===v:F>=v.min&&F<=v.max})).map(p=>p.name);if(w.length)throw new Error(`vf-clamp: output "${f.name||(f.instances??[]).join(", ")||"axes-only"}" would include unselected instances (${w.join(", ")}); use planOutputs() to split the selection`)}for(const _ of o){const w=l[_.tag];if(w!=null&&typeof w=="object"){const p=w;if(_.default<p.min||_.default>p.max){const b=Math.max(p.min,Math.min(p.max,_.default));console.warn(`vf-clamp: axis "${_.tag}" default (${_.default}) is outside restricted range [${p.min}, ${p.max}] — will be clamped to ${b}`)}}}const c={};for(const[_,w]of Object.entries(l))w!==null&&(c[_]=Z(w));const u=(y=f.instances)!=null&&y.length?f.instances.length===1?f.instances[0]:`${f.instances[0]}-${f.instances[f.instances.length-1]}`:"Clamped",g=f.name||(r?`${r} ${u}`:u);let m=await Q(t,c);if(n==="otf"&&!te(m))throw new Error("vf-clamp: format 'otf' needs a CFF/CFF2 source font; this font has TrueType outlines — use 'ttf'");a.normalizeWeightAxis&&(m=await Y(m,100)),m=await X(m),m=await K(m,g),n==="woff2"?m=await L(m):n==="woff"&&(m=await $(m)),s.push({name:g,buffer:m,format:n})}return s}function R(e,a){const t={};for(const n of a){const i=e.map(o=>o.coordinates[n.tag]??n.default);t[n.tag]={min:Math.min(...i),max:Math.max(...i)}}return t}function j(e,a,t,n){return a.filter(i=>t.has(i)?!1:n.every(o=>{const r=i.coordinates[o.tag]??o.default,s=e[o.tag];return!s||r>=s.min&&r<=s.max}))}function ae(e){return e.reduce((a,t)=>!a||t.maximum-t.minimum>a.maximum-a.minimum?t:a,void 0)}function ie(e,a,t){const{axes:n,instances:i}=e,o=[...new Set(a)].map(l=>T(l,i));if(!o.length)return[];const r=new Set(o);let s;if(!j(R(o,n),i,r,n).length)s=[o];else{s=o.map(c=>[c]);let l=!0;for(;l;){l=!1;e:for(let c=0;c<s.length;c++)for(let u=c+1;u<s.length;u++){const g=[...s[c],...s[u]];if(!j(R(g,n),i,r,n).length){s[c]=g,s.splice(u,1),l=!0;break e}}}}const h=ae(n),y=h?[h,...n.filter(l=>l.tag!==h.tag)]:n,f=(l,c)=>{for(const u of y){const g=(l.coordinates[u.tag]??u.default)-(c.coordinates[u.tag]??u.default);if(g)return g}return 0};return s=s.map(l=>[...l].sort(f)).sort((l,c)=>f(l[0],c[0])),s.map(l=>{const c=l[0],u=l[l.length-1],g=l.length===1?c.name:C(c.name,u.name);return{name:t?`${t} ${g}`:g,instances:l.map(m=>m.name)}})}function oe(e,a){const t=a.map(n=>T(n,e.instances));return t.length?j(R(t,e.axes),e.instances,new Set(t),e.axes).map(n=>n.name):[]}exports.clampFont=ne;exports.compactName=C;exports.convertToWoff=$;exports.convertToWoff2=L;exports.getInstances=M;exports.planOutputs=ie;exports.unboughtInstances=oe;

package/dist/index.d.ts

@@ -56,8 +56,9 @@ export declare interface ClampOptions {
      */
     format?: OutputFormat;
     /**
-     * Refuse any instances-based output whose range would include a named instance that was not listed
-     * (e.g. Regular + Bold would also hand over Medium and SemiBold). Throws instead of clamping.
+     * Refuse any output whose range would include a named instance that was not listed
+     * (e.g. Regular + Bold would also hand over Medium and SemiBold). Axes-only outputs list none,
+     * so they pass only if their range holds no named instance. Throws instead of clamping.
      * Use planOutputs() to split a customer's selection into safe outputs. Defaults to false.
      */
     strict?: boolean;
@@ -117,6 +118,8 @@ export declare interface FontInstancesResult {
     axes: AxisDefinition[];
     /** All named instances defined in the font */
     instances: FontInstance[];
+    /** The font's family name (typographic family, nameID 16, else nameID 1); used to name outputs that set no name */
+    family?: string;
 }
 
 /**
@@ -173,7 +176,7 @@ export declare type PinnedAxis = number;
  * @param selected - Names of the instances the customer bought (must match exactly)
  * @param family - Optional family name to prefix each output name with, e.g. "Encode Sans"
  * @returns OutputConfig entries ready for clampFont(), sorted along the primary axis
- * @throws If a selected name is not a named instance of the font
+ * @throws If a selected name is not a named instance of the font, or names more than one (ambiguous)
  */
 export declare function planOutputs(font: FontInstancesResult, selected: string[], family?: string): OutputConfig[];
 

package/dist/index.js

@@ -1,9 +1,9 @@
-import { createRequire as j } from "node:module";
-const R = j(import.meta.url), { preparePyodide: d, PyodideFile: x } = R("@web-alchemy/fonttools/src/pyodide.js");
-let T = null;
-async function M() {
-  return T || (T = d().then(
-    (t) => t.runPythonAsync(`
+import { createRequire as $ } from "node:module";
+const M = $(import.meta.url), { preparePyodide: d, PyodideFile: x } = M("@web-alchemy/fonttools/src/pyodide.js");
+let A = null;
+async function L() {
+  return A || (A = d().then(
+    (e) => e.runPythonAsync(`
 from fontTools.ttLib import TTFont
 
 def vf_convert_flavor(file_options):
@@ -13,47 +13,48 @@ def vf_convert_flavor(file_options):
 
 vf_convert_flavor
 `)
-  )), T;
+  )), A;
 }
-async function P(t, o) {
-  const a = await d(), e = new x({ pyodide: a }), n = new x({ pyodide: a });
+async function R(e, a) {
+  const t = await d(), n = new x({ pyodide: t }), i = new x({ pyodide: t });
   try {
-    await e.upload(t);
-    const i = /* @__PURE__ */ new Map([
-      ["input-file", e.filename],
-      ["output-file", n.filename],
-      ["flavor", o]
+    await n.upload(e);
+    const o = /* @__PURE__ */ new Map([
+      ["input-file", n.filename],
+      ["output-file", i.filename],
+      ["flavor", a]
     ]);
-    return (await M())(i), n.download();
+    return (await L())(o), i.download();
   } finally {
     try {
-      e.delete();
+      n.delete();
     } catch {
     }
     try {
-      n.delete();
+      i.delete();
     } catch {
     }
   }
 }
-async function L(t) {
-  return P(t, "woff");
+async function k(e) {
+  return R(e, "woff");
 }
-async function $(t) {
-  return P(t, "woff2");
+async function C(e) {
+  return R(e, "woff2");
 }
-let b = null;
-async function k() {
-  return b || (b = d().then(
-    (t) => t.runPythonAsync(`
+let I = null;
+async function E() {
+  return I || (I = d().then(
+    (e) => e.runPythonAsync(`
 import json
 from fontTools.ttLib import TTFont
 
 def get_instances_fn(input_file):
     font = TTFont(input_file)
 
+    family = font['name'].getDebugName(16) or font['name'].getDebugName(1) or ''
     if 'fvar' not in font:
-        return json.dumps({'axes': [], 'instances': []})
+        return json.dumps({'axes': [], 'instances': [], 'family': family})
 
     fvar = font['fvar']
     name_table = font['name']
@@ -77,29 +78,47 @@ def get_instances_fn(input_file):
         for i, inst in enumerate(fvar.instances)
     ]
 
-    return json.dumps({'axes': axes, 'instances': instances})
+    return json.dumps({'axes': axes, 'instances': instances, 'family': family})
 
 get_instances_fn
 `)
-  )), b;
+  )), I;
 }
-async function E(t) {
-  const o = await d(), a = t instanceof ArrayBuffer ? new Uint8Array(t) : t, e = new x({ pyodide: o });
+async function B(e) {
+  const a = await d(), t = e instanceof ArrayBuffer ? new Uint8Array(e) : e, n = new x({ pyodide: a });
   try {
-    await e.upload(a);
-    const i = (await k())(e.filename);
-    return JSON.parse(i);
+    await n.upload(t);
+    const o = (await E())(n.filename);
+    return JSON.parse(o);
   } finally {
     try {
-      e.delete();
+      n.delete();
     } catch {
     }
   }
 }
-let F = null, S = null, V = null, I = null, D = null;
-async function U() {
-  return F || (F = d().then(
-    (t) => t.runPythonAsync(`
+function U(e, a) {
+  if (e === a) return e;
+  const t = e.split(" "), n = a.split(" ");
+  let i = 0;
+  for (; i < t.length && i < n.length && t[i] === n[i]; )
+    i++;
+  let o = 0;
+  for (; o < t.length - i && o < n.length - i && t[t.length - 1 - o] === n[n.length - 1 - o]; )
+    o++;
+  const r = t.slice(0, i).join(" "), s = t.slice(i, t.length - (o || 0)).join(" "), h = n.slice(i, n.length - (o || 0)).join(" "), y = o > 0 ? t.slice(t.length - o).join(" ") : "", f = s && h ? `${s}-${h}` : s || h;
+  return [r, f, y].filter(Boolean).join(" ");
+}
+function T(e, a) {
+  const t = a.filter((n) => n.name === e);
+  if (!t.length) throw new Error(`Named instance "${e}" not found in font`);
+  if (t.length > 1) throw new Error(`Named instance "${e}" is ambiguous: ${t.length} instances share that name`);
+  return t[0];
+}
+let S = null, V = null, D = null, N = null;
+async function z() {
+  return S || (S = d().then(
+    (e) => e.runPythonAsync(`
 from fontTools import ttLib
 
 def patch_font_names_fn(file_options):
@@ -110,6 +129,27 @@ def patch_font_names_fn(file_options):
 
     existing_ids = {r.nameID for r in name_table.names}
 
+    # A family name with no ASCII letters gives an empty PostScript name: fall back to the
+    # source PostScript name plus a short hash of the family name (passed in from JS).
+    if not ps_name:
+        source_ps = name_table.getDebugName(6) or 'Font'
+        ps_name = ('%s-%s' % (source_ps[:52], file_options['postscript-suffix']))[:63]
+
+    # nameID 2 must be a RIBBI style that matches OS/2 (already updated): Regular, Italic, Bold or Bold Italic.
+    fs = font['OS/2'].fsSelection if 'OS/2' in font else 0x40
+    is_italic = bool(fs & 0x01)
+    is_bold = bool(fs & 0x20)
+    ribbi = ('Bold Italic' if is_italic else 'Bold') if is_bold else ('Italic' if is_italic else 'Regular')
+
+    # nameID 17 (typographic subfamily): the name of the named instance at the new default, if any.
+    default_style = None
+    if 'fvar' in font:
+        defaults = {ax.axisTag: ax.defaultValue for ax in font['fvar'].axes}
+        for inst in font['fvar'].instances:
+            if all(abs(inst.coordinates.get(t, v) - v) < 0.01 for t, v in defaults.items()):
+                default_style = name_table.getDebugName(inst.subfamilyNameID)
+                break
+
     # nameID 1 = Family, 4 = Full name, 6 = PostScript name
     # nameID 2 = Subfamily — reset to 'Regular' so the restricted file does not
     #            collide with the source font's Subfamily in OS font caches.
@@ -127,37 +167,55 @@ def patch_font_names_fn(file_options):
 
     updates = {
         1: family_name,
-        2: 'Regular',
+        2: ribbi,
         3: unique_id,
-        4: family_name,
+        4: family_name if ribbi == 'Regular' else '%s %s' % (family_name, ribbi),
         6: ps_name,
     }
     if 16 in existing_ids:
         updates[16] = family_name
+    if 17 in existing_ids and default_style:
+        updates[17] = default_style
     if 25 in existing_ids:
         updates[25] = ps_name
 
+    # Named instances' PostScript names must follow the new prefix, e.g. Inter-Regular-Bold-Medium.
+    if 'fvar' in font:
+        for inst in font['fvar'].instances:
+            pid = getattr(inst, 'postscriptNameID', 0xFFFF)
+            if pid in (None, 0xFFFF):
+                continue
+            style = (name_table.getDebugName(inst.subfamilyNameID) or '').replace(' ', '')
+            style = ''.join(c for c in style if c.isascii() and (c.isalnum() or c == '-'))
+            updates[pid] = ('%s-%s' % (ps_name, style))[:63]
+
+    # Rewrite every platform. A Mac (platform 1) record that can't be encoded in Mac Roman is dropped
+    # rather than filled with '?'; Windows and Unicode records always carry the full name.
+    keep = []
     for record in name_table.names:
         if record.nameID not in updates:
+            keep.append(record)
             continue
         value = updates[record.nameID]
-        if record.platformID == 3:
+        if record.platformID in (0, 3):
             record.string = value.encode('utf-16-be')
         elif record.platformID == 1:
             try:
                 record.string = value.encode('mac_roman')
             except Exception:
-                record.string = value.encode('ascii', errors='replace')
+                continue
+        keep.append(record)
+    name_table.names = keep
 
     font.save(file_options['output-file'])
 
 patch_font_names_fn
 `)
-  )), F;
+  )), S;
 }
-async function C() {
-  return S || (S = d().then(
-    (t) => t.runPythonAsync(`
+async function W() {
+  return V || (V = d().then(
+    (e) => e.runPythonAsync(`
 from fontTools.ttLib import TTFont
 from fontTools.varLib import instancer
 import json
@@ -166,6 +224,12 @@ def vf_clamp_instantiate(file_options, axes_json):
     font = TTFont(file_options['input-file'])
     axes_spec = json.loads(axes_json)
 
+    # The bundled fontTools can't restrict avar version 2 or VARC fonts correctly: refuse instead of mis-cutting.
+    if 'avar' in font and getattr(font['avar'], 'majorVersion', 1) >= 2:
+        raise ValueError('vf-clamp: avar version 2 fonts are not supported yet')
+    if 'VARC' in font:
+        raise ValueError('vf-clamp: fonts with a VARC table are not supported yet')
+
     limits = {}
     axes_by_tag = {ax.axisTag: ax for ax in font['fvar'].axes}
 
@@ -187,11 +251,11 @@ def vf_clamp_instantiate(file_options, axes_json):
 
 vf_clamp_instantiate
 `)
-  )), S;
+  )), V;
 }
-async function z() {
-  return V || (V = d().then(
-    (t) => t.runPythonAsync(`
+async function q() {
+  return D || (D = d().then(
+    (e) => e.runPythonAsync(`
 from fontTools.ttLib import TTFont
 
 def vf_clamp_normalize_wght(file_options, new_min_str):
@@ -211,6 +275,10 @@ def vf_clamp_normalize_wght(file_options, new_min_str):
 
     old_min = wght_axis.minValue
     default = wght_axis.defaultValue
+    # With the default at the minimum there is no below-default range to stretch; leave the font as is.
+    if default <= old_min:
+        font.save(file_options['output-file'])
+        return 'skipped'
     scale = (default - new_min) / (default - old_min)
 
     def remap(v):
@@ -244,79 +312,21 @@ def vf_clamp_normalize_wght(file_options, new_min_str):
                     av.NominalValue = remap(av.NominalValue)
                     av.RangeMinValue = remap(av.RangeMinValue)
                     av.RangeMaxValue = remap(av.RangeMaxValue)
+                elif fmt == 4:
+                    for rec in getattr(av, 'AxisValueRecord', []) or []:
+                        if rec.AxisIndex == wght_idx:
+                            rec.Value = remap(rec.Value)
 
     font.save(file_options['output-file'])
+    return 'done'
 
 vf_clamp_normalize_wght
 `)
-  )), V;
-}
-async function B() {
-  return I || (I = d().then(
-    (t) => t.runPythonAsync(`
-from fontTools.ttLib import TTFont
-
-def vf_clamp_prune_stat(file_options):
-    font = TTFont(file_options['input-file'])
-
-    if 'STAT' not in font or 'fvar' not in font:
-        font.save(file_options['output-file'])
-        return
-
-    stat = font['STAT'].table
-    if not getattr(stat, 'DesignAxisRecord', None) or not stat.DesignAxisRecord.Axis:
-        font.save(file_options['output-file'])
-        return
-
-    fvar_tags = {ax.axisTag for ax in font['fvar'].axes}
-    stat_axes = list(stat.DesignAxisRecord.Axis)
-
-    # Map old STAT AxisIndex -> new index after pruning STAT axes that vanish from fvar.
-    surviving_indices = [i for i, ax in enumerate(stat_axes) if ax.AxisTag in fvar_tags]
-    if len(surviving_indices) == len(stat_axes):
-        # No axes removed — nothing to prune.
-        font.save(file_options['output-file'])
-        return
-    old_to_new = {old: new for new, old in enumerate(surviving_indices)}
-
-    # Rewrite the DesignAxisRecord.Axis list to surviving axes only.
-    stat.DesignAxisRecord.Axis = [stat_axes[i] for i in surviving_indices]
-    if hasattr(stat, 'DesignAxisCount'):
-        stat.DesignAxisCount = len(stat.DesignAxisRecord.Axis)
-
-    # Prune AxisValueArray entries that reference removed axes.
-    if stat.AxisValueArray and stat.AxisValueArray.AxisValue:
-        kept = []
-        for av in stat.AxisValueArray.AxisValue:
-            fmt = av.Format
-            if fmt in (1, 2, 3):
-                if av.AxisIndex not in old_to_new:
-                    continue  # references a removed axis
-                av.AxisIndex = old_to_new[av.AxisIndex]
-                kept.append(av)
-            elif fmt == 4:
-                inner = list(getattr(av, 'AxisValueRecord', []) or [])
-                if any(rec.AxisIndex not in old_to_new for rec in inner):
-                    continue  # whole record dies if any inner ref is dead
-                for rec in inner:
-                    rec.AxisIndex = old_to_new[rec.AxisIndex]
-                kept.append(av)
-            else:
-                # Unknown format — keep as-is to be safe.
-                kept.append(av)
-        stat.AxisValueArray.AxisValue = kept
-        if hasattr(stat, 'AxisValueCount'):
-            stat.AxisValueCount = len(kept)
-
-    font.save(file_options['output-file'])
-
-vf_clamp_prune_stat
-`)
-  )), I;
+  )), D;
 }
-async function W() {
-  return D || (D = d().then(
-    (t) => t.runPythonAsync(`
+async function H() {
+  return N || (N = d().then(
+    (e) => e.runPythonAsync(`
 from fontTools.ttLib import TTFont
 
 def vf_clamp_update_os2(file_options):
@@ -327,25 +337,26 @@ def vf_clamp_update_os2(file_options):
         return
 
     wght_axis = next((ax for ax in font['fvar'].axes if ax.axisTag == 'wght'), None)
-    if wght_axis is None:
+    if wght_axis is not None:
+        # OS/2.usWeightClass valid range is 1..1000.
+        weight_class = int(round(max(1, min(1000, wght_axis.defaultValue))))
+    elif 'OS/2' in font:
+        # wght was pinned: fontTools has already set usWeightClass to the pinned weight.
+        weight_class = font['OS/2'].usWeightClass
+    else:
         font.save(file_options['output-file'])
         return
 
-    new_default = wght_axis.defaultValue
-    # OS/2.usWeightClass valid range is 1..1000.
-    weight_class = int(round(max(1, min(1000, new_default))))
-
     if 'OS/2' in font:
         os2 = font['OS/2']
         os2.usWeightClass = weight_class
-        # fsSelection bits: 0x20 = BOLD, 0x40 = REGULAR.
-        # Mirror the convention: REGULAR when usWeightClass < 600, BOLD when >= 700.
+        # fsSelection: 0x01 ITALIC (kept), 0x20 BOLD, 0x40 REGULAR. REGULAR only when neither ITALIC nor BOLD.
         fs = os2.fsSelection
         fs &= ~(0x20 | 0x40)
         if weight_class >= 700:
-            fs |= 0x20  # BOLD
-        elif weight_class < 600:
-            fs |= 0x40  # REGULAR
+            fs |= 0x20
+        elif not fs & 0x01:
+            fs |= 0x40
         os2.fsSelection = fs
 
     if 'head' in font:
@@ -362,257 +373,225 @@ def vf_clamp_update_os2(file_options):
 
 vf_clamp_update_os2
 `)
-  )), D;
+  )), N;
 }
-function q(t) {
-  return t.replace(/[^A-Za-z0-9 -]/g, "").trim().split(/\s+/).join("-").replace(/^-+|-+$/g, "").slice(0, 63);
+function J(e) {
+  const a = e.normalize("NFKD").replace(/[\u0300-\u036f]/g, "").replace(/[^A-Za-z0-9 -]/g, "").trim().split(/\s+/).join("-").replace(/-+/g, "-").replace(/^-+|-+$/g, "");
+  return a.length <= 63 ? a : `${a.slice(0, 56).replace(/-+$/, "")}-${P(e)}`;
 }
-async function G(t, o) {
-  if (!o) return t;
-  const a = await d(), e = new x({ pyodide: a }), n = new x({ pyodide: a });
+function P(e) {
+  let a = 2166136261;
+  for (const t of e)
+    a ^= t.codePointAt(0), a = Math.imul(a, 16777619) >>> 0;
+  return a.toString(36).padStart(6, "0").slice(-6);
+}
+async function G(e, a) {
+  if (!a) return e;
+  const t = await d(), n = new x({ pyodide: t }), i = new x({ pyodide: t });
   try {
-    const i = q(o);
-    await e.upload(t);
-    const s = /* @__PURE__ */ new Map([
-      ["input-file", e.filename],
-      ["output-file", n.filename],
-      ["family-name", o],
-      ["postscript-name", i]
+    const o = J(a);
+    await n.upload(e);
+    const r = /* @__PURE__ */ new Map([
+      ["input-file", n.filename],
+      ["output-file", i.filename],
+      ["family-name", a],
+      ["postscript-name", o],
+      ["postscript-suffix", P(a)]
     ]);
-    return (await U())(s), n.download();
-  } catch (i) {
-    throw Object.assign(new Error(`vf-clamp: name table patching failed for "${o}"`), { cause: i });
+    return (await z())(r), i.download();
+  } catch (o) {
+    throw Object.assign(new Error(`vf-clamp: name table patching failed for "${a}"`), { cause: o });
   } finally {
     try {
-      e.delete();
+      n.delete();
     } catch {
     }
     try {
-      n.delete();
+      i.delete();
     } catch {
     }
   }
 }
-function H(t) {
-  return typeof t == "number" ? t : t === null ? null : [t.min, t.max];
+function K(e) {
+  return typeof e == "number" ? e : e === null ? null : [e.min, e.max];
 }
-async function J(t, o) {
-  const a = await d(), e = new x({ pyodide: a }), n = new x({ pyodide: a });
+async function Z(e, a) {
+  const t = await d(), n = new x({ pyodide: t }), i = new x({ pyodide: t });
   try {
-    await e.upload(t);
-    const i = /* @__PURE__ */ new Map([
-      ["input-file", e.filename],
-      ["output-file", n.filename]
+    await n.upload(e);
+    const o = /* @__PURE__ */ new Map([
+      ["input-file", n.filename],
+      ["output-file", i.filename]
     ]);
-    return (await C())(i, JSON.stringify(o)), n.download();
+    return (await W())(o, JSON.stringify(a)), i.download();
   } finally {
-    try {
-      e.delete();
-    } catch {
-    }
     try {
       n.delete();
     } catch {
     }
-  }
-}
-async function Z(t) {
-  const o = await d(), a = new x({ pyodide: o }), e = new x({ pyodide: o });
-  try {
-    await a.upload(t);
-    const n = /* @__PURE__ */ new Map([
-      ["input-file", a.filename],
-      ["output-file", e.filename]
-    ]);
-    return (await B())(n), e.download();
-  } catch (n) {
-    throw Object.assign(new Error("vf-clamp: STAT pruning failed"), { cause: n });
-  } finally {
-    try {
-      a.delete();
-    } catch {
-    }
     try {
-      e.delete();
+      i.delete();
     } catch {
     }
   }
 }
-async function K(t) {
-  const o = await d(), a = new x({ pyodide: o }), e = new x({ pyodide: o });
+async function Q(e) {
+  const a = await d(), t = new x({ pyodide: a }), n = new x({ pyodide: a });
   try {
-    await a.upload(t);
-    const n = /* @__PURE__ */ new Map([
-      ["input-file", a.filename],
-      ["output-file", e.filename]
+    await t.upload(e);
+    const i = /* @__PURE__ */ new Map([
+      ["input-file", t.filename],
+      ["output-file", n.filename]
     ]);
-    return (await W())(n), e.download();
-  } catch (n) {
-    throw Object.assign(new Error("vf-clamp: OS/2 and macStyle update failed"), { cause: n });
+    return (await H())(i), n.download();
+  } catch (i) {
+    throw Object.assign(new Error("vf-clamp: OS/2 and macStyle update failed"), { cause: i });
   } finally {
     try {
-      a.delete();
+      t.delete();
     } catch {
     }
     try {
-      e.delete();
+      n.delete();
     } catch {
     }
   }
 }
-async function Q(t, o) {
-  const a = await d(), e = new x({ pyodide: a }), n = new x({ pyodide: a });
+async function X(e, a) {
+  const t = await d(), n = new x({ pyodide: t }), i = new x({ pyodide: t });
   try {
-    await e.upload(t);
-    const i = /* @__PURE__ */ new Map([
-      ["input-file", e.filename],
-      ["output-file", n.filename]
+    await n.upload(e);
+    const o = /* @__PURE__ */ new Map([
+      ["input-file", n.filename],
+      ["output-file", i.filename]
     ]);
-    return (await z())(i, String(o)), n.download();
-  } catch (i) {
-    throw Object.assign(new Error("vf-clamp: wght normalisation failed"), { cause: i });
+    return (await q())(o, String(a)) === "skipped" && console.warn("vf-clamp: normalizeWeightAxis skipped: the weight default is the axis minimum, so there is no lower range to remap"), i.download();
+  } catch (o) {
+    throw Object.assign(new Error("vf-clamp: wght normalisation failed"), { cause: o });
   } finally {
     try {
-      e.delete();
+      n.delete();
     } catch {
     }
     try {
-      n.delete();
+      i.delete();
     } catch {
     }
   }
 }
-function X(t, o) {
-  const a = new Map(o.map((i) => [i.name, i])), e = {};
-  for (const i of t) {
-    const s = a.get(i);
-    if (!s) throw new Error(`Named instance "${i}" not found in font`);
-    for (const [f, c] of Object.entries(s.coordinates))
-      e[f] ? (e[f].min = Math.min(e[f].min, c), e[f].max = Math.max(e[f].max, c)) : e[f] = { min: c, max: c };
+function Y(e, a) {
+  const t = {};
+  for (const i of e) {
+    const o = T(i, a);
+    for (const [r, s] of Object.entries(o.coordinates))
+      t[r] ? (t[r].min = Math.min(t[r].min, s), t[r].max = Math.max(t[r].max, s)) : t[r] = { min: s, max: s };
   }
   const n = {};
-  for (const [i, { min: s, max: f }] of Object.entries(e))
-    n[i] = s === f ? s : { min: s, max: f };
+  for (const [i, { min: o, max: r }] of Object.entries(t))
+    n[i] = o === r ? o : { min: o, max: r };
   return n;
 }
-function Y(t) {
-  return t.length >= 4 && t[0] === 79 && t[1] === 84 && t[2] === 84 && t[3] === 79;
+function ee(e) {
+  return e.length >= 4 && e[0] === 79 && e[1] === 84 && e[2] === 84 && e[3] === 79;
 }
-async function at(t, o) {
-  var f, c, w;
-  if (o.outputs.length === 0) return [];
-  const a = t instanceof ArrayBuffer ? new Uint8Array(t) : t, e = o.format ?? "ttf", { instances: n, axes: i } = await E(a), s = [];
-  for (const m of o.outputs) {
-    let _ = {};
-    if ((f = m.instances) != null && f.length && (_ = X(m.instances, n)), m.axes && (_ = { ..._, ...m.axes }), o.strict && ((c = m.instances) != null && c.length)) {
-      const p = new Set(m.instances), g = n.filter((h) => !p.has(h.name) && i.every((y) => {
-        const A = h.coordinates[y.tag] ?? y.default, v = _[y.tag];
-        return v == null ? !0 : typeof v == "number" ? A === v : A >= v.min && A <= v.max;
-      })).map((h) => h.name);
-      if (g.length)
-        throw new Error(`vf-clamp: output "${m.name || m.instances.join(", ")}" would include unselected instances (${g.join(", ")}); use planOutputs() to split the selection`);
+async function ae(e, a) {
+  var h, y;
+  if (a.outputs.length === 0) return [];
+  const t = e instanceof ArrayBuffer ? new Uint8Array(e) : e, n = a.format ?? "ttf", { instances: i, axes: o, family: r } = await B(t), s = [];
+  for (const f of a.outputs) {
+    let l = {};
+    if ((h = f.instances) != null && h.length && (l = Y(f.instances, i)), f.axes && (l = { ...l, ...f.axes }), a.strict) {
+      const _ = new Set((f.instances ?? []).map((p) => T(p, i))), w = i.filter((p) => !_.has(p) && o.every((b) => {
+        const F = p.coordinates[b.tag] ?? b.default, v = l[b.tag];
+        return v == null ? !0 : typeof v == "number" ? F === v : F >= v.min && F <= v.max;
+      })).map((p) => p.name);
+      if (w.length)
+        throw new Error(`vf-clamp: output "${f.name || (f.instances ?? []).join(", ") || "axes-only"}" would include unselected instances (${w.join(", ")}); use planOutputs() to split the selection`);
     }
-    for (const p of i) {
-      const g = _[p.tag];
-      if (g != null && typeof g == "object") {
-        const h = g;
-        if (p.default < h.min || p.default > h.max) {
-          const y = Math.max(h.min, Math.min(h.max, p.default));
+    for (const _ of o) {
+      const w = l[_.tag];
+      if (w != null && typeof w == "object") {
+        const p = w;
+        if (_.default < p.min || _.default > p.max) {
+          const b = Math.max(p.min, Math.min(p.max, _.default));
           console.warn(
-            `vf-clamp: axis "${p.tag}" default (${p.default}) is outside restricted range [${h.min}, ${h.max}] — will be clamped to ${y}`
+            `vf-clamp: axis "${_.tag}" default (${_.default}) is outside restricted range [${p.min}, ${p.max}] — will be clamped to ${b}`
           );
         }
       }
     }
-    const r = {};
-    for (const [p, g] of Object.entries(_))
-      g !== null && (r[p] = H(g));
-    const u = m.name || ((w = m.instances) != null && w.length ? m.instances.length === 1 ? m.instances[0] : `${m.instances[0]}-${m.instances[m.instances.length - 1]}` : "output");
-    let l = await J(a, r);
-    if (e === "otf" && !Y(l))
+    const c = {};
+    for (const [_, w] of Object.entries(l))
+      w !== null && (c[_] = K(w));
+    const u = (y = f.instances) != null && y.length ? f.instances.length === 1 ? f.instances[0] : `${f.instances[0]}-${f.instances[f.instances.length - 1]}` : "Clamped", g = f.name || (r ? `${r} ${u}` : u);
+    let m = await Z(t, c);
+    if (n === "otf" && !ee(m))
       throw new Error("vf-clamp: format 'otf' needs a CFF/CFF2 source font; this font has TrueType outlines — use 'ttf'");
-    l = await Z(l), o.normalizeWeightAxis && (l = await Q(l, 100)), l = await K(l), l = await G(l, u), e === "woff2" ? l = await $(l) : e === "woff" && (l = await L(l)), s.push({ name: u, buffer: l, format: e });
+    a.normalizeWeightAxis && (m = await X(m, 100)), m = await Q(m), m = await G(m, g), n === "woff2" ? m = await C(m) : n === "woff" && (m = await k(m)), s.push({ name: g, buffer: m, format: n });
   }
   return s;
 }
-function tt(t, o) {
-  if (t === o) return t;
-  const a = t.split(" "), e = o.split(" ");
-  let n = 0;
-  for (; n < a.length && n < e.length && a[n] === e[n]; )
-    n++;
-  let i = 0;
-  for (; i < a.length - n && i < e.length - n && a[a.length - 1 - i] === e[e.length - 1 - i]; )
-    i++;
-  const s = a.slice(0, n).join(" "), f = a.slice(n, a.length - (i || 0)).join(" "), c = e.slice(n, e.length - (i || 0)).join(" "), w = i > 0 ? a.slice(a.length - i).join(" ") : "", m = f && c ? `${f}-${c}` : f || c;
-  return [s, m, w].filter(Boolean).join(" ");
-}
-function O(t, o) {
-  const a = {};
-  for (const e of o) {
-    const n = t.map((i) => i.coordinates[e.tag] ?? e.default);
-    a[e.tag] = { min: Math.min(...n), max: Math.max(...n) };
+function O(e, a) {
+  const t = {};
+  for (const n of a) {
+    const i = e.map((o) => o.coordinates[n.tag] ?? n.default);
+    t[n.tag] = { min: Math.min(...i), max: Math.max(...i) };
   }
-  return a;
+  return t;
 }
-function N(t, o, a, e) {
-  return o.filter((n) => a.has(n.name) ? !1 : e.every((i) => {
-    const s = n.coordinates[i.tag] ?? i.default, f = t[i.tag];
-    return !f || s >= f.min && s <= f.max;
+function j(e, a, t, n) {
+  return a.filter((i) => t.has(i) ? !1 : n.every((o) => {
+    const r = i.coordinates[o.tag] ?? o.default, s = e[o.tag];
+    return !s || r >= s.min && r <= s.max;
   }));
 }
-function et(t) {
-  return t.reduce((o, a) => !o || a.maximum - a.minimum > o.maximum - o.minimum ? a : o, void 0);
+function te(e) {
+  return e.reduce((a, t) => !a || t.maximum - t.minimum > a.maximum - a.minimum ? t : a, void 0);
 }
-function it(t, o, a) {
-  const { axes: e, instances: n } = t, i = new Map(n.map((r) => [r.name, r])), s = [];
-  for (const r of new Set(o)) {
-    const u = i.get(r);
-    if (!u) throw new Error(`Named instance "${r}" not found in font`);
-    s.push(u);
-  }
-  if (!s.length) return [];
-  const f = new Set(s.map((r) => r.name));
-  let c;
-  if (!N(O(s, e), n, f, e).length)
-    c = [s];
+function ie(e, a, t) {
+  const { axes: n, instances: i } = e, o = [...new Set(a)].map((l) => T(l, i));
+  if (!o.length) return [];
+  const r = new Set(o);
+  let s;
+  if (!j(O(o, n), i, r, n).length)
+    s = [o];
   else {
-    c = s.map((u) => [u]);
-    let r = !0;
-    for (; r; ) {
-      r = !1;
-      t: for (let u = 0; u < c.length; u++)
-        for (let l = u + 1; l < c.length; l++) {
-          const p = [...c[u], ...c[l]];
-          if (!N(O(p, e), n, f, e).length) {
-            c[u] = p, c.splice(l, 1), r = !0;
-            break t;
+    s = o.map((c) => [c]);
+    let l = !0;
+    for (; l; ) {
+      l = !1;
+      e: for (let c = 0; c < s.length; c++)
+        for (let u = c + 1; u < s.length; u++) {
+          const g = [...s[c], ...s[u]];
+          if (!j(O(g, n), i, r, n).length) {
+            s[c] = g, s.splice(u, 1), l = !0;
+            break e;
           }
         }
     }
   }
-  const w = et(e), m = w ? [w, ...e.filter((r) => r.tag !== w.tag)] : e, _ = (r, u) => {
-    for (const l of m) {
-      const p = (r.coordinates[l.tag] ?? l.default) - (u.coordinates[l.tag] ?? l.default);
-      if (p) return p;
+  const h = te(n), y = h ? [h, ...n.filter((l) => l.tag !== h.tag)] : n, f = (l, c) => {
+    for (const u of y) {
+      const g = (l.coordinates[u.tag] ?? u.default) - (c.coordinates[u.tag] ?? u.default);
+      if (g) return g;
     }
     return 0;
   };
-  return c = c.map((r) => [...r].sort(_)).sort((r, u) => _(r[0], u[0])), c.map((r) => {
-    const u = r[0], l = r[r.length - 1], p = r.length === 1 ? u.name : tt(u.name, l.name);
-    return { name: a ? `${a} ${p}` : p, instances: r.map((g) => g.name) };
+  return s = s.map((l) => [...l].sort(f)).sort((l, c) => f(l[0], c[0])), s.map((l) => {
+    const c = l[0], u = l[l.length - 1], g = l.length === 1 ? c.name : U(c.name, u.name);
+    return { name: t ? `${t} ${g}` : g, instances: l.map((m) => m.name) };
   });
 }
-function ot(t, o) {
-  const a = new Map(t.instances.map((n) => [n.name, n])), e = o.map((n) => a.get(n)).filter((n) => !!n);
-  return e.length ? N(O(e, t.axes), t.instances, new Set(o), t.axes).map((n) => n.name) : [];
+function oe(e, a) {
+  const t = a.map((n) => T(n, e.instances));
+  return t.length ? j(O(t, e.axes), e.instances, new Set(t), e.axes).map((n) => n.name) : [];
 }
 export {
-  at as clampFont,
-  tt as compactName,
-  L as convertToWoff,
-  $ as convertToWoff2,
-  E as getInstances,
-  it as planOutputs,
-  ot as unboughtInstances
+  ae as clampFont,
+  U as compactName,
+  k as convertToWoff,
+  C as convertToWoff2,
+  B as getInstances,
+  ie as planOutputs,
+  oe as unboughtInstances
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@overpunch/vf-clamp",
-	"version": "2.2.0",
+	"version": "2.3.0",
 	"description": "Restrict a variable font's axis ranges to the named styles a customer bought — like CSS clamp() for design space.",
 	"type": "module",
 	"main": "dist/index.cjs",