rapier-math 1.0.1 → 1.0.2

package/src/math/layout.js

@@ -13,9 +13,9 @@ function mathScale(c) {
   return c.size * (c.screen ? Math.max(scale, Math.min(1, (c.level === 1 ? 12 : 10) / c.screen.fontSize)) : scale);
 }
 
-function mathScreenStroke(c) {
+function mathScreenStroke(c, scale) {
   if (!c.screen) return 0;
-  const {fontSize, pixelRatio, dark} = c.screen, size = fontSize * mathScale(c);
+  const {fontSize, pixelRatio, dark} = c.screen, size = fontSize * (scale ?? mathScale(c));
   if (!(size > 0)) return 0;
   const small = Math.max(0, Math.min(1, (32 - size) / 16));
   const hairline = MATH_FONT.constants.FractionRuleThickness / MATH_FONT.units * size;
@@ -41,35 +41,37 @@ function mathCompose(items, width, extra = {}) {
   return mathBox(width, h, d, svg, {left, right, inkTop:Number.isFinite(inkTop)?inkTop:-h, inkBottom:Number.isFinite(inkBottom)?inkBottom:d,...glyph,...extra});
 }
 
+const MATH_STYLED_RANGES = {
+  italic: [0x1d434, 0x1d44e, null], bold: [0x1d400, 0x1d41a, 0x1d7ce],
+  'bold-italic': [0x1d468, 0x1d482, null], script: [0x1d49c, 0x1d4b6, null],
+  'bold-script': [0x1d4d0, 0x1d4ea, null], fraktur: [0x1d504, 0x1d51e, null],
+  'bold-fraktur': [0x1d56c, 0x1d586, null], 'double-struck': [0x1d538, 0x1d552, 0x1d7d8],
+  'sans-serif': [0x1d5a0, 0x1d5ba, 0x1d7e2], 'sans-serif-bold': [0x1d5d4, 0x1d5ee, 0x1d7ec],
+  'sans-serif-italic': [0x1d608, 0x1d622, null], 'sans-serif-bold-italic': [0x1d63c, 0x1d656, null],
+  monospace: [0x1d670, 0x1d68a, 0x1d7f6],
+};
+const MATH_STYLED_LEGACY = {
+  italic: {104: 0x210e},
+  script: {66:0x212c,69:0x2130,70:0x2131,72:0x210b,73:0x2110,76:0x2112,77:0x2133,82:0x211b,101:0x212f,103:0x210a,111:0x2134},
+  fraktur: {67:0x212d,72:0x210c,73:0x2111,82:0x211c,90:0x2128},
+  'double-struck': {67:0x2102,72:0x210d,78:0x2115,80:0x2119,81:0x211a,82:0x211d,90:0x2124},
+};
+const MATH_STYLED_GREEK = {bold:0x1d6a8, italic:0x1d6e2, 'bold-italic':0x1d71c, 'sans-serif-bold':0x1d756, 'sans-serif-bold-italic':0x1d790};
+const MATH_STYLED_GREEK_SPECIAL = [0x2207,0x2202,0x3f5,0x3d1,0x3f0,0x3d5,0x3f1,0x3d6];
 function mathStyledCodePoint(cp, variant) {
-  const ranges = {
-    italic: [0x1d434, 0x1d44e, null], bold: [0x1d400, 0x1d41a, 0x1d7ce],
-    'bold-italic': [0x1d468, 0x1d482, null], script: [0x1d49c, 0x1d4b6, null],
-    'bold-script': [0x1d4d0, 0x1d4ea, null], fraktur: [0x1d504, 0x1d51e, null],
-    'bold-fraktur': [0x1d56c, 0x1d586, null], 'double-struck': [0x1d538, 0x1d552, 0x1d7d8],
-    'sans-serif': [0x1d5a0, 0x1d5ba, 0x1d7e2], 'sans-serif-bold': [0x1d5d4, 0x1d5ee, 0x1d7ec],
-    'sans-serif-italic': [0x1d608, 0x1d622, null], 'sans-serif-bold-italic': [0x1d63c, 0x1d656, null],
-    monospace: [0x1d670, 0x1d68a, 0x1d7f6],
-  };
-  const legacy = {
-    italic: {104: 0x210e},
-    script: {66:0x212c,69:0x2130,70:0x2131,72:0x210b,73:0x2110,76:0x2112,77:0x2133,82:0x211b,101:0x212f,103:0x210a,111:0x2134},
-    fraktur: {67:0x212d,72:0x210c,73:0x2111,82:0x211c,90:0x2128},
-    'double-struck': {67:0x2102,72:0x210d,78:0x2115,80:0x2119,81:0x211a,82:0x211d,90:0x2124},
-  };
   if (variant === 'normal') variant = 'italic';
-  if (legacy[variant]?.[cp] !== undefined) return legacy[variant][cp];
-  const r = ranges[variant];
+  if (MATH_STYLED_LEGACY[variant]?.[cp] !== undefined) return MATH_STYLED_LEGACY[variant][cp];
+  const r = MATH_STYLED_RANGES[variant];
   if (r) {
     if (cp >= 65 && cp <= 90) return r[0] + cp - 65;
     if (cp >= 97 && cp <= 122) return r[1] + cp - 97;
     if (r[2] && cp >= 48 && cp <= 57) return r[2] + cp - 48;
   }
-  const greek = {bold:0x1d6a8, italic:0x1d6e2, 'bold-italic':0x1d71c, 'sans-serif-bold':0x1d756, 'sans-serif-bold-italic':0x1d790}[variant];
+  const greek = MATH_STYLED_GREEK[variant];
   if (greek !== undefined) {
     if (cp >= 0x391 && cp <= 0x3a9 && cp !== 0x3a2) return greek + cp - 0x391;
     if (cp >= 0x3b1 && cp <= 0x3c9) return greek + 26 + cp - 0x3b1;
-    const special = [0x2207,0x2202,0x3f5,0x3d1,0x3f0,0x3d5,0x3f1,0x3d6].indexOf(cp);
+    const special = MATH_STYLED_GREEK_SPECIAL.indexOf(cp);
     if (special === 0) return greek + 25;
     if (special > 0) return greek + 50 + special;
   }
@@ -78,19 +80,19 @@ function mathStyledCodePoint(cp, variant) {
 
 function mathGlyphIndex(id, c, extra = {}) {
   if(c.dotless)id=MATH_FONT.dotless?.[id] ?? id;
-  const alternates=MATH_FONT.scriptAlternates[id];
-  const pixels=c.screen?c.screen.fontSize*mathScale(c):Infinity,
+  const alternates=MATH_FONT.scriptAlternates[id],scale=mathScale(c);
+  const pixels=c.screen?c.screen.fontSize*scale:Infinity,
     optical=Math.max(c.level,pixels<10?2:pixels<15?1:0);
   if(optical && alternates)id=alternates[Math.min(optical,alternates.length)-1];
   if(c.flattenAccent)id=MATH_FONT.flatAccents[id] ?? id;
-  const g = MATH_FONT.glyphs[id], s = mathScale(c) / MATH_FONT.units, stroke = mathScreenStroke(c), radius = stroke / 2;
+  const g = MATH_FONT.glyph(id), s = scale / MATH_FONT.units, stroke = mathScreenStroke(c,scale), radius = stroke / 2;
   if (!g) throw Object.assign(new Error('Unsupported mathematical glyph'), {code:'unsupported-glyph'});
   if(c.budget) {
     c.budget.outlineBytes=(c.budget.outlineBytes || 0)+g[7].length+96;
     if(c.budget.outlineBytes>4*1024*1024)throw Object.assign(new Error('Mathematical outlines exceed the rendering budget'),{code:'resource-limit'});
   }
   const svg = g[7] ? '<path d="' + g[7] + '" transform="scale(' + mathNumber(s) + ' ' + mathNumber(-s) + ')"'+
-    (c.screen ? ' data-math-ink="' + mathNumber(mathScale(c)) + '"' : '') +
+    (c.screen ? ' data-math-ink="' + mathNumber(scale) + '"' : '') +
     (stroke ? ' stroke="currentColor" stroke-width="' + mathNumber(stroke / s) + '" stroke-linejoin="round" paint-order="stroke fill"' : '') + '/>' : '';
   return mathBox(g[0] * s, Math.max(0, g[4] * s + radius), Math.max(0, -g[2] * s + radius), svg,
     {left: Math.min(0,g[1]*s-radius), right: Math.max(g[0]*s,g[3]*s+radius), inkTop:-g[4]*s-radius, inkBottom:-g[2]*s+radius, italic: g[5]*s, stroke,
@@ -98,8 +100,9 @@ function mathGlyphIndex(id, c, extra = {}) {
 }
 
 function mathGlyph(value, c, extra = {}) {
-  if ([...value].length !== 1) return mathText(value, c, extra);
-  const cp = value.codePointAt(0), mapped = mathStyledCodePoint(cp, extra.variant || c.variant);
+  const cp = value.codePointAt(0);
+  if (value.length !== (cp > 0xffff ? 2 : 1)) return mathText(value, c, extra);
+  const mapped = mathStyledCodePoint(cp, extra.variant || c.variant);
   const id = MATH_FONT.chars[mapped] ?? MATH_FONT.chars[cp];
   if (id === undefined) {
     const composed = mathFallbackGlyph(value, c, extra);
@@ -134,7 +137,7 @@ function mathStretch(value, target, c, horizontal = false) {
   const shape = (glyph, advance) => {
     const b = mathGlyphIndex(glyph,c);
     if (!horizontal || b.w !== 0) return b;
-    const g = MATH_FONT.glyphs[b.glyph], unit = b.unitScale, x = -g[1] * unit;
+    const g = MATH_FONT.glyph(b.glyph), unit = b.unitScale, x = -g[1] * unit;
     const width = (advance ?? g[3] - g[1]) * unit;
     return mathCompose([[b,x,0]],width,{italic:b.italic,accent:b.accent+x});
   };
@@ -150,7 +153,7 @@ function mathStretch(value, target, c, horizontal = false) {
     // These font glyphs have straight central shafts but no MATH assembly.
     // Preserve both end shapes and widen only a narrow central strip.
     if('=⇌⇋↞↠→↔↦'.includes(value)) {
-      const g=MATH_FONT.glyphs[natural.glyph],unit=natural.unitScale,added=target-natural.w,
+      const g=MATH_FONT.glyph(natural.glyph),unit=natural.unitScale,added=target-natural.w,
         split=g[0]*(value==='↞'?0.75:value==='↠'?0.25:0.5),half=g[0]*0.05,
         left=split-half,right=split+half,delta=added/unit;
       // The two-headed arrows have their plain shaft opposite both heads.
@@ -201,7 +204,7 @@ function mathStretch(value, target, c, horizontal = false) {
     length=(full-overlap*connections.length)*unit;
   const items=[]; let pos=0, width=0;
   for (let i=0;i<pieces.length;i++) {
-    const p=pieces[i], b=mathGlyphIndex(p[0],c), g=MATH_FONT.glyphs[b.glyph];
+    const p=pieces[i], b=mathGlyphIndex(p[0],c), g=MATH_FONT.glyph(b.glyph);
     if (horizontal) items.push([b,pos,0]);
     else items.push([b,0,-pos+g[2]*unit]);
     width=Math.max(width,b.w);
@@ -273,8 +276,9 @@ function mathKern(b,corner,height) {
 }
 
 function mathContourBands(box, dy = 0) {
-  const profile = MATH_FONT.edgeProfiles[box.glyph];
-  if (!profile || !box.unitScale || box.extended) return null;
+  if (!box.unitScale || box.extended) return null;
+  const profile = MATH_FONT.profile(box.glyph);
+  if (!profile) return null;
   const bands = [], step = MATH_FONT.edgeStep, unit = box.unitScale;
   const x = box.glyphX || 0, y = (box.glyphY || 0) + dy, radius = (box.stroke || 0) / 2;
   for (let i = profile.length - 1; i > 0; i--) if (profile[i]) {

package/src/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rapier-math-source",
   "private": true,
-  "version": "1.0.1",
+  "version": "1.0.2",
   "type": "module",
   "scripts": {
     "build": "node tools/build-math.mjs"

package/src/shell/math-resources.json

@@ -1,16 +1,16 @@
 {
-  "bundle": "rapier-math-1.0.1.js",
-  "version": "1.0.1",
+  "bundle": "rapier-math-1.0.2.js",
+  "version": "1.0.2",
   "license": "MIT AND LicenseRef-GUST-Font-License",
-  "bytes": 803451,
-  "gzipBytes": 496298,
-  "sha256": "77640802b52935b60a66e2fd04c19d4702cee4b1a8b64aece5ca332236c09283",
-  "sha384": "1kdn6mohx3a5MAiwqRWY+6oviUHUheHfY1VMsxjDsUrn7woTaa7FSKo4juYtuNaF",
+  "bytes": 712164,
+  "gzipBytes": 441919,
+  "sha256": "55c326429ed51564670c67fb4e35eddbe4115fb077440146e4fbb5f81a247f9a",
+  "sha384": "Pg2MvS4Eg4s41yUZiSPn+TCRuA4gM3JHxxbCEkuSFyHgC+t143Iv48n8P4XlkE23",
   "sources": [
     {
       "file": "math/font.js",
-      "bytes": 651457,
-      "sha256": "b697b5ba770e35904fe56a0aa6c2f748253b3d3c5b9ab39c68f4a25afae02a0d"
+      "bytes": 558719,
+      "sha256": "1263135501cb049efb087975db43c0fa6d131e5deee4282d982995d4ab0884c4"
     },
     {
       "file": "math/symbols.js",
@@ -24,13 +24,13 @@
     },
     {
       "file": "math/layout.js",
-      "bytes": 37394,
-      "sha256": "37cd00667aa1c7ef8b375c5e62171b1a7ceef53490cd13c8a77201e7ea6b13e8"
+      "bytes": 37583,
+      "sha256": "04c6d931b4c81495adb8bfdfa70093625cde4faf5aa16a4cb3baf84e9106c4e8"
     },
     {
       "file": "math/fallbacks.js",
-      "bytes": 7958,
-      "sha256": "a59c9a32f4a1ea49ad7454ea48aa25489e8e786459055d91fef045b8cc2b5f4b"
+      "bytes": 7953,
+      "sha256": "400c5771756d5a4d4cf431d471b33c280791ce4aa276a0fd2615d91ee88ae8ce"
     },
     {
       "file": "math/responsive.js",
@@ -39,25 +39,25 @@
     },
     {
       "file": "math/browser.js",
-      "bytes": 8363,
-      "sha256": "0bf9fc6c5f02c2b0c5012118b80a8fad337fe25c3a4557e2747d4d4caa5c2e1b"
+      "bytes": 9598,
+      "sha256": "fe55a2ffe969f9f2b30fe20357e85089afbd41ecfa983222131ec06855f1f2e8"
     },
     {
       "file": "math/api.js",
-      "bytes": 5825,
-      "sha256": "f05bc69c0e13230079526a98072a2ae8ffd58bfb2df2aecb0e2f26fdb43dbeb6"
+      "bytes": 5857,
+      "sha256": "52b34c348f4cd30bf3a7f2805a37d347ea9aa668a8abb2dc0b799fe749bf8ee1"
     }
   ],
   "recipe": [
     {
       "file": "math/build-font.py",
-      "bytes": 24804,
-      "sha256": "83f27e773d451a7275f6b7d521a257f79c27b3c61452a869703fe44c4ca8b878"
+      "bytes": 33369,
+      "sha256": "d54dba7b83d945da4bdeeac6a262c45d0b8f531c0801114451ac3f3d8dab9d35"
     },
     {
       "file": "math/FONT-SOURCE.md",
-      "bytes": 8095,
-      "sha256": "05e0bba9e9bf340029c8bcc97492c17958949533717a62644505846905e65499"
+      "bytes": 10357,
+      "sha256": "84ab319b1f9342fa08b421231965dd685063d8fd6bb8a071e1f1c186848dcdd9"
     },
     {
       "file": "math/FONT-LICENSE.txt",
@@ -71,8 +71,8 @@
     },
     {
       "file": "tools/build-math.mjs",
-      "bytes": 5795,
-      "sha256": "7f8582f07832c2c2a50b0b6b552df3819e8e246f8aa7857e409d443b79d463f4"
+      "bytes": 6012,
+      "sha256": "5698ec3e5aaa6a3ad833ceb240a851c0447d23ebf80455e95ef7003aa6287342"
     },
     {
       "file": "math/LICENSE-MIT",

package/src/tools/build-math.mjs

@@ -9,7 +9,7 @@ import {gzipSync} from 'node:zlib';
 import {Script} from 'node:vm';
 
 const ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '..');
-export const MATH_VERSION = '1.0.1';
+export const MATH_VERSION = '1.0.2';
 export const MATH_BUNDLE = 'rapier-math-' + MATH_VERSION + '.js';
 export const MATH_SOURCES = ['font.js', 'symbols.js', 'parser.js', 'layout.js', 'fallbacks.js', 'responsive.js', 'browser.js', 'api.js'].map(name => 'math/' + name);
 export const MATH_RECIPE = ['math/build-font.py', 'math/FONT-SOURCE.md', 'math/FONT-LICENSE.txt', 'math/package-verify.mjs', 'tools/build-math.mjs', 'math/LICENSE-MIT'];
@@ -82,7 +82,10 @@ export async function buildMath({root = ROOT, updatePins = true} = {}) {
     const loader = await readFile(loaderPath, 'utf8');
     const block = /(key: 'math',[\s\S]*?bytes: )\d+(,[\s\S]*?sri: ')[^']+(')/;
     if (!block.test(loader)) throw new Error('The math loader pin could not be located');
-    await writeFile(loaderPath, loader.replace(block, (_, before, middle, after) => before + bytes.length + middle + sha384 + after));
+    const version = /var MATH_VERSION = '[^']+';/;
+    if (!version.test(loader)) throw new Error('The math loader version could not be located');
+    await writeFile(loaderPath, loader.replace(version, "var MATH_VERSION = '" + MATH_VERSION + "';")
+      .replace(block, (_, before, middle, after) => before + bytes.length + middle + sha384 + after));
   }
   return {bundle: MATH_BUNDLE, bytes: bytes.length, gzipBytes, sha256, sha384};
 }