kindy-editor 3.2.1 → 3.2.3

package/dist-lib/{toc-DSwkNKls.js → toc-BIj8uQ-W.js}

@@ -10,10 +10,10 @@ const S = [
   for (const s of t)
     if (s.kind === "paragraph") n.push(s);
     else if (s.kind === "table" && e)
-      for (const o of s.rows)
-        for (const i of o.cells) n.push(...L(i.blocks, e));
+      for (const r of s.rows)
+        for (const i of r.cells) n.push(...L(i.blocks, e));
   return n;
-}, q = (t, e) => L(t.section[e] ?? [], !0), le = (t) => L(t.blocks, !0), z = /* @__PURE__ */ new WeakMap(), ce = (t) => {
+}, q = (t, e) => L(t.section[e] ?? [], !0), le = (t) => L(t.blocks, !0), z = /* @__PURE__ */ new WeakMap(), ae = (t) => {
   const e = [
     ...L(t.blocks, !0),
     ...S.flatMap((s) => q(t, s)),
@@ -21,66 +21,66 @@ const S = [
     ...Object.values(t.endnotes ?? {}).flat()
   ], n = /* @__PURE__ */ new Map();
   for (let s = 0; s < e.length; s++) {
-    const o = e[s].id;
-    n.has(o) || n.set(o, s);
+    const r = e[s].id;
+    n.has(r) || n.set(r, s);
   }
   return { list: e, byId: n };
 }, j = (t) => {
   let e = z.get(t);
-  return e || (e = ce(t), z.set(t, e)), e;
-}, ae = (t) => j(t).list, de = (t, e) => {
+  return e || (e = ae(t), z.set(t, e)), e;
+}, ce = (t) => j(t).list, de = (t, e) => {
   const n = j(t), s = n.byId.get(e);
   return s === void 0 ? void 0 : n.list[s];
 }, Me = (t, e) => {
   const n = j(t).byId.get(e);
   return n === void 0 ? -1 : n;
-}, G = /* @__PURE__ */ new WeakMap(), fe = (t) => {
-  let e = G.get(t);
+}, V = /* @__PURE__ */ new WeakMap(), fe = (t) => {
+  let e = V.get(t);
   if (!e) {
     const n = /* @__PURE__ */ new Set();
-    for (const s of S) for (const o of q(t, s)) n.add(o.id);
-    e = n, G.set(t, e);
+    for (const s of S) for (const r of q(t, s)) n.add(r.id);
+    e = n, V.set(t, e);
   }
   return e;
-}, U = /* @__PURE__ */ new WeakMap(), Ae = (t) => {
-  let e = U.get(t);
+}, K = /* @__PURE__ */ new WeakMap(), Ae = (t) => {
+  let e = K.get(t);
   if (!e) {
     const n = fe(t);
-    e = ae(t).filter((s) => !n.has(s.id) && !ne(s)), U.set(t, e);
+    e = ce(t).filter((s) => !n.has(s.id) && !ne(s)), K.set(t, e);
   }
   return e;
-}, Y = /* @__PURE__ */ new WeakMap(), Le = (t, e) => {
-  let n = Y.get(t);
-  n || (n = /* @__PURE__ */ new Map(), Y.set(t, n));
+}, G = /* @__PURE__ */ new WeakMap(), Le = (t, e) => {
+  let n = G.get(t);
+  n || (n = /* @__PURE__ */ new Map(), G.set(t, n));
   let s = n.get(e);
-  return s || (s = q(t, e).filter((o) => !ne(o)), n.set(e, s)), s;
-}, D = (t, e) => {
+  return s || (s = q(t, e).filter((r) => !ne(r)), n.set(e, s)), s;
+}, $ = (t, e) => {
   for (const n of t)
     if (e.add(n.id), n.kind === "table")
-      for (const s of n.rows) for (const o of s.cells) D(o.blocks, e);
-}, We = (t, e) => {
+      for (const s of n.rows) for (const r of s.cells) $(r.blocks, e);
+}, De = (t, e) => {
   const n = /* @__PURE__ */ new Set();
-  D(t.blocks, n);
-  for (const s of S) D(t.section[s] ?? [], n);
-  for (const s of Object.values(t.footnotes ?? {})) for (const o of s) n.add(o.id);
-  for (const s of Object.values(t.endnotes ?? {})) for (const o of s) n.add(o.id);
+  $(t.blocks, n);
+  for (const s of S) $(t.section[s] ?? [], n);
+  for (const s of Object.values(t.footnotes ?? {})) for (const r of s) n.add(r.id);
+  for (const s of Object.values(t.endnotes ?? {})) for (const r of s) n.add(r.id);
   return n.has(e);
 }, se = (t, e) => e === "body" ? t.blocks : t.section[e] ?? [];
-function V(t, e, n) {
+function U(t, e, n) {
   for (let s = 0; s < t.length; s++) {
-    const o = t[s];
-    if (o.kind === "paragraph") {
-      if (o.id === n)
+    const r = t[s];
+    if (r.kind === "paragraph") {
+      if (r.id === n)
         return e === "body" ? { kind: "top", bi: s } : { kind: "band", band: e, bi: s };
-    } else if (o.kind === "table")
-      for (let i = 0; i < o.rows.length; i++) {
-        const r = o.rows[i];
-        for (let c = 0; c < r.cells.length; c++) {
-          const l = r.cells[c];
-          for (let a = 0; a < l.blocks.length; a++) {
-            const d = l.blocks[a];
+    } else if (r.kind === "table")
+      for (let i = 0; i < r.rows.length; i++) {
+        const o = r.rows[i];
+        for (let a = 0; a < o.cells.length; a++) {
+          const l = o.cells[a];
+          for (let c = 0; c < l.blocks.length; c++) {
+            const d = l.blocks[c];
             if (d.kind === "paragraph" && d.id === n)
-              return { kind: "cell", where: e, bi: s, ri: i, ci: c, pi: a };
+              return { kind: "cell", where: e, bi: s, ri: i, ci: a, pi: c };
           }
         }
       }
@@ -88,18 +88,18 @@ function V(t, e, n) {
   return null;
 }
 function M(t, e) {
-  const n = V(t.blocks, "body", e);
+  const n = U(t.blocks, "body", e);
   if (n) return n;
   for (const s of S) {
-    const o = V(t.section[s] ?? [], s, e);
-    if (o) return o;
+    const r = U(t.section[s] ?? [], s, e);
+    if (r) return r;
   }
-  for (const [s, o] of Object.entries(t.footnotes ?? {})) {
-    const i = o.findIndex((r) => r.id === e);
+  for (const [s, r] of Object.entries(t.footnotes ?? {})) {
+    const i = r.findIndex((o) => o.id === e);
     if (i >= 0) return { kind: "footnote", noteId: s, pi: i };
   }
-  for (const [s, o] of Object.entries(t.endnotes ?? {})) {
-    const i = o.findIndex((r) => r.id === e);
+  for (const [s, r] of Object.entries(t.endnotes ?? {})) {
+    const i = r.findIndex((o) => o.id === e);
     if (i >= 0) return { kind: "endnote", noteId: s, pi: i };
   }
   return null;
@@ -124,10 +124,10 @@ function R(t, e, n) {
     const l = t.blocks.slice();
     return l[e.bi] = n, { ...t, blocks: l };
   }
-  const s = se(t, e.where).slice(), o = s[e.bi], i = o.rows.slice(), r = { cells: i[e.ri].cells.slice() }, c = { ...r.cells[e.ci], blocks: r.cells[e.ci].blocks.slice() };
-  return c.blocks[e.pi] = n, r.cells[e.ci] = c, i[e.ri] = r, s[e.bi] = { ...o, rows: i, revision: o.revision + 1 }, e.where === "body" ? { ...t, blocks: s } : { ...t, section: { ...t.section, [e.where]: s } };
+  const s = se(t, e.where).slice(), r = s[e.bi], i = r.rows.slice(), o = { cells: i[e.ri].cells.slice() }, a = { ...o.cells[e.ci], blocks: o.cells[e.ci].blocks.slice() };
+  return a.blocks[e.pi] = n, o.cells[e.ci] = a, i[e.ri] = o, s[e.bi] = { ...r, rows: i, revision: r.revision + 1 }, e.where === "body" ? { ...t, blocks: s } : { ...t, section: { ...t.section, [e.where]: s } };
 }
-const $e = (t, e) => M(t, e)?.kind === "cell", F = (t) => t.map((e) => e.text).join(""), De = (t, e) => {
+const We = (t, e) => M(t, e)?.kind === "cell", F = (t) => t.map((e) => e.text).join(""), $e = (t, e) => {
   const n = de(t, e);
   return n ? F(n.runs) : "";
 };
@@ -164,9 +164,9 @@ function _e(t, e) {
 function ue(t, e) {
   let n = 0;
   for (const s of t) {
-    const o = n + s.text.length;
-    if (e > n && e <= o && s.text.length > 0) return s.style;
-    n = o;
+    const r = n + s.text.length;
+    if (e > n && e <= r && s.text.length > 0) return s.style;
+    n = r;
   }
   return t[0]?.style;
 }
@@ -199,45 +199,45 @@ function be(t = {}) {
     indentLeftPx: 0
   };
 }
-const oe = he(), Ge = be();
-function Ue(t) {
+const re = he(), Ve = be();
+function Ke(t) {
   const e = t.sdtPath;
   return e && e.length > 0 ? e[e.length - 1] : void 0;
 }
 function ke(t, e) {
   const n = t?.length ?? 0, s = e?.length ?? 0;
   if (n !== s) return !1;
-  for (let o = 0; o < n; o++) if (t[o] !== e[o]) return !1;
+  for (let r = 0; r < n; r++) if (t[r] !== e[r]) return !1;
   return !0;
 }
-function Ye(t, e) {
+function Ge(t, e) {
   return t.sdtPath?.includes(e) ?? !1;
 }
-function Ve(t, e) {
+function Ue(t, e) {
   return t && t.length > 0 ? [...t, e] : [e];
 }
-function Xe(t, e) {
+function Ye(t, e) {
   if (!t) return;
   const n = t.filter((s) => s !== e);
   return n.length > 0 ? n : void 0;
 }
-function Je(t, e) {
+function Xe(t, e) {
   if (!t) return;
   const n = t.indexOf(e);
   return n < 0 ? void 0 : t.slice(0, n + 1);
 }
 function ge(t) {
-  const e = (r) => Number.isFinite(r) ? Math.min(0.999, Math.max(0, r)) : 0;
-  let { left: n, top: s, right: o, bottom: i } = { left: e(t.left), top: e(t.top), right: e(t.right), bottom: e(t.bottom) };
-  if (n + o >= 1) {
-    const r = 0.999 / (n + o);
-    n *= r, o *= r;
+  const e = (o) => Number.isFinite(o) ? Math.min(0.999, Math.max(0, o)) : 0;
+  let { left: n, top: s, right: r, bottom: i } = { left: e(t.left), top: e(t.top), right: e(t.right), bottom: e(t.bottom) };
+  if (n + r >= 1) {
+    const o = 0.999 / (n + r);
+    n *= o, r *= o;
   }
   if (s + i >= 1) {
-    const r = 0.999 / (s + i);
-    s *= r, i *= r;
+    const o = 0.999 / (s + i);
+    s *= o, i *= o;
   }
-  return { left: n, top: s, right: o, bottom: i };
+  return { left: n, top: s, right: r, bottom: i };
 }
 function me(t, e) {
   return !t || !e ? !t == !e : t.font === e.font && t.char === e.char;
@@ -248,6 +248,7 @@ function Ie(t, e) {
   !!t.smallCaps == !!e.smallCaps && t.link === e.link && t.footnoteRef === e.footnoteRef && // adjacent refs must never merge into one run
   ke(t.sdtPath, e.sdtPath) && // content-control boundaries (incl. nesting) survive normalization
   t.fieldId === e.fieldId && // inline-field boundaries survive normalization
+  t.variableKey === e.variableKey && // template variable boundaries survive normalization
   t.equation === e.equation && // inline equations are atomic — never merge (reference identity)
   // Minor run typography & effects (w:rPr extras) — compared so styled runs never
   // merge with plain ones (and a struck-through pair keeps its boundary).
@@ -257,55 +258,65 @@ function ye(t, e) {
   return t === e ? !0 : !t || !e ? !1 : t.color === e.color && t.widthPx === e.widthPx && t.style === e.style;
 }
 function x(t, e) {
-  const n = t.filter((o) => o.text.length > 0);
+  const n = t.filter((r) => r.text.length > 0);
   if (n.length === 0) return [{ text: "", style: t[0]?.style ?? e }];
   const s = [{ ...n[0] }];
-  for (let o = 1; o < n.length; o++) {
-    const i = n[o], r = s[s.length - 1];
-    Ie(r.style, i.style) ? r.text += i.text : s.push({ ...i });
+  for (let r = 1; r < n.length; r++) {
+    const i = n[r], o = s[s.length - 1];
+    Ie(o.style, i.style) ? o.text += i.text : s.push({ ...i });
   }
   return s;
 }
 function y(t, e) {
   const n = [], s = [];
-  let o = 0;
+  let r = 0;
   for (const i of t) {
-    const r = o + i.text.length;
-    r <= e ? n.push(i) : o >= e ? s.push(i) : (n.push({ text: i.text.slice(0, e - o), style: i.style }), s.push({ text: i.text.slice(e - o), style: i.style })), o = r;
+    const o = r + i.text.length;
+    o <= e ? n.push(i) : r >= e ? s.push(i) : (n.push({ text: i.text.slice(0, e - r), style: i.style }), s.push({ text: i.text.slice(e - r), style: i.style })), r = o;
   }
   return [n, s];
 }
-function re(t, e, n) {
-  const [, s] = y(t, e), [o] = y(s, n - e);
-  return o;
+function oe(t, e, n) {
+  const [, s] = y(t, e), [r] = y(s, n - e);
+  return r;
 }
 function p(t, e) {
-  return ue(t, e) ?? { ...oe };
+  const n = ue(t, e) ?? { ...re };
+  if (n.variableKey !== void 0) {
+    const { variableKey: s, ...r } = n;
+    return r;
+  }
+  return n;
 }
 function we(t, e, n, s) {
-  const o = s ?? p(t, e), [i, r] = y(t, e);
-  return x([...i, { text: n, style: o }, ...r], o);
+  let r = s ?? p(t, e);
+  if (r.variableKey !== void 0) {
+    const { variableKey: a, ...l } = r;
+    r = l;
+  }
+  const [i, o] = y(t, e);
+  return x([...i, { text: n, style: r }, ...o], r);
 }
 function xe(t, e, n) {
-  const [s, o] = y(t, e);
-  return x([...s, ...n, ...o], p(t, e));
+  const [s, r] = y(t, e);
+  return x([...s, ...n, ...r], p(t, e));
 }
 function pe(t, e, n) {
-  const [s, o] = y(t, e), [, i] = y(o, n - e);
+  const [s, r] = y(t, e), [, i] = y(r, n - e);
   return x([...s, ...i], p(t, e));
 }
-function Qe(t, e, n, s) {
-  const [o, i] = y(t, e), [r, c] = y(i, n - e), l = r.map((a) => ({ text: a.text, style: { ...a.style, ...s } }));
-  return x([...o, ...l, ...c], p(t, e));
+function Je(t, e, n, s) {
+  const [r, i] = y(t, e), [o, a] = y(i, n - e), l = o.map((c) => ({ text: c.text, style: { ...c.style, ...s } }));
+  return x([...r, ...l, ...a], p(t, e));
 }
-function Ze(t, e, n, s) {
-  const [o, i] = y(t, e), [r, c] = y(i, n - e), l = r.map((h) => h.text).join(""), a = s(l);
+function Qe(t, e, n, s) {
+  const [r, i] = y(t, e), [o, a] = y(i, n - e), l = o.map((h) => h.text).join(""), c = s(l);
   let d = 0;
-  const f = a.length === l.length ? r.map((h) => {
-    const u = a.slice(d, d + h.text.length);
+  const f = c.length === l.length ? o.map((h) => {
+    const u = c.slice(d, d + h.text.length);
     return d += h.text.length, { text: u, style: h.style };
-  }) : r;
-  return x([...o, ...f, ...c], p(t, e));
+  }) : o;
+  return x([...r, ...f, ...a], p(t, e));
 }
 const b = (t) => t;
 function E(t, e) {
@@ -319,25 +330,25 @@ function k(t, e) {
 function w(t, e, n) {
   return e === "body" ? { ...t, blocks: n } : { ...t, section: { ...t.section, [e]: n } };
 }
-function W(t, e) {
+function D(t, e) {
   for (const n of ["body", ...S]) {
-    const s = k(t, n).findIndex((o) => o.id === e);
+    const s = k(t, n).findIndex((r) => r.id === e);
     if (s >= 0) return { where: n, index: s };
   }
   return null;
 }
 function g(t, e) {
-  const n = W(t, e), s = n ? k(t, n.where)[n.index] : void 0;
+  const n = D(t, e), s = n ? k(t, n.where)[n.index] : void 0;
   if (!n || !s || s.kind !== "table") throw new Error(`table ${e} not found`);
   return { where: n.where, bi: n.index, block: s };
 }
 function m(t, e, n, s) {
-  const o = k(t, e).slice();
-  return o[n] = { ...s, revision: s.revision + 1 }, w(t, e, o);
+  const r = k(t, e).slice();
+  return r[n] = { ...s, revision: s.revision + 1 }, w(t, e, r);
 }
-function N(t, e, n, s, o, i) {
-  const r = k(t, e).slice(), c = r[n], l = c.rows.slice(), a = { cells: l[s].cells.slice() };
-  return a.cells[o] = { ...a.cells[o], blocks: i }, l[s] = a, r[n] = { ...c, rows: l, revision: c.revision + 1 }, w(t, e, r);
+function N(t, e, n, s, r, i) {
+  const o = k(t, e).slice(), a = o[n], l = a.rows.slice(), c = { cells: l[s].cells.slice() };
+  return c.cells[r] = { ...c.cells[r], blocks: i }, l[s] = c, o[n] = { ...a, rows: l, revision: a.revision + 1 }, w(t, e, o);
 }
 function O(t) {
   for (const e of t)
@@ -345,21 +356,21 @@ function O(t) {
       for (const s of n.blocks) if (s.kind === "paragraph") return s;
 }
 function Pe(t, e) {
-  const n = W(t, e);
+  const n = D(t, e);
   if (n) {
     const s = k(t, n.where)[n.index];
     return s?.kind === "image" ? { kind: "top", where: n.where, index: n.index, image: s } : null;
   }
   for (let s = 0; s < t.blocks.length; s++) {
-    const o = t.blocks[s];
-    if (o.kind === "table")
-      for (let i = 0; i < o.rows.length; i++) {
-        const r = o.rows[i];
-        for (let c = 0; c < r.cells.length; c++) {
-          const l = r.cells[c];
-          for (let a = 0; a < l.blocks.length; a++) {
-            const d = l.blocks[a];
-            if (d.kind === "image" && d.id === e) return { kind: "cell", bi: s, ri: i, ci: c, ii: a, image: d };
+    const r = t.blocks[s];
+    if (r.kind === "table")
+      for (let i = 0; i < r.rows.length; i++) {
+        const o = r.rows[i];
+        for (let a = 0; a < o.cells.length; a++) {
+          const l = o.cells[a];
+          for (let c = 0; c < l.blocks.length; c++) {
+            const d = l.blocks[c];
+            if (d.kind === "image" && d.id === e) return { kind: "cell", bi: s, ri: i, ci: a, ii: c, image: d };
           }
         }
       }
@@ -367,24 +378,24 @@ function Pe(t, e) {
   return null;
 }
 function ve(t, e, n) {
-  const s = W(t, e);
+  const s = D(t, e);
   if (s) {
-    const o = k(t, s.where)[s.index];
-    return o?.kind === n ? { kind: "top", where: s.where, index: s.index, block: o } : null;
+    const r = k(t, s.where)[s.index];
+    return r?.kind === n ? { kind: "top", where: s.where, index: s.index, block: r } : null;
   }
-  for (const o of ["body", ...S]) {
-    const i = k(t, o);
-    for (let r = 0; r < i.length; r++) {
-      const c = i[r];
-      if (c.kind === "table")
-        for (let l = 0; l < c.rows.length; l++) {
-          const a = c.rows[l];
-          for (let d = 0; d < a.cells.length; d++) {
-            const f = a.cells[d];
+  for (const r of ["body", ...S]) {
+    const i = k(t, r);
+    for (let o = 0; o < i.length; o++) {
+      const a = i[o];
+      if (a.kind === "table")
+        for (let l = 0; l < a.rows.length; l++) {
+          const c = a.rows[l];
+          for (let d = 0; d < c.cells.length; d++) {
+            const f = c.cells[d];
             for (let h = 0; h < f.blocks.length; h++) {
               const u = f.blocks[h];
               if (u.kind === n && u.id === e)
-                return { kind: "cell", where: o, bi: r, ri: l, ci: d, ii: h, block: u };
+                return { kind: "cell", where: r, bi: o, ri: l, ci: d, ii: h, block: u };
             }
           }
         }
@@ -392,66 +403,66 @@ function ve(t, e, n) {
   }
   return null;
 }
-function X(t, e) {
+function Y(t, e) {
   return ve(t, e, "equation");
 }
-function J(t, e, n) {
+function X(t, e, n) {
   if (e.kind === "top") {
     const i = k(t, e.where).slice();
     return i[e.index] = n, w(t, e.where, i);
   }
-  const o = k(t, e.where)[e.bi].rows[e.ri].cells[e.ci].blocks.slice();
-  return o[e.ii] = n, N(t, e.where, e.bi, e.ri, e.ci, o);
+  const r = k(t, e.where)[e.bi].rows[e.ri].cells[e.ci].blocks.slice();
+  return r[e.ii] = n, N(t, e.where, e.bi, e.ri, e.ci, r);
 }
 function Se(t) {
   let e = 1;
   const n = [];
   for (const s of t.rows) {
-    let o = 0;
+    let r = 0;
     for (const i of s.cells) {
-      for (; (n[o] ?? 0) > 0; ) o++;
-      const r = Math.max(1, i.colSpan ?? 1), c = Math.max(1, i.rowSpan ?? 1);
-      if (c > 1) for (let l = 0; l < r; l++) n[o + l] = c;
-      o += r;
+      for (; (n[r] ?? 0) > 0; ) r++;
+      const o = Math.max(1, i.colSpan ?? 1), a = Math.max(1, i.rowSpan ?? 1);
+      if (a > 1) for (let l = 0; l < o; l++) n[r + l] = a;
+      r += o;
     }
-    e = Math.max(e, o);
+    e = Math.max(e, r);
     for (let i = 0; i < n.length; i++) n[i] > 0 && n[i]--;
   }
   return e;
 }
-function $(t) {
+function W(t) {
   const e = Se(t);
   return t.colFractions && t.colFractions.length === e ? t.colFractions : Array.from({ length: e }, () => 1 / e);
 }
 function v(t, e) {
   return { ...t, runs: e, revision: t.revision + 1 };
 }
-function Ke(t, e) {
+function Ze(t, e) {
   switch (e.type) {
     case "insertText": {
-      const { loc: n, block: s } = E(t, e.at.blockId), o = we(s.runs, e.at.offset, e.text, e.style), i = e.text.length;
+      const { loc: n, block: s } = E(t, e.at.blockId), r = we(s.runs, e.at.offset, e.text, e.style), i = e.text.length;
       return {
-        doc: R(t, n, v(s, o)),
+        doc: R(t, n, v(s, r)),
         inverse: { type: "deleteRange", blockId: s.id, start: e.at.offset, end: e.at.offset + i },
-        mapPosition: (r) => r.blockId === s.id && r.offset >= e.at.offset ? { blockId: r.blockId, offset: r.offset + i } : r,
+        mapPosition: (o) => o.blockId === s.id && o.offset >= e.at.offset ? { blockId: o.blockId, offset: o.offset + i } : o,
         dirtyBlockIds: [s.id]
       };
     }
     case "insertRuns": {
-      const { loc: n, block: s } = E(t, e.at.blockId), o = F(e.runs).length, i = xe(s.runs, e.at.offset, e.runs);
+      const { loc: n, block: s } = E(t, e.at.blockId), r = F(e.runs).length, i = xe(s.runs, e.at.offset, e.runs);
       return {
         doc: R(t, n, v(s, i)),
-        inverse: { type: "deleteRange", blockId: s.id, start: e.at.offset, end: e.at.offset + o },
-        mapPosition: (r) => r.blockId === s.id && r.offset >= e.at.offset ? { blockId: r.blockId, offset: r.offset + o } : r,
+        inverse: { type: "deleteRange", blockId: s.id, start: e.at.offset, end: e.at.offset + r },
+        mapPosition: (o) => o.blockId === s.id && o.offset >= e.at.offset ? { blockId: o.blockId, offset: o.offset + r } : o,
         dirtyBlockIds: [s.id]
       };
     }
     case "deleteRange": {
-      const { loc: n, block: s } = E(t, e.blockId), o = re(s.runs, e.start, e.end), i = pe(s.runs, e.start, e.end), r = e.end - e.start;
+      const { loc: n, block: s } = E(t, e.blockId), r = oe(s.runs, e.start, e.end), i = pe(s.runs, e.start, e.end), o = e.end - e.start;
       return {
         doc: R(t, n, v(s, i)),
-        inverse: { type: "insertRuns", at: { blockId: s.id, offset: e.start }, runs: o },
-        mapPosition: (c) => c.blockId !== s.id || c.offset <= e.start ? c : { blockId: c.blockId, offset: c.offset >= e.end ? c.offset - r : e.start },
+        inverse: { type: "insertRuns", at: { blockId: s.id, offset: e.start }, runs: r },
+        mapPosition: (a) => a.blockId !== s.id || a.offset <= e.start ? a : { blockId: a.blockId, offset: a.offset >= e.end ? a.offset - o : e.start },
         dirtyBlockIds: [s.id]
       };
     }
@@ -466,9 +477,9 @@ function Ke(t, e) {
       };
     }
     case "setParaStyle": {
-      const { loc: n, block: s } = E(t, e.blockId), o = {};
-      for (const r of Object.keys(e.patch))
-        o[r] = s.style[r];
+      const { loc: n, block: s } = E(t, e.blockId), r = {};
+      for (const o of Object.keys(e.patch))
+        r[o] = s.style[o];
       const i = {
         ...s,
         style: { ...s.style, ...e.patch },
@@ -476,7 +487,7 @@ function Ke(t, e) {
       };
       return {
         doc: R(t, n, i),
-        inverse: { type: "setParaStyle", blockId: s.id, patch: o },
+        inverse: { type: "setParaStyle", blockId: s.id, patch: r },
         mapPosition: b,
         dirtyBlockIds: [s.id]
       };
@@ -484,33 +495,33 @@ function Ke(t, e) {
     case "splitParagraph": {
       const n = M(t, e.at.blockId);
       if (!n) throw new Error(`paragraph ${e.at.blockId} not found`);
-      const s = H(t, n), [o, i] = y(s.runs, e.at.offset), r = p(s.runs, e.at.offset), c = v(s, x(o, r)), l = {
+      const s = H(t, n), [r, i] = y(s.runs, e.at.offset), o = p(s.runs, e.at.offset), a = v(s, x(r, o)), l = {
         kind: "paragraph",
         id: e.newBlockId,
         revision: 0,
-        runs: x(i, r),
+        runs: x(i, o),
         style: e.newStyle ?? { ...s.style },
         // The tail's block-level content control is declared by the op (the split
         // command carries the source paragraph's path; the merge inverse restores
         // the original tail's). Absent → the tail belongs to no block control.
         ...e.newSdtPath?.length ? { sdtPath: e.newSdtPath } : {}
       };
-      let a;
+      let c;
       if (n.kind === "cell") {
         const f = k(t, n.where)[n.bi].rows[n.ri].cells[n.ci].blocks.slice();
-        f.splice(n.pi, 1, c, l), a = N(t, n.where, n.bi, n.ri, n.ci, f);
+        f.splice(n.pi, 1, a, l), c = N(t, n.where, n.bi, n.ri, n.ci, f);
       } else if (n.kind === "footnote") {
         const d = t.footnotes[n.noteId].slice();
-        d.splice(n.pi, 1, c, l), a = { ...t, footnotes: { ...t.footnotes, [n.noteId]: d } };
+        d.splice(n.pi, 1, a, l), c = { ...t, footnotes: { ...t.footnotes, [n.noteId]: d } };
       } else if (n.kind === "endnote") {
         const d = t.endnotes[n.noteId].slice();
-        d.splice(n.pi, 1, c, l), a = { ...t, endnotes: { ...t.endnotes, [n.noteId]: d } };
+        d.splice(n.pi, 1, a, l), c = { ...t, endnotes: { ...t.endnotes, [n.noteId]: d } };
       } else {
         const d = n.kind === "band" ? n.band : "body", f = k(t, d).slice();
-        f.splice(n.bi, 1, c, l), a = w(t, d, f);
+        f.splice(n.bi, 1, a, l), c = w(t, d, f);
       }
       return {
-        doc: a,
+        doc: c,
         inverse: { type: "mergeParagraphs", firstBlockId: s.id },
         mapPosition: (d) => d.blockId === s.id && d.offset >= e.at.offset ? { blockId: e.newBlockId, offset: d.offset - e.at.offset } : d,
         dirtyBlockIds: [s.id, e.newBlockId]
@@ -520,56 +531,56 @@ function Ke(t, e) {
       const n = M(t, e.firstBlockId);
       if (!n) throw new Error(`paragraph ${e.firstBlockId} not found`);
       const s = H(t, n);
-      let o;
+      let r;
       if (n.kind === "cell") {
-        const a = k(t, n.where)[n.bi].rows[n.ri].cells[n.ci].blocks[n.pi + 1];
-        if (!a || a.kind !== "paragraph")
+        const c = k(t, n.where)[n.bi].rows[n.ri].cells[n.ci].blocks[n.pi + 1];
+        if (!c || c.kind !== "paragraph")
           throw new Error("mergeParagraphs: no next paragraph in cell");
-        o = a;
+        r = c;
       } else if (n.kind === "footnote") {
         const l = t.footnotes[n.noteId][n.pi + 1];
         if (!l) throw new Error("mergeParagraphs: no next paragraph in footnote");
-        o = l;
+        r = l;
       } else if (n.kind === "endnote") {
         const l = t.endnotes[n.noteId][n.pi + 1];
         if (!l) throw new Error("mergeParagraphs: no next paragraph in endnote");
-        o = l;
+        r = l;
       } else {
-        const l = n.kind === "band" ? n.band : "body", a = k(t, l)[n.bi + 1];
-        if (!a || a.kind !== "paragraph")
+        const l = n.kind === "band" ? n.band : "body", c = k(t, l)[n.bi + 1];
+        if (!c || c.kind !== "paragraph")
           throw new Error("mergeParagraphs: no next paragraph");
-        o = a;
+        r = c;
       }
-      const i = F(s.runs).length, r = v(
+      const i = F(s.runs).length, o = v(
         s,
-        x([...s.runs, ...o.runs], p(s.runs, i))
+        x([...s.runs, ...r.runs], p(s.runs, i))
       );
-      let c;
+      let a;
       if (n.kind === "cell") {
-        const a = k(t, n.where)[n.bi].rows[n.ri].cells[n.ci].blocks.slice();
-        a.splice(n.pi, 2, r), c = N(t, n.where, n.bi, n.ri, n.ci, a);
+        const c = k(t, n.where)[n.bi].rows[n.ri].cells[n.ci].blocks.slice();
+        c.splice(n.pi, 2, o), a = N(t, n.where, n.bi, n.ri, n.ci, c);
       } else if (n.kind === "footnote") {
         const l = t.footnotes[n.noteId].slice();
-        l.splice(n.pi, 2, r), c = { ...t, footnotes: { ...t.footnotes, [n.noteId]: l } };
+        l.splice(n.pi, 2, o), a = { ...t, footnotes: { ...t.footnotes, [n.noteId]: l } };
       } else if (n.kind === "endnote") {
         const l = t.endnotes[n.noteId].slice();
-        l.splice(n.pi, 2, r), c = { ...t, endnotes: { ...t.endnotes, [n.noteId]: l } };
+        l.splice(n.pi, 2, o), a = { ...t, endnotes: { ...t.endnotes, [n.noteId]: l } };
       } else {
-        const l = n.kind === "band" ? n.band : "body", a = k(t, l).slice();
-        a.splice(n.bi, 2, r), c = w(t, l, a);
+        const l = n.kind === "band" ? n.band : "body", c = k(t, l).slice();
+        c.splice(n.bi, 2, o), a = w(t, l, c);
       }
       return {
-        doc: c,
+        doc: a,
         inverse: {
           type: "splitParagraph",
           at: { blockId: s.id, offset: i },
-          newBlockId: o.id,
-          newStyle: o.style,
+          newBlockId: r.id,
+          newStyle: r.style,
           // Restore the merged-away tail's block-level control on undo.
-          ...o.sdtPath?.length ? { newSdtPath: o.sdtPath } : {}
+          ...r.sdtPath?.length ? { newSdtPath: r.sdtPath } : {}
         },
-        mapPosition: (l) => l.blockId === o.id ? { blockId: s.id, offset: i + l.offset } : l,
-        dirtyBlockIds: [s.id, o.id]
+        mapPosition: (l) => l.blockId === r.id ? { blockId: s.id, offset: i + l.offset } : l,
+        dirtyBlockIds: [s.id, r.id]
       };
     }
     case "insertBlock": {
@@ -582,156 +593,156 @@ function Ke(t, e) {
       };
     }
     case "removeBlock": {
-      const n = W(t, e.blockId);
+      const n = D(t, e.blockId);
       if (!n) throw new Error(`block ${e.blockId} not found`);
-      const s = k(t, n.where).slice(), o = s[n.index];
+      const s = k(t, n.where).slice(), r = s[n.index];
       s.splice(n.index, 1);
       const i = s[Math.min(n.index, s.length - 1)];
       return {
         doc: w(t, n.where, s),
-        inverse: { type: "insertBlock", index: n.index, block: o, where: n.where },
-        mapPosition: (r) => r.blockId === e.blockId && i ? { blockId: i.id, offset: 0 } : r,
+        inverse: { type: "insertBlock", index: n.index, block: r, where: n.where },
+        mapPosition: (o) => o.blockId === e.blockId && i ? { blockId: i.id, offset: 0 } : o,
         dirtyBlockIds: [e.blockId]
       };
     }
     case "setImageProps": {
       const n = Pe(t, e.blockId);
       if (!n) throw new Error(`image ${e.blockId} not found`);
-      const s = n.image, o = {};
-      e.patch.widthPx !== void 0 && (o.widthPx = s.widthPx), e.patch.heightPx !== void 0 && (o.heightPx = s.heightPx), e.patch.align !== void 0 && (o.align = s.align), e.patch.wrap !== void 0 && (o.wrap = s.wrap ?? null), e.patch.anchor !== void 0 && (o.anchor = s.anchor ?? null), e.patch.crop !== void 0 && (o.crop = s.crop ?? null);
+      const s = n.image, r = {};
+      e.patch.widthPx !== void 0 && (r.widthPx = s.widthPx), e.patch.heightPx !== void 0 && (r.heightPx = s.heightPx), e.patch.align !== void 0 && (r.align = s.align), e.patch.wrap !== void 0 && (r.wrap = s.wrap ?? null), e.patch.anchor !== void 0 && (r.anchor = s.anchor ?? null), e.patch.crop !== void 0 && (r.crop = s.crop ?? null);
       const i = { ...s, revision: s.revision + 1 };
       e.patch.widthPx !== void 0 && (i.widthPx = e.patch.widthPx), e.patch.heightPx !== void 0 && (i.heightPx = e.patch.heightPx), e.patch.align !== void 0 && (i.align = e.patch.align), e.patch.wrap !== void 0 && (e.patch.wrap === null ? delete i.wrap : i.wrap = e.patch.wrap), e.patch.anchor !== void 0 && (e.patch.anchor === null ? delete i.anchor : i.anchor = e.patch.anchor), e.patch.crop !== void 0 && (e.patch.crop === null ? delete i.crop : i.crop = ge(e.patch.crop));
-      let r;
+      let o;
       if (n.kind === "top") {
-        const c = k(t, n.where).slice();
-        c[n.index] = i, r = w(t, n.where, c);
+        const a = k(t, n.where).slice();
+        a[n.index] = i, o = w(t, n.where, a);
       } else {
         const l = t.blocks[n.bi].rows[n.ri].cells[n.ci].blocks.slice();
-        l[n.ii] = i, r = N(t, "body", n.bi, n.ri, n.ci, l);
+        l[n.ii] = i, o = N(t, "body", n.bi, n.ri, n.ci, l);
       }
       return {
-        doc: r,
-        inverse: { type: "setImageProps", blockId: e.blockId, patch: o },
+        doc: o,
+        inverse: { type: "setImageProps", blockId: e.blockId, patch: r },
         mapPosition: b,
         dirtyBlockIds: [e.blockId]
       };
     }
     case "setEquation": {
-      const n = X(t, e.blockId);
+      const n = Y(t, e.blockId);
       if (!n) throw new Error(`equation ${e.blockId} not found`);
-      const s = n.block.equation, o = { ...n.block, revision: n.block.revision + 1, equation: e.equation };
+      const s = n.block.equation, r = { ...n.block, revision: n.block.revision + 1, equation: e.equation };
       return {
-        doc: J(t, n, o),
+        doc: X(t, n, r),
         inverse: { type: "setEquation", blockId: e.blockId, equation: s },
         mapPosition: b,
         dirtyBlockIds: [e.blockId]
       };
     }
     case "setEquationAlign": {
-      const n = X(t, e.blockId);
+      const n = Y(t, e.blockId);
       if (!n) throw new Error(`equation ${e.blockId} not found`);
-      const s = n.block.align ?? "center", o = { ...n.block, revision: n.block.revision + 1, align: e.align };
+      const s = n.block.align ?? "center", r = { ...n.block, revision: n.block.revision + 1, align: e.align };
       return {
-        doc: J(t, n, o),
+        doc: X(t, n, r),
         inverse: { type: "setEquationAlign", blockId: e.blockId, align: s },
         mapPosition: b,
         dirtyBlockIds: [e.blockId]
       };
     }
     case "setTableColFractions": {
-      const { where: n, bi: s, block: o } = g(t, e.blockId), i = $(o);
+      const { where: n, bi: s, block: r } = g(t, e.blockId), i = W(r);
       return {
-        doc: m(t, n, s, { ...o, colFractions: e.fractions }),
+        doc: m(t, n, s, { ...r, colFractions: e.fractions }),
         inverse: { type: "setTableColFractions", blockId: e.blockId, fractions: i },
         mapPosition: b,
         dirtyBlockIds: [e.blockId]
       };
     }
     case "setTableWidthMode": {
-      const { where: n, bi: s, block: o } = g(t, e.blockId), i = o.widthMode, r = { ...o };
-      return e.mode && e.mode !== "fixed" ? r.widthMode = e.mode : delete r.widthMode, {
-        doc: m(t, n, s, r),
+      const { where: n, bi: s, block: r } = g(t, e.blockId), i = r.widthMode, o = { ...r };
+      return e.mode && e.mode !== "fixed" ? o.widthMode = e.mode : delete o.widthMode, {
+        doc: m(t, n, s, o),
         inverse: { type: "setTableWidthMode", blockId: e.blockId, mode: i },
         mapPosition: b,
         dirtyBlockIds: [e.blockId]
       };
     }
     case "setTablePreferredWidth": {
-      const { where: n, bi: s, block: o } = g(t, e.blockId), i = o.preferredWidth, r = { ...o };
-      return e.width ? r.preferredWidth = e.width : delete r.preferredWidth, {
-        doc: m(t, n, s, r),
+      const { where: n, bi: s, block: r } = g(t, e.blockId), i = r.preferredWidth, o = { ...r };
+      return e.width ? o.preferredWidth = e.width : delete o.preferredWidth, {
+        doc: m(t, n, s, o),
         inverse: { type: "setTablePreferredWidth", blockId: e.blockId, width: i ?? null },
         mapPosition: b,
         dirtyBlockIds: [e.blockId]
       };
     }
     case "setTableAlign": {
-      const { where: n, bi: s, block: o } = g(t, e.blockId), i = o.align, r = { ...o };
-      return e.align && e.align !== "left" ? r.align = e.align : delete r.align, {
-        doc: m(t, n, s, r),
+      const { where: n, bi: s, block: r } = g(t, e.blockId), i = r.align, o = { ...r };
+      return e.align && e.align !== "left" ? o.align = e.align : delete o.align, {
+        doc: m(t, n, s, o),
         inverse: { type: "setTableAlign", blockId: e.blockId, align: i ?? null },
         mapPosition: b,
         dirtyBlockIds: [e.blockId]
       };
     }
     case "setTableProps": {
-      const { where: n, bi: s, block: o } = g(t, e.blockId), i = Object.keys(e.patch), r = {}, c = { ...o }, l = o, a = r;
+      const { where: n, bi: s, block: r } = g(t, e.blockId), i = Object.keys(e.patch), o = {}, a = { ...r }, l = r, c = o;
       for (const d of i) {
-        a[d] = l[d] ?? null;
+        c[d] = l[d] ?? null;
         const f = e.patch[d];
-        f == null ? delete c[d] : c[d] = f;
+        f == null ? delete a[d] : a[d] = f;
       }
       return {
-        doc: m(t, n, s, c),
-        inverse: { type: "setTableProps", blockId: e.blockId, patch: r },
+        doc: m(t, n, s, a),
+        inverse: { type: "setTableProps", blockId: e.blockId, patch: o },
         mapPosition: b,
         dirtyBlockIds: [e.blockId]
       };
     }
     case "setTableRow": {
-      const { where: n, bi: s, block: o } = g(t, e.tableId), i = o.rows[e.rowIndex];
+      const { where: n, bi: s, block: r } = g(t, e.tableId), i = r.rows[e.rowIndex];
       if (!i) throw new Error("setTableRow: no such row");
-      const r = new Set(i.cells.flatMap((a) => a.blocks.map((d) => d.id))), c = o.rows.slice();
-      c[e.rowIndex] = e.row;
+      const o = new Set(i.cells.flatMap((c) => c.blocks.map((d) => d.id))), a = r.rows.slice();
+      a[e.rowIndex] = e.row;
       const l = O([e.row]);
       return {
-        doc: m(t, n, s, { ...o, rows: c }),
+        doc: m(t, n, s, { ...r, rows: a }),
         inverse: { type: "setTableRow", tableId: e.tableId, rowIndex: e.rowIndex, row: i },
-        mapPosition: (a) => r.has(a.blockId) ? e.row.cells.some((f) => f.blocks.some((h) => h.id === a.blockId)) || !l ? a : { blockId: l.id, offset: 0 } : a,
+        mapPosition: (c) => o.has(c.blockId) ? e.row.cells.some((f) => f.blocks.some((h) => h.id === c.blockId)) || !l ? c : { blockId: l.id, offset: 0 } : c,
         dirtyBlockIds: [e.tableId]
       };
     }
     case "insertTableRow": {
-      const { where: n, bi: s, block: o } = g(t, e.tableId), i = o.rows.slice();
+      const { where: n, bi: s, block: r } = g(t, e.tableId), i = r.rows.slice();
       return i.splice(e.rowIndex, 0, e.row), {
-        doc: m(t, n, s, { ...o, rows: i }),
+        doc: m(t, n, s, { ...r, rows: i }),
         inverse: { type: "removeTableRow", tableId: e.tableId, rowIndex: e.rowIndex },
         mapPosition: b,
         dirtyBlockIds: [e.tableId]
       };
     }
     case "removeTableRow": {
-      const { where: n, bi: s, block: o } = g(t, e.tableId), i = o.rows[e.rowIndex];
+      const { where: n, bi: s, block: r } = g(t, e.tableId), i = r.rows[e.rowIndex];
       if (!i) throw new Error("removeTableRow: no such row");
-      const r = o.rows.slice();
-      r.splice(e.rowIndex, 1);
-      const c = new Set(i.cells.flatMap((d) => d.blocks.map((f) => f.id))), l = r[Math.min(e.rowIndex, r.length - 1)], a = l ? O([l]) : void 0;
+      const o = r.rows.slice();
+      o.splice(e.rowIndex, 1);
+      const a = new Set(i.cells.flatMap((d) => d.blocks.map((f) => f.id))), l = o[Math.min(e.rowIndex, o.length - 1)], c = l ? O([l]) : void 0;
       return {
-        doc: m(t, n, s, { ...o, rows: r }),
+        doc: m(t, n, s, { ...r, rows: o }),
         inverse: { type: "insertTableRow", tableId: e.tableId, rowIndex: e.rowIndex, row: i },
-        mapPosition: (d) => c.has(d.blockId) && a ? { blockId: a.id, offset: 0 } : d,
+        mapPosition: (d) => a.has(d.blockId) && c ? { blockId: c.id, offset: 0 } : d,
         dirtyBlockIds: [e.tableId]
       };
     }
     case "setRowHeight": {
-      const { where: n, bi: s, block: o } = g(t, e.tableId), i = o.rows[e.rowIndex];
+      const { where: n, bi: s, block: r } = g(t, e.tableId), i = r.rows[e.rowIndex];
       if (!i) throw new Error("setRowHeight: no such row");
-      const r = i.props?.height ?? null, c = { ...i }, l = { ...i.props ?? {} };
-      e.height ? l.height = e.height : delete l.height, Object.keys(l).length ? c.props = l : delete c.props;
-      const a = o.rows.slice();
-      return a[e.rowIndex] = c, {
-        doc: m(t, n, s, { ...o, rows: a }),
-        inverse: { type: "setRowHeight", tableId: e.tableId, rowIndex: e.rowIndex, height: r },
+      const o = i.props?.height ?? null, a = { ...i }, l = { ...i.props ?? {} };
+      e.height ? l.height = e.height : delete l.height, Object.keys(l).length ? a.props = l : delete a.props;
+      const c = r.rows.slice();
+      return c[e.rowIndex] = a, {
+        doc: m(t, n, s, { ...r, rows: c }),
+        inverse: { type: "setRowHeight", tableId: e.tableId, rowIndex: e.rowIndex, height: o },
         mapPosition: b,
         dirtyBlockIds: [e.tableId]
       };
@@ -748,24 +759,24 @@ function Ke(t, e) {
       };
     }
     case "setTableStructure": {
-      const { where: n, bi: s, block: o } = g(t, e.tableId), i = new Set(
-        o.rows.flatMap((a) => a.cells.flatMap((d) => d.blocks.map((f) => f.id)))
-      ), r = O(e.rows), c = { ...o, rows: e.rows };
-      e.colFractions ? c.colFractions = e.colFractions : delete c.colFractions;
-      const l = { type: "setTableStructure", tableId: e.tableId, rows: o.rows };
-      return o.colFractions && (l.colFractions = o.colFractions), {
-        doc: m(t, n, s, c),
+      const { where: n, bi: s, block: r } = g(t, e.tableId), i = new Set(
+        r.rows.flatMap((c) => c.cells.flatMap((d) => d.blocks.map((f) => f.id)))
+      ), o = O(e.rows), a = { ...r, rows: e.rows };
+      e.colFractions ? a.colFractions = e.colFractions : delete a.colFractions;
+      const l = { type: "setTableStructure", tableId: e.tableId, rows: r.rows };
+      return r.colFractions && (l.colFractions = r.colFractions), {
+        doc: m(t, n, s, a),
         inverse: l,
-        mapPosition: (a) => i.has(a.blockId) ? e.rows.some(
-          (f) => f.cells.some((h) => h.blocks.some((u) => u.id === a.blockId))
-        ) || !r ? a : { blockId: r.id, offset: 0 } : a,
+        mapPosition: (c) => i.has(c.blockId) ? e.rows.some(
+          (f) => f.cells.some((h) => h.blocks.some((u) => u.id === c.blockId))
+        ) || !o ? c : { blockId: o.id, offset: 0 } : c,
         dirtyBlockIds: [e.tableId]
       };
     }
     case "insertTableColumn": {
-      const { where: n, bi: s, block: o } = g(t, e.tableId), i = { type: "setTableStructure", tableId: e.tableId, rows: o.rows };
-      o.colFractions && (i.colFractions = o.colFractions);
-      const r = o.rows.map((l, a) => {
+      const { where: n, bi: s, block: r } = g(t, e.tableId), i = { type: "setTableStructure", tableId: e.tableId, rows: r.rows };
+      r.colFractions && (i.colFractions = r.colFractions);
+      const o = r.rows.map((l, c) => {
         const d = [];
         let f = 0, h = !1;
         for (const u of l.cells) {
@@ -773,25 +784,25 @@ function Ke(t, e) {
           if (!h && e.colIndex > f && e.colIndex < f + I)
             d.push({ ...u, colSpan: I + 1 }), h = !0;
           else if (!h && e.colIndex === f) {
-            const P = e.cells[a];
+            const P = e.cells[c];
             P && d.push(P), d.push(u), h = !0;
           } else
             d.push(u);
           f += I;
         }
         if (!h) {
-          const u = e.cells[a];
+          const u = e.cells[c];
           u && d.push(u);
         }
         return { cells: d };
       });
-      let c = e.fractions;
-      if (!c) {
-        const l = $(o), a = 1 / (l.length + 1);
-        c = l.map((d) => d * (1 - a)), c.splice(e.colIndex, 0, a);
+      let a = e.fractions;
+      if (!a) {
+        const l = W(r), c = 1 / (l.length + 1);
+        a = l.map((d) => d * (1 - c)), a.splice(e.colIndex, 0, c);
       }
       return {
-        doc: m(t, n, s, { ...o, rows: r, colFractions: c }),
+        doc: m(t, n, s, { ...r, rows: o, colFractions: a }),
         inverse: i,
         mapPosition: b,
         dirtyBlockIds: [e.tableId]
@@ -818,10 +829,10 @@ function Ke(t, e) {
       };
     }
     case "setTableStyleRef": {
-      const { where: n, bi: s, block: o } = g(t, e.tableId), i = o.styleId ?? null, r = o.condOverrides ?? null, c = { ...o };
-      return e.styleId === null ? delete c.styleId : c.styleId = e.styleId, e.condOverrides !== void 0 && (e.condOverrides === null ? delete c.condOverrides : c.condOverrides = e.condOverrides), {
-        doc: m(t, n, s, c),
-        inverse: { type: "setTableStyleRef", tableId: e.tableId, styleId: i, condOverrides: r },
+      const { where: n, bi: s, block: r } = g(t, e.tableId), i = r.styleId ?? null, o = r.condOverrides ?? null, a = { ...r };
+      return e.styleId === null ? delete a.styleId : a.styleId = e.styleId, e.condOverrides !== void 0 && (e.condOverrides === null ? delete a.condOverrides : a.condOverrides = e.condOverrides), {
+        doc: m(t, n, s, a),
+        inverse: { type: "setTableStyleRef", tableId: e.tableId, styleId: i, condOverrides: o },
         mapPosition: b,
         dirtyBlockIds: [e.tableId]
       };
@@ -839,14 +850,14 @@ function Ke(t, e) {
         pageBorders: n.pageBorders ?? null,
         breakType: n.breakType ?? null,
         lineNumbering: n.lineNumbering ? { ...n.lineNumbering } : null
-      }, o = {
+      }, r = {
         ...n,
         pageWidthPx: e.geometry.pageWidthPx,
         pageHeightPx: e.geometry.pageHeightPx,
         marginPx: e.geometry.marginPx
       };
-      return e.geometry.columns ? o.columns = e.geometry.columns : delete o.columns, e.geometry.pageNumberStart !== null ? o.pageNumberStart = e.geometry.pageNumberStart : delete o.pageNumberStart, e.geometry.headerDistancePx !== null ? o.headerDistancePx = e.geometry.headerDistancePx : delete o.headerDistancePx, e.geometry.footerDistancePx !== null ? o.footerDistancePx = e.geometry.footerDistancePx : delete o.footerDistancePx, e.geometry.pageColorHex !== null ? o.pageColorHex = e.geometry.pageColorHex : delete o.pageColorHex, e.geometry.pageBorders !== null ? o.pageBorders = e.geometry.pageBorders : delete o.pageBorders, e.geometry.breakType !== null ? o.breakType = e.geometry.breakType : delete o.breakType, e.geometry.lineNumbering !== null ? o.lineNumbering = e.geometry.lineNumbering : delete o.lineNumbering, {
-        doc: { ...t, section: o },
+      return e.geometry.columns ? r.columns = e.geometry.columns : delete r.columns, e.geometry.pageNumberStart !== null ? r.pageNumberStart = e.geometry.pageNumberStart : delete r.pageNumberStart, e.geometry.headerDistancePx !== null ? r.headerDistancePx = e.geometry.headerDistancePx : delete r.headerDistancePx, e.geometry.footerDistancePx !== null ? r.footerDistancePx = e.geometry.footerDistancePx : delete r.footerDistancePx, e.geometry.pageColorHex !== null ? r.pageColorHex = e.geometry.pageColorHex : delete r.pageColorHex, e.geometry.pageBorders !== null ? r.pageBorders = e.geometry.pageBorders : delete r.pageBorders, e.geometry.breakType !== null ? r.breakType = e.geometry.breakType : delete r.breakType, e.geometry.lineNumbering !== null ? r.lineNumbering = e.geometry.lineNumbering : delete r.lineNumbering, {
+        doc: { ...t, section: r },
         inverse: { type: "setSectionProps", geometry: s },
         mapPosition: b,
         dirtyBlockIds: []
@@ -856,22 +867,22 @@ function Ke(t, e) {
     case "setFootnote": {
       const n = t.footnotes?.[e.noteId] ?? null, s = { ...t.footnotes ?? {} };
       e.paras ? s[e.noteId] = e.paras : delete s[e.noteId];
-      const o = new Set((n ?? []).map((r) => r.id)), i = t.blocks.find((r) => r.kind === "paragraph");
+      const r = new Set((n ?? []).map((o) => o.id)), i = t.blocks.find((o) => o.kind === "paragraph");
       return {
         doc: { ...t, footnotes: s },
         inverse: { type: "setFootnote", noteId: e.noteId, paras: n },
-        mapPosition: (r) => o.has(r.blockId) ? (e.paras ?? []).some((l) => l.id === r.blockId) || !i ? r : { blockId: i.id, offset: 0 } : r,
+        mapPosition: (o) => r.has(o.blockId) ? (e.paras ?? []).some((l) => l.id === o.blockId) || !i ? o : { blockId: i.id, offset: 0 } : o,
         dirtyBlockIds: []
       };
     }
     case "setEndnote": {
       const n = t.endnotes?.[e.noteId] ?? null, s = { ...t.endnotes ?? {} };
       e.paras ? s[e.noteId] = e.paras : delete s[e.noteId];
-      const o = new Set((n ?? []).map((r) => r.id)), i = t.blocks.find((r) => r.kind === "paragraph");
+      const r = new Set((n ?? []).map((o) => o.id)), i = t.blocks.find((o) => o.kind === "paragraph");
       return {
         doc: { ...t, endnotes: s },
         inverse: { type: "setEndnote", noteId: e.noteId, paras: n },
-        mapPosition: (r) => o.has(r.blockId) ? (e.paras ?? []).some((l) => l.id === r.blockId) || !i ? r : { blockId: i.id, offset: 0 } : r,
+        mapPosition: (o) => r.has(o.blockId) ? (e.paras ?? []).some((l) => l.id === o.blockId) || !i ? o : { blockId: i.id, offset: 0 } : o,
         dirtyBlockIds: []
       };
     }
@@ -895,6 +906,24 @@ function Ke(t, e) {
         // run/block fieldId markers change via setRuns/insert ops
       };
     }
+    case "setTemplateVariable": {
+      const n = t.templateVariables?.[e.key] ?? null, s = { ...t.templateVariables ?? {} };
+      return e.def ? s[e.key] = e.def : delete s[e.key], {
+        doc: { ...t, templateVariables: s },
+        inverse: { type: "setTemplateVariable", key: e.key, def: n },
+        mapPosition: b,
+        dirtyBlockIds: []
+      };
+    }
+    case "setVariableDisplayMode": {
+      const n = t.variableDisplayMode ?? "code";
+      return {
+        doc: { ...t, variableDisplayMode: e.mode },
+        inverse: { type: "setVariableDisplayMode", mode: n },
+        mapPosition: b,
+        dirtyBlockIds: []
+      };
+    }
     case "setTocInstruction": {
       const n = t.tocInstruction ?? null, s = { ...t };
       return e.instruction !== null ? s.tocInstruction = e.instruction : delete s.tocInstruction, {
@@ -917,20 +946,20 @@ function Ke(t, e) {
     case "setSectionBand": {
       const n = t.section[e.band] ?? null, s = { ...t.section };
       e.blocks ? s[e.band] = e.blocks : delete s[e.band];
-      const o = new Set(
-        (n ?? []).filter((r) => r.kind === "paragraph").map((r) => r.id)
-      ), i = t.blocks.find((r) => r.kind === "paragraph");
+      const r = new Set(
+        (n ?? []).filter((o) => o.kind === "paragraph").map((o) => o.id)
+      ), i = t.blocks.find((o) => o.kind === "paragraph");
       return {
         doc: { ...t, section: s },
         inverse: { type: "setSectionBand", band: e.band, blocks: n },
-        mapPosition: (r) => o.has(r.blockId) ? (e.blocks ?? []).some((l) => l.id === r.blockId) || !i ? r : { blockId: i.id, offset: 0 } : r,
+        mapPosition: (o) => r.has(o.blockId) ? (e.blocks ?? []).some((l) => l.id === o.blockId) || !i ? o : { blockId: i.id, offset: 0 } : o,
         dirtyBlockIds: []
       };
     }
     case "removeTableColumn": {
-      const { where: n, bi: s, block: o } = g(t, e.tableId), i = { type: "setTableStructure", tableId: e.tableId, rows: o.rows };
-      o.colFractions && (i.colFractions = o.colFractions);
-      const r = $(o), c = /* @__PURE__ */ new Set(), l = o.rows.map((u) => {
+      const { where: n, bi: s, block: r } = g(t, e.tableId), i = { type: "setTableStructure", tableId: e.tableId, rows: r.rows };
+      r.colFractions && (i.colFractions = r.colFractions);
+      const o = W(r), a = /* @__PURE__ */ new Set(), l = r.rows.map((u) => {
         const I = [];
         let P = 0;
         for (const C of u.cells) {
@@ -940,17 +969,17 @@ function Ke(t, e) {
               const T = { ...C };
               B - 1 > 1 ? T.colSpan = B - 1 : delete T.colSpan, I.push(T);
             } else
-              for (const T of C.blocks) c.add(T.id);
+              for (const T of C.blocks) a.add(T.id);
           else
             I.push(C);
           P += B;
         }
         return { cells: I };
-      }), a = r.filter((u, I) => I !== e.colIndex), d = a.reduce((u, I) => u + I, 0) || 1, f = a.map((u) => u / d), h = O(l);
+      }), c = o.filter((u, I) => I !== e.colIndex), d = c.reduce((u, I) => u + I, 0) || 1, f = c.map((u) => u / d), h = O(l);
       return {
-        doc: m(t, n, s, { ...o, rows: l, colFractions: f }),
+        doc: m(t, n, s, { ...r, rows: l, colFractions: f }),
         inverse: i,
-        mapPosition: (u) => c.has(u.blockId) && h ? { blockId: h.id, offset: 0 } : u,
+        mapPosition: (u) => a.has(u.blockId) && h ? { blockId: h.id, offset: 0 } : u,
         dirtyBlockIds: [e.tableId]
       };
     }
@@ -968,13 +997,13 @@ let _ = ie("local");
 function et(t, e = 0) {
   _ = ie(t, e);
 }
-function Q() {
+function J() {
   return _.next();
 }
 function tt() {
   return _.siteId;
 }
-const Z = (t) => {
+const Q = (t) => {
   if (!t) return;
   const e = t.match(/^(\d+)\s*-\s*(\d+)$/);
   if (e) return { from: Number(e[1]), to: Number(e[2]) };
@@ -986,101 +1015,101 @@ function Be(t) {
     useOutlineLevels: /\\u\b/.test(t),
     hyperlinks: /\\h\b/.test(t),
     hideInWeb: /\\z\b/.test(t)
-  }, n = Z(t.match(/\\o\s+"([^"]+)"/)?.[1]);
+  }, n = Q(t.match(/\\o\s+"([^"]+)"/)?.[1]);
   n && (e.outlineRange = n);
-  const s = Z(t.match(/\\n\s+"?([0-9-]+)"?/)?.[1]);
+  const s = Q(t.match(/\\n\s+"?([0-9-]+)"?/)?.[1]);
   s && (e.hidePageNumberRange = s);
-  const o = t.match(/\\p\s+"([^"]*)"/)?.[1];
-  o !== void 0 && (e.separator = o);
+  const r = t.match(/\\p\s+"([^"]*)"/)?.[1];
+  r !== void 0 && (e.separator = r);
   const i = t.match(/\\t\s+"([^"]+)"/)?.[1];
   if (i) {
-    const r = i.split(","), c = {};
-    for (let l = 0; l + 1 < r.length; l += 2) {
-      const a = r[l].trim(), d = Number(r[l + 1].trim());
-      a && d >= 1 && (c[a] = d);
+    const o = i.split(","), a = {};
+    for (let l = 0; l + 1 < o.length; l += 2) {
+      const c = o[l].trim(), d = Number(o[l + 1].trim());
+      c && d >= 1 && (a[c] = d);
     }
-    Object.keys(c).length > 0 && (e.customStyles = c);
+    Object.keys(a).length > 0 && (e.customStyles = a);
   }
   return e;
 }
 function nt(t) {
   const e = ["TOC"];
   if (t.outlineRange && e.push(`\\o "${t.outlineRange.from}-${t.outlineRange.to}"`), t.useOutlineLevels && e.push("\\u"), t.customStyles && Object.keys(t.customStyles).length > 0) {
-    const n = Object.entries(t.customStyles).map(([s, o]) => `${s},${o}`).join(",");
+    const n = Object.entries(t.customStyles).map(([s, r]) => `${s},${r}`).join(",");
     e.push(`\\t "${n}"`);
   }
   return t.hyperlinks && e.push("\\h"), t.hidePageNumberRange && e.push(`\\n "${t.hidePageNumberRange.from}-${t.hidePageNumberRange.to}"`), t.separator !== void 0 && e.push(`\\p "${t.separator}"`), t.hideInWeb && e.push("\\z"), ` ${e.join(" ")} `;
 }
 const st = (t, e) => !!t && e >= t.from && e <= t.to;
-function K(t, e) {
+function Z(t, e) {
   if (!e || !t.stylesheet) return;
   const n = new Map(t.stylesheet.styles.map((i) => [i.id, i]));
   let s = n.get(e);
-  const o = /* @__PURE__ */ new Set();
-  for (; s && !o.has(s.id); ) {
+  const r = /* @__PURE__ */ new Set();
+  for (; s && !r.has(s.id); ) {
     if (s.name && /(?:^|\s)heading\s*\d/i.test(s.name)) return s.name;
-    o.add(s.id), s = s.basedOn ? n.get(s.basedOn) : void 0;
+    r.add(s.id), s = s.basedOn ? n.get(s.basedOn) : void 0;
   }
   return n.get(e)?.name;
 }
 function Te(t, e, n) {
   const s = t.style.namedStyle;
   if (n?.customStyles && s) {
-    const r = n.customStyles[s] ?? n.customStyles[K(e, s) ?? ""];
-    if (r) return r;
+    const o = n.customStyles[s] ?? n.customStyles[Z(e, s) ?? ""];
+    if (o) return o;
   }
   if (t.style.outlineLevel !== void 0) return t.style.outlineLevel + 1;
-  const o = s?.match(/^heading\s*(\d)$/i);
-  if (o) return Number(o[1]);
-  const i = K(e, s)?.match(/(?:^|\s)heading\s*(\d)/i);
+  const r = s?.match(/^heading\s*(\d)$/i);
+  if (r) return Number(r[1]);
+  const i = Z(e, s)?.match(/(?:^|\s)heading\s*(\d)/i);
   return i ? Number(i[1]) : null;
 }
 function Re(t, e, n = 3) {
-  const s = e?.outlineRange?.to ?? n, o = [];
+  const s = e?.outlineRange?.to ?? n, r = [];
   for (const i of le(t)) {
-    const r = Te(i, t, e);
-    r === null || r < 1 || r > s || e?.outlineRange && (r < e.outlineRange.from || r > e.outlineRange.to) || o.push({ block: i, level: r });
+    const o = Te(i, t, e);
+    o === null || o < 1 || o > s || e?.outlineRange && (o < e.outlineRange.from || o > e.outlineRange.to) || r.push({ block: i, level: o });
   }
-  return o;
+  return r;
 }
-function ot(t, e = 20) {
+function rt(t, e = 20) {
   if (!t.bookmarks) return 0;
   const n = t.section.pageWidthPx - t.section.marginPx.left - t.section.marginPx.right;
   let s = 0;
-  for (const o of t.blocks) {
-    if (o.kind !== "paragraph" || o.style.tocEntry) continue;
-    const i = o.runs.find((d) => d.style.link?.startsWith("#"))?.style.link?.slice(1);
+  for (const r of t.blocks) {
+    if (r.kind !== "paragraph" || r.style.tocEntry) continue;
+    const i = r.runs.find((d) => d.style.link?.startsWith("#"))?.style.link?.slice(1);
     if (!i) continue;
-    const r = t.bookmarks[i]?.start.blockId;
-    if (!r) continue;
-    const c = F(o.runs), l = c.match(/\t\d+\s*$/);
+    const o = t.bookmarks[i]?.start.blockId;
+    if (!o) continue;
+    const a = F(r.runs), l = a.match(/\t\d+\s*$/);
     if (!l) continue;
-    o.runs = re(o.runs, 0, c.length - l[0].length), o.runs.length === 0 && (o.runs = [{ text: "", style: { ...A } }]);
-    const a = Math.min(9, Math.max(1, Math.round((o.style.indentLeftPx || 0) / e) + 1));
-    o.style.tocEntry = { targetId: r, level: a }, !o.style.tabStops?.length && n > 0 && (o.style.tabStops = [{ posPx: n, align: "right", leader: "dot" }]), o.revision++, s++;
+    r.runs = oe(r.runs, 0, a.length - l[0].length), r.runs.length === 0 && (r.runs = [{ text: "", style: { ...A } }]);
+    const c = Math.min(9, Math.max(1, Math.round((r.style.indentLeftPx || 0) / e) + 1));
+    r.style.tocEntry = { targetId: o, level: c }, !r.style.tabStops?.length && n > 0 && (r.style.tabStops = [{ posPx: n, align: "right", leader: "dot" }]), r.revision++, s++;
   }
   return s;
 }
-const A = { ...oe, fontSizePx: 13 }, Ee = 20;
+const A = { ...re, fontSizePx: 13 }, Ee = 20;
 function Fe(t, e, n, s) {
-  const o = t.indentStepPx ?? Ee, i = t.leader ?? "dot", r = { align: "left", lineHeight: 1.5, spaceBeforePx: 0, spaceAfterPx: 2, indentFirstLinePx: 0 };
-  let c, l;
+  const r = t.indentStepPx ?? Ee, i = t.leader ?? "dot", o = { align: "left", lineHeight: 1.5, spaceBeforePx: 0, spaceAfterPx: 2, indentFirstLinePx: 0 };
+  let a, l;
   if (s && (s.char || s.para)) {
-    c = { ...A, ...s.char, ...t.baseChar, ...t.levels?.[e]?.char };
-    const a = s.para?.indentLeftPx ?? 0;
+    a = { ...A, ...s.char, ...t.baseChar, ...t.levels?.[e]?.char };
+    const c = s.para?.indentLeftPx ?? 0;
     l = {
-      ...r,
+      ...o,
       ...s.para,
-      indentLeftPx: a + (e - 1) * o,
+      indentLeftPx: c + (e - 1) * r,
       ...t.levels?.[e]?.para
     };
   } else
-    c = { ...{ ...A, ...t.baseChar }, fontSizePx: e === 1 ? 14 : 13, bold: e === 1, ...t.levels?.[e]?.char }, l = {
-      ...r,
-      indentLeftPx: (e - 1) * o,
+    a = { ...{ ...A, ...t.baseChar }, fontSizePx: e === 1 ? 14 : 13, bold: e === 1, ...t.levels?.[e]?.char }, l = {
+      ...o,
+      indentLeftPx: (e - 1) * r,
       ...t.levels?.[e]?.para
     };
-  return i !== "none" && n > 0 ? l.tabStops = [{ posPx: n, align: "right", leader: i }] : delete l.tabStops, { char: c, para: l };
+  return i !== "none" && n > 0 ? l.tabStops = [{ posPx: n, align: "right", leader: i }] : delete l.tabStops, { char: a, para: l };
 }
 function Ce(t) {
   if (t.title === null) return null;
@@ -1102,95 +1131,95 @@ function Ce(t) {
 }
 const Oe = 3;
 function Ne(t, e = {}) {
-  const n = t.tocInstruction ? Be(t.tocInstruction) : void 0, s = e.maxLevel ?? n?.outlineRange?.to ?? Oe, o = t.section.pageWidthPx - t.section.marginPx.left - t.section.marginPx.right, i = t.tocAnchorBlockId ? t.blocks.find((a) => a.kind === "paragraph" && a.id === t.tocAnchorBlockId) : void 0, r = i ? { char: i.runs[0]?.style, para: i.style } : void 0, c = [];
+  const n = t.tocInstruction ? Be(t.tocInstruction) : void 0, s = e.maxLevel ?? n?.outlineRange?.to ?? Oe, r = t.section.pageWidthPx - t.section.marginPx.left - t.section.marginPx.right, i = t.tocAnchorBlockId ? t.blocks.find((c) => c.kind === "paragraph" && c.id === t.tocAnchorBlockId) : void 0, o = i ? { char: i.runs[0]?.style, para: i.style } : void 0, a = [];
   if (e.title !== void 0 ? e.title !== null : i === void 0) {
-    const a = Ce(e);
-    a && c.push({
+    const c = Ce(e);
+    c && a.push({
       kind: "paragraph",
-      id: Q(),
+      id: J(),
       revision: 0,
-      runs: [{ text: a.text, style: a.char }],
-      style: a.para
+      runs: [{ text: c.text, style: c.char }],
+      style: c.para
     });
   }
-  for (const { block: a, level: d } of Re(t, n, s)) {
-    const f = F(a.runs).replace(/\v/g, " ").trim();
+  for (const { block: c, level: d } of Re(t, n, s)) {
+    const f = F(c.runs).replace(/\v/g, " ").trim();
     if (f.length === 0) continue;
-    const { char: h, para: u } = Fe(e, d, o, r);
-    c.push({
+    const { char: h, para: u } = Fe(e, d, r, o);
+    a.push({
       kind: "paragraph",
-      id: Q(),
+      id: J(),
       revision: 0,
       runs: [{ text: f, style: h }],
-      style: { ...u, tocEntry: { targetId: a.id, level: d } }
+      style: { ...u, tocEntry: { targetId: c.id, level: d } }
     });
   }
-  return c;
+  return a;
 }
-function rt(t, e = {}) {
-  if (t.blocks.some((r) => r.kind === "paragraph" && r.style.tocEntry))
+function ot(t, e = {}) {
+  if (t.blocks.some((o) => o.kind === "paragraph" && o.style.tocEntry))
     return { doc: t, generated: 0, headings: 0 };
   if (t.tocAnchorBlockId === void 0) return { doc: t, generated: 0, headings: 0 };
-  const n = t.blocks.findIndex((r) => r.id === t.tocAnchorBlockId);
+  const n = t.blocks.findIndex((o) => o.id === t.tocAnchorBlockId);
   if (n < 0) return { doc: t, generated: 0, headings: 0 };
-  const s = Ne(t, e), o = s.reduce((r, c) => r + (c.style.tocEntry ? 1 : 0), 0);
-  if (o === 0) return { doc: t, generated: 0, headings: 0 };
+  const s = Ne(t, e), r = s.reduce((o, a) => o + (a.style.tocEntry ? 1 : 0), 0);
+  if (r === 0) return { doc: t, generated: 0, headings: 0 };
   const i = [...t.blocks];
-  return i.splice(n, 1, ...s), { doc: { ...t, blocks: i }, generated: o, headings: o };
+  return i.splice(n, 1, ...s), { doc: { ...t, blocks: i }, generated: r, headings: r };
 }
 export {
-  ot as $,
-  De as A,
+  et as $,
+  Qe as A,
   S as B,
-  X as C,
-  oe as D,
-  Je as E,
-  Ve as F,
-  Q as G,
-  ne as H,
-  y as I,
-  x as J,
-  re as K,
-  qe as L,
-  ze as M,
-  Xe as N,
-  Ne as O,
-  le as P,
-  Ge as Q,
-  Le as R,
-  Ae as S,
-  je as T,
-  _e as U,
-  q as V,
-  se as W,
-  H as X,
-  $ as Y,
-  et as Z,
-  ie as _,
-  ae as a,
-  nt as b,
-  Fe as c,
+  M as C,
+  re as D,
+  te as E,
+  Pe as F,
+  Ke as G,
+  Ge as H,
+  We as I,
+  He as J,
+  Y as K,
+  Xe as L,
+  Ue as M,
+  y as N,
+  oe as O,
+  qe as P,
+  ze as Q,
+  Ye as R,
+  Ne as S,
+  le as T,
+  Le as U,
+  Ae as V,
+  je as W,
+  _e as X,
+  q as Y,
+  se as Z,
+  H as _,
+  Be as a,
+  Fe as b,
+  de as c,
   Re as d,
-  Se as e,
-  Ke as f,
-  rt as g,
-  We as h,
+  $e as e,
+  ie as f,
+  Se as g,
+  Ve as h,
   st as i,
-  de as j,
-  Qe as k,
-  Me as l,
-  W as m,
-  tt as n,
-  k as o,
-  Be as p,
-  Ze as q,
-  M as r,
+  nt as j,
+  ot as k,
+  J as l,
+  rt as m,
+  x as n,
+  W as o,
+  ce as p,
+  ne as q,
+  Ze as r,
   ue as s,
   F as t,
-  Pe as u,
-  Ue as v,
-  te as w,
-  Ye as x,
-  $e as y,
-  He as z
+  De as u,
+  Je as v,
+  Me as w,
+  D as x,
+  tt as y,
+  k as z
 };