mixdog 0.9.174 → 1.0.0

package/src/runtime/office/portable/portable-pptx-charts.mjs

@@ -91,6 +91,25 @@ const REBUILD_FIELDS = [
   'dataLabelPosition',
   'dataLabelColor',
 ];
+// An accent on the last point marks the latest period; when the refresh changes the number of points it moves to
+// the new last one. Kept at its index, a monthly refresh left April lit under a title about May.
+function accentOnLastPoint(series, count) {
+  let block = series;
+  const previousCount = Number(/<c:val>[\s\S]*?<c:ptCount val="(\d+)"/.exec(block)?.[1]) || 0;
+  const seriesColor = /<a:srgbClr val="([0-9A-Fa-f]{6})"/.exec(block.split('<c:dPt>')[0])?.[1] || '';
+  const pointAt = (point) => Number(/<c:idx val="(\d+)"/.exec(point)?.[1]);
+  const points = [...block.matchAll(/<c:dPt>[\s\S]*?<\/c:dPt>/g)].map((point) => point[0]);
+  const accents = points.filter((point) => /<a:srgbClr val="([0-9A-Fa-f]{6})"/.exec(point)?.[1] !== seriesColor);
+  if (count !== previousCount && accents.length === 1 && pointAt(accents[0]) === previousCount - 1) {
+    // The accent and the point now last trade places; one past the new end is dropped by the caller.
+    const displaced = points.find((point) => pointAt(point) === count - 1);
+    const moved = (point, to) => point.replace(/<c:idx val="\d+"\/>/, `<c:idx val="${to}"/>`);
+    block = block.replace(accents[0], moved(accents[0], count - 1));
+    if (displaced) block = block.replace(displaced, moved(displaced, previousCount - 1));
+  }
+  return block;
+}
+
 function refreshChartDataInPlace(xml, categories, series, op) {
   if (REBUILD_FIELDS.some((field) => op[field] !== undefined)) return null;
   const blocks = [...String(xml).matchAll(/<c:ser>[\s\S]*?<\/c:ser>/g)];
@@ -107,20 +126,7 @@ function refreshChartDataInPlace(xml, categories, series, op) {
     let block = blocks[index][0];
     const entry = series[index];
     if (!/<c:val>[\s\S]*?<c:numCache>/.test(block)) return null;
-    // An accent on the last point marks the latest period; when the refresh changes the number of points it moves to
-    // the new last one. Kept at its index, a monthly refresh left April lit under a title about May.
-    const previousCount = Number(/<c:val>[\s\S]*?<c:ptCount val="(\d+)"/.exec(block)?.[1]) || 0;
-    const seriesColor = /<a:srgbClr val="([0-9A-Fa-f]{6})"/.exec(block.split('<c:dPt>')[0])?.[1] || '';
-    const pointAt = (point) => Number(/<c:idx val="(\d+)"/.exec(point)?.[1]);
-    const points = [...block.matchAll(/<c:dPt>[\s\S]*?<\/c:dPt>/g)].map((point) => point[0]);
-    const accents = points.filter((point) => /<a:srgbClr val="([0-9A-Fa-f]{6})"/.exec(point)?.[1] !== seriesColor);
-    if (count !== previousCount && accents.length === 1 && pointAt(accents[0]) === previousCount - 1) {
-      // The accent and the point now last trade places; one past the new end is dropped below.
-      const displaced = points.find((point) => pointAt(point) === count - 1);
-      const moved = (point, to) => point.replace(/<c:idx val="\d+"\/>/, `<c:idx val="${to}"/>`);
-      block = block.replace(accents[0], moved(accents[0], count - 1));
-      if (displaced) block = block.replace(displaced, moved(displaced, previousCount - 1));
-    }
+    block = accentOnLastPoint(block, count);
     if (entry.name != null) {
       // A name read from the sheet keeps its reference and takes the new cache; one written as text is rewritten.
       block = /<c:tx>\s*<c:v>/.test(block)
@@ -223,7 +229,12 @@ function retitledChart(xml, text) {
 const CATEGORY_ORDERS = Object.freeze({ topdown: 'maxMin', bottomup: 'minMax' });
 function categoryOrientationFor(op) {
   if (op.categoryOrder == null || op.categoryOrder === '') return '';
-  const orientation = CATEGORY_ORDERS[String(op.categoryOrder).replace(/[\s_-]/g, '').toLowerCase()];
+  const orientation =
+    CATEGORY_ORDERS[
+      String(op.categoryOrder)
+        .replace(/[\s_-]/g, '')
+        .toLowerCase()
+    ];
   if (!orientation) throw new Error("set_chart_data categoryOrder must be 'topDown' or 'bottomUp'");
   return orientation;
 }
@@ -256,6 +267,30 @@ function withCategoryOrientation(xml, orientation) {
   return xml.replace(categoryAxis, oriented).replace(valueAxis, crossed);
 }
 
+// The new series carrying the colours the chart already had.
+function withKeptColors(series, kept, previousCount) {
+  return series.map((entry, index) => {
+    if (!entry) return entry;
+    let points = kept.pointColors?.[index] || [];
+    // Point colors are kept only where the new data still has that point, so a
+    // shorter refresh never leaves the accent on a category that is gone; a
+    // lone accent on the last point follows the last point.
+    const valueCount = Array.isArray(entry.values) ? entry.values.length : 0;
+    const base = kept.seriesColors[index];
+    const lit = points.map((color, point) => (color && color !== base ? point : -1)).filter((point) => point >= 0);
+    if (valueCount !== previousCount && lit.length === 1 && lit[0] === previousCount - 1) {
+      const accent = points[lit[0]];
+      points = [...points];
+      points[lit[0]] = points[valueCount - 1];
+      points[valueCount - 1] = accent;
+    }
+    const carried =
+      entry.pointColors === undefined && points.some(Boolean) ? { pointColors: points.slice(0, valueCount) } : {};
+    const filled = entry.color === undefined && kept.seriesColors[index] ? { color: kept.seriesColors[index] } : {};
+    return Object.keys(carried).length || Object.keys(filled).length ? { ...entry, ...filled, ...carried } : entry;
+  });
+}
+
 export async function handleSetChartData(context, op) {
   const { zip } = context;
   const { part: chartPart, xml: existing } = await resolveSlideChart(zip, context.slides, op);
@@ -281,29 +316,13 @@ export async function handleSetChartData(context, op) {
       if (!kept.seriesColors[index] && token) kept.seriesColors[index] = await themeColor(zip, masterPart, token);
     }
   }
-  const previousCount = chartCategories(existing).length;
-  const coloured = series.map((entry, index) => {
-    if (!entry) return entry;
-    let points = kept.pointColors?.[index] || [];
-    // Point colors are kept only where the new data still has that point, so a
-    // shorter refresh never leaves the accent on a category that is gone; a
-    // lone accent on the last point follows the last point.
-    const valueCount = Array.isArray(entry.values) ? entry.values.length : 0;
-    const base = kept.seriesColors[index];
-    const lit = points.map((color, point) => (color && color !== base ? point : -1)).filter((point) => point >= 0);
-    if (valueCount !== previousCount && lit.length === 1 && lit[0] === previousCount - 1) {
-      const accent = points[lit[0]];
-      points = [...points];
-      points[lit[0]] = points[valueCount - 1];
-      points[valueCount - 1] = accent;
-    }
-    const carried =
-      entry.pointColors === undefined && points.some(Boolean) ? { pointColors: points.slice(0, valueCount) } : {};
-    const filled = entry.color === undefined && kept.seriesColors[index] ? { color: kept.seriesColors[index] } : {};
-    return Object.keys(carried).length || Object.keys(filled).length ? { ...entry, ...filled, ...carried } : entry;
-  });
+  const coloured = withKeptColors(series, kept, chartCategories(existing).length);
   const inPlace = refreshChartDataInPlace(existing, categories, series, op);
   const refreshed = inPlace && op.title != null ? retitledChart(inPlace, String(op.title)) : inPlace;
+  // Another type is another chart: its categories read the way that type reads them.
+  const retypedAxis =
+    op.chartType && op.chartType !== detectChartType(existing) ? { ...kept.axis, categoryOrientation: '' } : kept.axis;
+  const chosen = (given, kept) => (given === undefined ? kept : given === true);
   const rebuilt = refreshed
     ? null
     : chartXml({
@@ -311,15 +330,13 @@ export async function handleSetChartData(context, op) {
         title: op.title ?? chartTitleText(existing),
         categories,
         series: coloured,
-        showValues: op.showValues === undefined ? kept.showValues : op.showValues === true,
+        showValues: chosen(op.showValues, kept.showValues),
         dataLabelPosition: op.dataLabelPosition ?? kept.dataLabelPosition,
         dataLabelColor: op.dataLabelColor ?? kept.dataLabelColor,
         valueNumberFormat: op.valueNumberFormat ?? kept.valueNumberFormat,
         showLegend: op.showLegend ?? kept.showLegend,
-        zeroBaseline: op.zeroBaseline === undefined ? kept.zeroBaseline : op.zeroBaseline === true,
-        // Another type is another chart: its categories read the way that type reads them.
-        axis:
-          op.chartType && op.chartType !== detectChartType(existing) ? { ...kept.axis, categoryOrientation: '' } : kept.axis,
+        zeroBaseline: chosen(op.zeroBaseline, kept.zeroBaseline),
+        axis: retypedAxis,
         externalDataId: 'rId1',
         text: CHART_TEXT.slide,
       });
@@ -365,7 +382,7 @@ export async function handleSetChartData(context, op) {
   };
 }
 
-export const BOTTOM_UP_NOTE =
+const BOTTOM_UP_NOTE =
   "The bars read from the bottom up, the first category lowest, as this chart was authored; categoryOrder:'topDown' lists them from the top in the order given.";
 
 // Rewrites the chart's series blocks in place. `wanted` is a 1-based series

package/src/runtime/office/portable/portable-pptx-core.mjs

@@ -21,7 +21,7 @@ import {
 import { presentationSlides } from './portable-pptx-package.mjs';
 import { shapeIdentity } from './pptx-relations.mjs';
 
-export const DEFAULT_TEXT_INSETS = Object.freeze({ left: 7.2, top: 3.6, right: 7.2, bottom: 3.6 });
+const DEFAULT_TEXT_INSETS = Object.freeze({ left: 7.2, top: 3.6, right: 7.2, bottom: 3.6 });
 
 // A painted plane covers a box when the box sits inside it (a point of slack for EMU rounding).
 function coversBounds(entry, bounds) {
@@ -306,7 +306,7 @@ export function setTableValues(shapeXml, values) {
   // row repeats the last row. The rows past the table's end had been dropped, so a refresh with one more hub lost
   // that hub. The table grows down; its width is the page's, and the columns it gains share it with the others — a
   // template's three-column table given four columns ran past the slide's edge and cut the last one off.
-  const columns = Math.max(...values.map((source) => source.length));
+  const columns = Math.max(0, ...values.filter(Array.isArray).map((source) => source.length));
   const grid = elementSpans(inner, 'a:gridCol');
   const addedColumns = Math.max(0, columns - grid.length);
   if (addedColumns) {
@@ -319,7 +319,10 @@ export function setTableValues(shapeXml, values) {
     if (grown) shared[shared.length - 1] += frame - shared.reduce((total, width) => total + width, 0);
     inner = `${inner.slice(0, last.end)}${last.xml.repeat(addedColumns)}${inner.slice(last.end)}`;
     let column = 0;
-    inner = inner.replace(/<a:gridCol\b([^>]*?)\bw="\d+"/g, (_match, head) => `<a:gridCol${head}w="${shared[column++]}"`);
+    inner = inner.replace(
+      /<a:gridCol\b([^>]*?)\bw="\d+"/g,
+      (_match, head) => `<a:gridCol${head}w="${shared[column++]}"`
+    );
     const current = elementSpans(inner, 'a:tr');
     for (let rowIndex = current.length - 1; rowIndex >= 0; rowIndex -= 1) {
       const row = current[rowIndex];
@@ -464,7 +467,14 @@ export function updateShapeGeometry(shape, properties) {
       for (const element of topLevelElements(cleaned, SHAPE_FILLS).reverse()) {
         cleaned = `${cleaned.slice(0, element.start)}${cleaned.slice(element.end)}`;
       }
-      const later = topLevelElements(cleaned, ['a:ln', 'a:effectLst', 'a:effectDag', 'a:scene3d', 'a:sp3d', 'a:extLst'])[0];
+      const later = topLevelElements(cleaned, [
+        'a:ln',
+        'a:effectLst',
+        'a:effectDag',
+        'a:scene3d',
+        'a:sp3d',
+        'a:extLst',
+      ])[0];
       const position = later ? later.start : cleaned.length;
       const inner = `${cleaned.slice(0, position)}${fill}${cleaned.slice(position)}`;
       next = `${next.slice(0, shapeProperties.start)}${inner}${next.slice(shapeProperties.end)}`;

package/src/runtime/office/portable/portable-pptx-package.mjs

@@ -8,6 +8,7 @@ import {
   ensureContentTypeOverride,
   ensureDefaultContentType,
   loadPackage,
+  partFromTarget,
   partRelationshipPath,
   relationshipMap,
   relationshipTargetByType,
@@ -166,7 +167,7 @@ async function followingLayout(zip, layouts, index) {
   if (!before) return null;
   const target = relationshipTargetByType(await zipText(zip, partRelationshipPath(before.path)), 'slideLayout');
   if (!target) return null;
-  const path = posix.normalize(posix.join(posix.dirname(before.path), target));
+  const path = partFromTarget(posix.dirname(before.path), target);
   const layout = layouts.find((entry) => entry.path === path);
   return layout && layout.type !== 'title' ? layout : null;
 }
@@ -393,7 +394,7 @@ export async function ensureCommentAuthor(zip, author, initials) {
 export async function ensureSlideComments(zip, slide) {
   const relationships = partRelationshipPath(slide.path);
   const target = relationshipTargetByType(await zipText(zip, relationships), 'comments');
-  if (target) return posix.normalize(posix.join(posix.dirname(slide.path), target));
+  if (target) return partFromTarget(posix.dirname(slide.path), target);
   let ordinal = 1;
   while (zip.file(`ppt/comments/comment${ordinal}.xml`)) ordinal += 1;
   const part = `ppt/comments/comment${ordinal}.xml`;
@@ -412,7 +413,7 @@ export async function readSlideNotes(zip, slide) {
   const relationships = await zipText(zip, partRelationshipPath(slide.path));
   const linked = relationshipTargetByType(relationships, 'notesSlide');
   if (!linked) return '';
-  const part = posix.normalize(posix.join(posix.dirname(slide.path), linked));
+  const part = partFromTarget(posix.dirname(slide.path), linked);
   const xml = await zipText(zip, part);
   if (!xml) return '';
   const body = /<p:sp>[\s\S]*?<p:ph type="body"[\s\S]*?<\/p:sp>/.exec(xml)?.[0] || xml;
@@ -424,7 +425,7 @@ export async function readSlideNotes(zip, slide) {
 export async function copySlideNotes(zip, sourcePath, targetPath) {
   const linked = relationshipTargetByType(await zipText(zip, partRelationshipPath(sourcePath)), 'notesSlide');
   if (!linked) return;
-  const sourceNotes = posix.normalize(posix.join(posix.dirname(sourcePath), linked));
+  const sourceNotes = partFromTarget(posix.dirname(sourcePath), linked);
   const xml = await zipText(zip, sourceNotes);
   if (!xml) return;
   let ordinal = 1;

package/src/runtime/office/portable/portable-pptx-shapes.mjs

@@ -522,7 +522,10 @@ const CELL_FILLS = ['a:noFill', 'a:solidFill', 'a:gradFill', 'a:blipFill', 'a:pa
 function filledCellProperties(tcPr, fill, anchor) {
   const open = /^<a:tcPr\b([^>]*?)(\/?)>/.exec(tcPr);
   let attributes = open[1];
-  if (anchor) attributes = /\banchor="/.test(attributes) ? attributes.replace(/\banchor="[^"]*"/, `anchor="${anchor}"`) : `${attributes} anchor="${anchor}"`;
+  if (anchor)
+    attributes = /\banchor="/.test(attributes)
+      ? attributes.replace(/\banchor="[^"]*"/, `anchor="${anchor}"`)
+      : `${attributes} anchor="${anchor}"`;
   let children = open[2] ? '' : tcPr.slice(open[0].length, tcPr.lastIndexOf('</a:tcPr>'));
   if (fill) {
     for (const element of topLevelElements(children, CELL_FILLS).reverse()) {
@@ -543,11 +546,15 @@ export async function handleSetTableCellStyle(context, op) {
   const shape = slideShape(tree, op);
   if (!/<a:tbl>/.test(shape.xml)) throw new Error(`PPTX shape ${op.shape} on slide ${op.slide} is not a table`);
   const rows = [...shape.xml.matchAll(/<a:tr\b[^>]*>[\s\S]*?<\/a:tr>/g)];
-  const cells = rows[Number(op.row) - 1] ? [...rows[Number(op.row) - 1][0].matchAll(/<a:tc\b[^>]*?(?:\/>|>[\s\S]*?<\/a:tc>)/g)] : [];
+  const cells = rows[Number(op.row) - 1]
+    ? [...rows[Number(op.row) - 1][0].matchAll(/<a:tc\b[^>]*?(?:\/>|>[\s\S]*?<\/a:tc>)/g)]
+    : [];
   const cell = cells[Number(op.col) - 1];
   if (!cell) {
     const columns = rows[0] ? [...rows[0][0].matchAll(/<a:tc\b/g)].length : 0;
-    throw new Error(`PPTX table shape ${op.shape} is ${rows.length}x${columns}; row ${op.row}, col ${op.col} is outside it`);
+    throw new Error(
+      `PPTX table shape ${op.shape} is ${rows.length}x${columns}; row ${op.row}, col ${op.col} is outside it`
+    );
   }
   const properties = op.properties || {};
   let styled = cell[0].replace(
@@ -556,20 +563,30 @@ export async function handleSetTableCellStyle(context, op) {
       `<a:txBody>${restyledParagraphs(inner, { ...properties, alignment: properties.horizontalAlignment ?? properties.alignment })}</a:txBody>`
   );
   // fillColor: null leaves the cell unfilled, as the Office backend's Fill.Visible = 0 does.
-  const fill = properties.fillColor === null ? '<a:noFill/>' : properties.fillColor ? solidFillXml(properties.fillColor) : '';
+  let fill = '';
+  if (properties.fillColor === null) fill = '<a:noFill/>';
+  else if (properties.fillColor) fill = solidFillXml(properties.fillColor);
   const anchor = textAnchor(properties.verticalAlignment);
   // The cell's own text frame may name an anchor too (this writer's add_table sets one); it follows the cell's.
   if (anchor) styled = styled.replace(/(<a:bodyPr\b[^>]*?\banchor=")[^"]*"/, `$1${anchor}"`);
   if (fill || anchor) {
     if (!/<a:tcPr\b/.test(styled)) styled = styled.replace('</a:tc>', '<a:tcPr/></a:tc>');
-    styled = styled.replace(/<a:tcPr\b[^>]*?(?:\/>|>[\s\S]*?<\/a:tcPr>)/, (tcPr) => filledCellProperties(tcPr, fill, anchor));
+    styled = styled.replace(/<a:tcPr\b[^>]*?(?:\/>|>[\s\S]*?<\/a:tcPr>)/, (tcPr) =>
+      filledCellProperties(tcPr, fill, anchor)
+    );
   }
   const row = rows[Number(op.row) - 1];
   const nextRow = row[0].replace(cell[0], () => styled);
   const updated = shape.xml.replace(row[0], () => nextRow);
-  const nextInner = `${tree.inner.slice(0, shape.start)}${updated}${tree.inner.slice(shape.end)}`;
-  context.zip.file(path, `${current.slice(0, tree.start)}${nextInner}${current.slice(tree.end)}`);
-  return { op: op.op, changed: updated !== shape.xml, slide: Number(op.slide), shape: Number(op.shape), row: Number(op.row), col: Number(op.col) };
+  writeShape(context, { path, current, tree }, shape, updated);
+  return {
+    op: op.op,
+    changed: updated !== shape.xml,
+    slide: Number(op.slide),
+    shape: Number(op.shape),
+    row: Number(op.row),
+    col: Number(op.col),
+  };
 }
 
 export async function handleSetTableDataOrReplaceImage(context, op) {

package/src/runtime/office/portable/portable-sheet-audits.mjs

@@ -16,7 +16,6 @@ import {
 import { partRelationshipPath, relationshipTargetsByType, zipText } from './portable-opc.mjs';
 import {
   cellWidthScale,
-  displayWidth,
   formattedNumberWidth,
   hiddenSheetAreas,
   mergedRanges,
@@ -78,12 +77,9 @@ function lockedEntryCells(xml, styles, entryCells) {
 
 // total counts every entry cell the validations ask for: "all" only when none of them was opened.
 function protectedInputIssue(sheet, locked, total) {
-  const named =
-    total === 1
-      ? 'the entry cell'
-      : locked.length === total
-        ? `all ${total} entry cells`
-        : `${locked.length} of ${total} entry cells`;
+  let named = `${locked.length} of ${total} entry cells`;
+  if (total === 1) named = 'the entry cell';
+  else if (locked.length === total) named = `all ${total} entry cells`;
   return {
     severity: 'warning',
     code: 'protected_input_locked',
@@ -217,7 +213,7 @@ function labelRoom(column, neighbourColumn, { widths, withheld }) {
 // something: the empty columns before it lend their width, and a hidden
 // column lends none, because the sheet gives it no room on the page.
 function cutLabelColumns(xml, { widths, withheld, styles, strings, digitWidth }) {
-  const merged = mergedAreas(xml);
+  const merged = mergedAreas(xml).filter(Boolean);
   const cutLabels = new Map();
   for (const row of iterateSheetRows(xml)) {
     const cells = [...iterateSheetCells(row.body)]

package/src/runtime/office/portable/portable-sheet-page.mjs

@@ -69,11 +69,11 @@ export function worksheetGeometry(xml, digitWidth = 7) {
       : Math.ceil((baseCharacters * digitWidth + 5) / 8) * 8;
   const columns = [...xml.matchAll(/<col\b([^>]*?)\/>/g)].map((match) => {
     const width = Number(xmlAttribute(match[1], 'width'));
+    const shown = width > 0 ? columnPixels(width, digitWidth) : defaultPixels;
     return {
       start: Number(xmlAttribute(match[1], 'min')),
       end: Number(xmlAttribute(match[1], 'max')),
-      pixels:
-        xmlAttribute(match[1], 'hidden') === '1' ? 0 : width > 0 ? columnPixels(width, digitWidth) : defaultPixels,
+      pixels: xmlAttribute(match[1], 'hidden') === '1' ? 0 : shown,
     };
   });
   const rows = new Map(

package/src/runtime/office/portable/portable-sheet-xml.mjs

@@ -395,7 +395,7 @@ function dateWidth(section) {
 // What Excel's General format prints: eleven characters at most, the decimals rounded to fit with trailing zeros
 // dropped, scientific notation past that. Counted from the stored digits, float noise such as 0.5700000000000001
 // measured eighteen characters for the 0.57 on the sheet.
-export function generalNumberText(number) {
+function generalNumberText(number) {
   const plain = String(number);
   if (plain.length <= 11) return plain;
   const magnitude = Math.abs(number);

package/src/runtime/office/portable/portable-snapshot-docx.mjs

@@ -707,6 +707,7 @@ function docxSections(documentXml, relationshipsXml, partText, referenced) {
     const cols = /<w:cols\b([^>]*?)\/?>/.exec(sectionXml)?.[1] || '';
     const columns = Number(/\bw:num="(\d+)"/.exec(cols)?.[1]) || 1;
     const space = Number(/\bw:space="(\d+)"/.exec(cols)?.[1]);
+    const columnSpacing = Number.isFinite(space) ? Math.round((space / TWIPS_PER_POINT) * 100) / 100 : 36;
     return {
       path: `/section[${index}]`,
       index,
@@ -717,9 +718,7 @@ function docxSections(documentXml, relationshipsXml, partText, referenced) {
       rightMargin: margin('right'),
       columns,
       // Word's own spacing when the file names none is half an inch.
-      ...(columns > 1
-        ? { columnSpacing: Number.isFinite(space) ? Math.round((space / TWIPS_PER_POINT) * 100) / 100 : 36 }
-        : {}),
+      ...(columns > 1 ? { columnSpacing } : {}),
       stories,
     };
   });

package/src/runtime/office/portable/portable-snapshot-pptx.mjs

@@ -210,7 +210,9 @@ function pptxShapeSnapshot(shape, shapeIndex, slideIndex, chartParts) {
             rows: tableRows,
             columns: tableColumns,
             values: [...shape.xml.matchAll(/<a:tr\b[^>]*>([\s\S]*?)<\/a:tr>/g)].map((row) =>
-              [...row[1].matchAll(/<a:tc\b[^>]*?(?:\/>|>([\s\S]*?)<\/a:tc>)/g)].map((cell) => blockText(cell[1] || '', 'a:t'))
+              [...row[1].matchAll(/<a:tc\b[^>]*?(?:\/>|>([\s\S]*?)<\/a:tc>)/g)].map((cell) =>
+                blockText(cell[1] || '', 'a:t')
+              )
             ),
           },
         }

package/src/runtime/office/portable/portable-soffice.mjs

@@ -5,7 +5,7 @@ import { constants as fsConstants, rmSync } from 'node:fs';
 import { pathToFileURL } from 'node:url';
 import JSZip from 'jszip';
 import { copyFile, readFile, rename, writeFile, mkdir, mkdtemp, rm, stat } from 'node:fs/promises';
-import { zipText } from './portable-opc.mjs';
+import { packageBuffer, zipText } from './portable-opc.mjs';
 import {
   computedCellValues,
   iterateSheetCells,
@@ -34,6 +34,13 @@ const SOFFICE_QUIET_ARGS = [
   '--norestore',
 ];
 
+// The child may already have exited; a kill that finds nothing to stop is not a failure.
+function killQuietly(child) {
+  try {
+    child.kill();
+  } catch {}
+}
+
 // A detection probe must always answer. soffice.exe is a GUI launcher that can
 // sit forever without exiting, which deadlocked detection before the rendering
 // call was ever reached, so the probe is bounded and the child killed on expiry.
@@ -49,9 +56,7 @@ function commandExists(command) {
     };
     const child = spawn(command, ['--version'], { windowsHide: true, stdio: 'ignore' });
     timer = setTimeout(() => {
-      try {
-        child.kill();
-      } catch {}
+      killQuietly(child);
       finish(false);
     }, SOFFICE_PROBE_TIMEOUT_MS);
     child.once('error', () => finish(false));
@@ -116,6 +121,8 @@ async function libreOfficeProgram() {
 }
 
 let pendingProfile = null;
+const createdProfiles = new Set();
+let exitHandlerRegistered = false;
 
 // Conversion must never attach to the user's own running LibreOffice: a shared
 // profile makes the second invocation either fail or block until the desktop
@@ -127,11 +134,17 @@ function sharedProfileDir() {
     const created = await mkdtemp(join(tmpdir(), 'mixdog-office-profile-'));
     // An exit handler cannot await, and a profile left behind accumulates one
     // directory per run of the app.
-    process.once('exit', () => {
-      try {
-        rmSync(created, { recursive: true, force: true });
-      } catch {}
-    });
+    createdProfiles.add(created);
+    if (!exitHandlerRegistered) {
+      exitHandlerRegistered = true;
+      process.once('exit', () => {
+        for (const profile of createdProfiles) {
+          try {
+            rmSync(profile, { recursive: true, force: true });
+          } catch {}
+        }
+      });
+    }
     return created;
   })();
   return pendingProfile;
@@ -169,9 +182,7 @@ export function runSoffice(program, args, { signal, timeoutMs, timeoutMessage, c
       resolve(value);
     };
     const onAbort = () => {
-      try {
-        child.kill();
-      } catch {}
+      killQuietly(child);
       finish({ ok: false, error: cancelMessage });
     };
     child.stderr.setEncoding('utf8');
@@ -183,9 +194,7 @@ export function runSoffice(program, args, { signal, timeoutMs, timeoutMessage, c
       finish(code === 0 ? { ok: true } : { ok: false, error: stderr.trim() || `LibreOffice exited with code ${code}` })
     );
     timer = setTimeout(() => {
-      try {
-        child.kill();
-      } catch {}
+      killQuietly(child);
       finish({ ok: false, error: timeoutMessage });
     }, timeoutMs);
     if (signal?.aborted) onAbort();
@@ -353,12 +362,7 @@ async function withoutFormulaCache(source) {
     if (next !== xml) zip.file(name, next);
   }
   if (!stripped) return source;
-  return await zip.generateAsync({
-    type: 'nodebuffer',
-    compression: 'DEFLATE',
-    compressionOptions: { level: 6 },
-    platform: 'DOS',
-  });
+  return await packageBuffer(zip);
 }
 
 // The roundtrip is asked for values and nothing else. What LibreOffice writes back is its own reading of the
@@ -374,7 +378,8 @@ async function withComputedValues(originalZip, produced) {
     const part = calculated.get(sheet.name);
     if (!part) continue;
     const computed = computedCellValues(await zipText(produced, part), strings);
-    if (computed.size) originalZip.file(sheet.path, writeCachedValues(await zipText(originalZip, sheet.path), computed));
+    if (computed.size)
+      originalZip.file(sheet.path, writeCachedValues(await zipText(originalZip, sheet.path), computed));
   }
   await refreshChartCaches(originalZip);
   const workbookXml = await zipText(originalZip, 'xl/workbook.xml');

package/src/runtime/office/portable/portable-validation-package.mjs

@@ -108,8 +108,7 @@ async function comparePackageParts(
     changedParts.push(name);
     if (isProtected(name) && !renumberedWorkbook(name) && !chartDataRewritten(name)) {
       changedProtectedParts.push({ part: name, before, after });
-    }
-    else if (applicationNormalized(name)) applicationNormalizedParts.push(name);
+    } else if (applicationNormalized(name)) applicationNormalizedParts.push(name);
   }
   return { changedProtectedParts, applicationNormalizedParts, changedParts };
 }

package/src/runtime/office/portable/portable-validation.mjs

@@ -16,6 +16,7 @@ import { EMU_PER_POINT } from './portable-slide-shapes.mjs';
 import {
   imagePixelSize,
   loadPackage,
+  partFromTarget,
   partRelationshipPath,
   relationshipMap,
   relationshipOwner,
@@ -72,6 +73,11 @@ function runField(properties, fill) {
   return HIGHLIGHT_FILLS[highlight] || fill;
 }
 
+// Large text (18pt, or 14pt bold) is readable at 3:1; everything else needs 4.5:1.
+function minimumContrast(size, bold) {
+  return size >= 18 || (size >= 14 && bold) ? 3 : 4.5;
+}
+
 // The worst readable ratio among a block's runs, with the size and weight that
 // decide the minimum. Word keeps sizes in half-points.
 function runInkReading(xml, fill) {
@@ -92,7 +98,7 @@ function runInkReading(xml, fill) {
     const bold = /<w:b(?:\s[^>]*)?\/>/.test(properties);
     const ratio = contrastRatio(color, runField(properties, fill));
     if (ratio == null) continue;
-    const minimum = size >= 18 || (size >= 14 && bold) ? 3 : 4.5;
+    const minimum = minimumContrast(size, bold);
     if (ratio >= minimum) continue;
     if (!worst || ratio < worst.ratio) worst = { ratio, minimum, size };
   }
@@ -220,7 +226,7 @@ function auditTableRow(rowXml, { widths, pathPrefix, slideSurface }, issues, ove
   for (const { xml, body, size, bold, columnOrdinal, fit } of cells) {
     const cellPath = `${pathPrefix}/cell[${columnOrdinal}]`;
     const ratio = tableCellContrast(xml, body, slideSurface);
-    const minimum = size >= 18 || (size >= 14 && bold) ? 3 : 4.5;
+    const minimum = minimumContrast(size, bold);
     // The cap is on the reports; the rows are still measured so the table's height is known.
     if (ratio != null && ratio < minimum && issues.length < MAX_ISSUES) {
       issues.push({
@@ -434,7 +440,7 @@ async function imagePlacementIssues(zip, format) {
       if (!embed || !extent) continue;
       const target = relationships.get(embed);
       if (!target) continue;
-      const media = posix.normalize(posix.join(posix.dirname(part), target));
+      const media = partFromTarget(posix.dirname(part), target);
       const file = zip.file(media);
       if (!file) continue;
       const bytes = await file.async('nodebuffer');

package/src/runtime/office/portable/portable-xlsx-operations.mjs

@@ -1,7 +1,7 @@
 // Worksheet-level operations the portable XLSX backend applies: sheet
 // management, images, header/footer, conditional formats, validation, sort,
 // autofit, pivot tables and charts.
-import { conditionalFormatKind, listValidationChoices, listValidationFormula } from './xlsx-contract.mjs';
+import { conditionalFormatKind, listValidationChoices, normalizeXlsxValidation } from './xlsx-contract.mjs';
 import { nextRelationshipId, partRelationshipPath, zipText } from './portable-opc.mjs';
 import {
   OFFICE_RELATIONSHIP_BASE,
@@ -45,29 +45,6 @@ function headerFooterFields(text) {
     .replace(/\{file\}/gi, '&F');
 }
 
-// Cell validation as both backends express it: the OOXML names here, the Excel
-// enumeration in the COM host.
-const XLSX_VALIDATION_TYPES = Object.freeze({
-  list: 'list',
-  whole: 'whole',
-  decimal: 'decimal',
-  date: 'date',
-  time: 'time',
-  textlength: 'textLength',
-  custom: 'custom',
-});
-
-const XLSX_VALIDATION_OPERATORS = Object.freeze({
-  between: 'between',
-  notbetween: 'notBetween',
-  equal: 'equal',
-  notequal: 'notEqual',
-  greaterthan: 'greaterThan',
-  lessthan: 'lessThan',
-  greaterthanorequal: 'greaterThanOrEqual',
-  lessthanorequal: 'lessThanOrEqual',
-});
-
 export const TABLE_CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml';
 
 // A built-in table style bands the range from the workbook's own theme, which
@@ -330,18 +307,6 @@ async function expressionConditionalRule(zip, op, priority) {
 
 // The comparison a bounded validation applies; a second bound without one
 // means between.
-function validationOperator(op, type) {
-  const requested = String(op.operator || '').trim();
-  let operator = '';
-  if (requested && Object.hasOwn(XLSX_VALIDATION_OPERATORS, requested.toLowerCase())) {
-    operator = XLSX_VALIDATION_OPERATORS[requested.toLowerCase()];
-  } else if (op.formula2 != null && !['list', 'custom'].includes(type)) operator = 'between';
-  if (requested && !operator) {
-    throw new Error(`add_validation operator must be one of ${Object.keys(XLSX_VALIDATION_OPERATORS).join(', ')}`);
-  }
-  return operator;
-}
-
 function dataValidationXml(op, { type, operator, reference }) {
   const formula = (value) => `${xmlEncode(String(value).replace(/^=/, ''))}`;
   return (
@@ -359,19 +324,7 @@ function dataValidationXml(op, { type, operator, reference }) {
 /** One data validation over a range, appended to the validations already there. */
 export function addWorksheetValidation(zip, sheet, xml, op) {
   const reference = areaReference(parseAreaRange(op.range));
-  // A list is the common case and what Excel writes through the same
-  // operation, so it is the default; the other kinds guard a number, a
-  // date, or a length, and take a second bound. A formula that states a
-  // rule rather than naming choices is that rule, not a dropdown of one
-  // entry: "서울,부산" and $A$1:$A$9 are lists, B2>0 is a custom check.
-  const kind = String(op.type || (listValidationFormula(op.formula1) ? 'list' : 'custom'))
-    .trim()
-    .toLowerCase();
-  const type = Object.hasOwn(XLSX_VALIDATION_TYPES, kind) ? XLSX_VALIDATION_TYPES[kind] : '';
-  if (!type) {
-    throw new Error(`add_validation type must be one of ${Object.keys(XLSX_VALIDATION_TYPES).join(', ')}`);
-  }
-  const operator = validationOperator(op, type);
+  const { type, operator = '' } = normalizeXlsxValidation(op);
   const existing = worksheetSection(xml, 'dataValidations');
   const previous = existing ? containerBody(existing[0], 'dataValidations') : '';
   const count = (previous.match(/<dataValidation\b/g) || []).length + 1;