@openpresentation/opf-pptx 0.27.0 → 0.28.0

package/DEPENDENCY-NOTES.md

@@ -4,7 +4,7 @@
 
 PPTX 0.11.4 depends on published [`@openpresentation/opf@^0.11.3`](https://www.npmjs.com/package/@openpresentation/opf) (reference layer: ColorRef, document `variables`, exported `resolveColorRef()`). The optional renderer peer is [`@openpresentation/opf-render@^0.11.0`](https://www.npmjs.com/package/@openpresentation/opf-render) so editor 0.10.0 + render 0.11.0 + pptx 0.11.0 install together. CI checks out OPF [`b8a1faf`](https://github.com/OpenPresentation/opf/commit/b8a1faf24203635bd36b09ea19f44bcd53781f16) (`opf-v0.11.0`) for coordinated source linking. Named content colors resolve through core `resolveColorRef()`; eight-digit hex alpha stays a local export concern because core `normalizeHexColor` drops the alpha byte. The deck color scheme is written as the theme `clrScheme`, and named slot and role colors (text, table cells and borders, hyperlinks, backgrounds) are written as `schemeClr` where the deck theme holds exactly that color; card, timeline and media colors, literal hex, variables, translucent colors and slide-override colors stay literal `srgbClr`.
 
-Since RR-17 (opf-pptx#162) the vendored engine is [pptxgenjs-plus](https://github.com/lofcz/pptxgenjs-plus) 4.3.4, the maintained MIT fork of PptxGenJS (same public API and default export): `vendor/pptxgenjs/pptxgen.es.js` is the exact, unmodified `package/dist/pptxgen.es.js` of the npm archive, with its MIT license, the archive's SHA-512 integrity, per-file SHA-256 hashes and the source commit of its npm SLSA provenance (`lofcz/pptxgenjs-plus@ecfa5086`) in `UPSTREAM.json`. Its imports are declared directly and pinned: `@node-projects/jszip` 4.3.0 (replacing `jszip` 3.10.2), `@rgrove/parse-xml` 4.2.3 and `pako` 3.0.2. `@node-projects/jszip` declares `@types/node` as a runtime dependency (type declarations, no code), so it is installed too. opf-pptx's own package reading and writing stays on `fflate`. Every output change and how it was measured is in [docs/pptxgenjs-plus-migration.md](docs/pptxgenjs-plus-migration.md); `src/vendor-compat.js` keeps the PptxGenJS 4.0.1 output where opf-pptx's contracts need it.
+Since RR-17 (opf-pptx#162) the vendored engine is [pptxgenjs-plus](https://github.com/lofcz/pptxgenjs-plus) 4.3.4, the maintained MIT fork of PptxGenJS (same public API and default export): `vendor/pptxgenjs/pptxgen.es.js` is the exact, unmodified `package/dist/pptxgen.es.js` of the npm archive, with its MIT license, the archive's SHA-512 integrity, per-file SHA-256 hashes and the source commit of its npm SLSA provenance (`lofcz/pptxgenjs-plus@ecfa5086`) in `UPSTREAM.json`. Its imports are declared directly and pinned: `@node-projects/jszip` 4.3.0 (replacing `jszip` 3.10.2), `@rgrove/parse-xml` 5.0.0 and `pako` 3.0.2. `@node-projects/jszip` declares `@types/node` as a runtime dependency (type declarations, no code), so it is installed too. opf-pptx's own package reading and writing stays on `fflate`. Every output change and how it was measured is in [docs/pptxgenjs-plus-migration.md](docs/pptxgenjs-plus-migration.md); `src/vendor-compat.js` keeps the PptxGenJS 4.0.1 output where opf-pptx's contracts need it.
 
 Browser builds of the engine's ZIP dependency (RR-20, 0.13.1): `@node-projects/jszip` 4.3.0's `lib/support.js` probes `require("readable-stream")` inside try/catch. Node ESM has no `require`, so the probe always fails there, but bundlers follow the literal: when the consumer's tree holds readable-stream 2 (for example through jszip 3, as in opf-editor's packed consumer), esbuild bundles it and fails on `events` and `buffer`, and Turbopack pulls it in with Node polyfills. `vendor/jszip/index-min.js` is the exact, unmodified `package/lib/index-min.js` of the pinned npm archive (the package's own prepublish bundle of `lib/`, which esbuild 0.28.2 reproduces byte for byte; it calls the probe through a wrapper bundlers do not follow), with its license (`LICENSE.md`, MIT or GPL-3.0-or-later; opf-pptx uses it under MIT), the archive's SHA-512 integrity and per-file SHA-256 hashes in `UPSTREAM.json`. The browser field of `vendor/pptxgenjs/package.json` maps the engine's `@node-projects/jszip` import to it (esbuild, webpack and Turbopack honour it); Node ignores the browser field and keeps the installed package. Every build (`scripts/verify-vendor.mjs`) requires the vendored version to equal the pinned dependency and the lockfile integrity, and its bytes to equal the installed package's bundle, so a dependency bump without re-vendoring fails. Refresh it by copying `node_modules/@node-projects/jszip/lib/index-min.js` and `LICENSE.md` after `npm ci` and updating `UPSTREAM.json`. `test/zip-bundle-boundary.mjs` (offline) and the browser suite `test/packed-bundle-browser.mjs` (packed tarball installed next to readable-stream, bundled with esbuild, the core examples exported in Chromium byte-identical to Node) guard it.
 

package/dist/content-topology.js

@@ -375,7 +375,9 @@ export function listLineRoles(items, omit = () => {}) {
   const lists = [];
   for (const item of items ?? []) {
     if (!['items', 'bullets'].includes(item?.field) || !Array.isArray(item?.text?.listEntries)) continue;
-    if (!item.text.listEntries.some(entry => entry.description?.richLines?.length)) continue;
+    // A list without markers (design.listBullet: none) records its roles too: without a bullet, the first line of an entry is
+    // only known from this record.
+    if (!item.text.listEntries.some(entry => entry.description?.richLines?.length || entry.marker?.none)) continue;
     const lines = [];
     item.text.listEntries.forEach((entry, index) => {
       for (const [role, text] of [['text', entry.text], ['description', entry.description]])

package/dist/index.js

@@ -1480,11 +1480,15 @@ function mergeOpfListShapes(items, breaks = null, report = () => {}, runs = null
   const merged = new Map(), consumed = new Set();
   for (const [path, entries] of lists) {
     entries.sort((a, b) => a.line - b.line);
-    if (!entries[0].item.paragraphs[0].bullet) continue;
     const expectedRoles = roles?.get(path);
-    const validRoles = expectedRoles && expectedRoles.length === entries.length && entries.every(({item, line}, index) => line === index && Boolean(item.paragraphs[0].bullet) === expectedRoles[index][2]);
+    // design.listBullet: none writes no bullet at all (a:buNone): the list is unambiguous only through its recorded roles, whose
+    // first lines start the entries. Without that record the shapes stay as they are.
+    const unbulleted = entries.every(({item}) => !item.paragraphs[0].bullet);
+    if (!entries[0].item.paragraphs[0].bullet && !(unbulleted && expectedRoles?.[0]?.[2])) continue;
+    const validRoles = expectedRoles && expectedRoles.length === entries.length && entries.every(({item, line}, index) => line === index && (unbulleted || Boolean(item.paragraphs[0].bullet) === expectedRoles[index][2]));
     const lineRoles = validRoles ? expectedRoles : null;
     if (expectedRoles && !validRoles) report({code: 'list-line-role-changed', message: `The line topology of ${path} changed; list roles were not restored.`});
+    if (unbulleted && !validRoles) continue;
     const look = runs?.get(path), textLook = cleanBase(look?.text), descriptionLook = cleanBase(look?.description);
     // The line's runs without the inherited look, or the paragraph's own richText when there is no record for this kind of line.
     // Each run is cleaned on its own and none merge, so the runs stay the slots the run colour record counts (src/run-colors.js);
@@ -1512,7 +1516,7 @@ function mergeOpfListShapes(items, breaks = null, report = () => {}, runs = null
       const [paragraph] = item.paragraphs, current = paragraphs.at(-1);
       const gap = recorded?.get(line);
       const join = (a, b) => gap === undefined ? joinRich(a, b) : joinWrappedText([a, b], [gap]);
-      if (paragraph.bullet) { paragraphs.push({...paragraph, richText: own(paragraph, textLook)}); size = paragraph.maxFontSize; }
+      if (unbulleted ? lineRoles?.[line][2] : paragraph.bullet) { paragraphs.push({...paragraph, bullet: true, richText: own(paragraph, textLook)}); size = paragraph.maxFontSize; }
       else if (paragraph.text === '') { /* a blank line of the entry: no text, no description */ }
       else if (lineRoles ? lineRoles[line][1] === 'description' : paragraph.maxFontSize < size - 0.01) {
         const text = own(paragraph, descriptionLook) ?? paragraph.text;
@@ -2554,7 +2558,9 @@ async function addMeasuredList(slide,fit,context,path,bulletImage,presentation,s
   for(const entry of fit.listEntries){
     const addLines=(text,box,color,native,withBullet)=>{
       text.richLines.forEach((line,index)=>{
-        const first=withBullet&&index===0,level=Math.min(8,entry.level),inset=first?entry.marker.indent*(level+1):0;
+        // design.listBullet: none (entry.marker.none): the first line has no marker, no inset and no hanging indent (a:buNone); core
+        // already moved a nested level's text box, so the paragraph carries no indent level.
+        const first=withBullet&&index===0,markerless=first&&entry.marker.none===true,level=Math.min(8,entry.level),inset=first&&!markerless?entry.marker.indent*(level+1):0;
         // Right to left (RR-05): the bullet column is at the right, so the first line's box extends right to hold it and the paragraph
         // is rtl with its text aligned to the right; marL/indent are the start-side margin and hanging indent in PowerPoint.
         const entryRtl=entry.direction==='rtl';
@@ -2563,8 +2569,8 @@ async function addMeasuredList(slide,fit,context,path,bulletImage,presentation,s
         const lineAlign=physicalAlignment('left',lineDirection);
         const objectName=`OPF list ${path} line ${lineNumber++}`;
         const number=first?entry.marker.number:undefined;
-        if(first)context.listMarkers.set(objectName,{fontFamily:entry.marker.style.fontFamily,fontSize:entry.marker.fontSize*.75,color:pptxColor(context.textColor),picture:number?false:picture});
-        const paragraph=first?{bullet:number?{type:'number',style:autoNumScheme(number.style,number.suffix),startAt:number.value,indent:entry.marker.indent*.75}:{characterCode:entry.marker.text.codePointAt(0).toString(16).padStart(4,'0'),indent:entry.marker.indent*.75},indentLevel:level}:{bullet:false};
+        if(first&&!markerless)context.listMarkers.set(objectName,{fontFamily:entry.marker.style.fontFamily,fontSize:entry.marker.fontSize*.75,color:pptxColor(context.textColor),picture:number?false:picture});
+        const paragraph=first&&!markerless?{bullet:number?{type:'number',style:autoNumScheme(number.style,number.suffix),startAt:number.value,indent:entry.marker.indent*.75}:{characterCode:entry.marker.text.codePointAt(0).toString(16).padStart(4,'0'),indent:entry.marker.indent*.75},indentLevel:level}:{bullet:false};
         const runs=richLineRuns(line,color,native,context,path);
         if(!runs.length)runs.push({text:'',options:{}});
         // Keep paragraph intent identical across runs. ZIP normalization below

package/dist/native-body.js

@@ -47,7 +47,7 @@ function planOne(item, geometry, automatic, reject) {
   let values, numbering;
   if (list) {
     const entries = item.text?.listEntries;
-    if (item.bulletImage || !entries?.length || entries.some(entry => entry.level !== 0 || entry.description) ||
+    if (item.bulletImage || !entries?.length || entries.some(entry => entry.level !== 0 || entry.description || entry.marker?.none) ||
       item.value.some(entry => entry && !Array.isArray(entry) && typeof entry === 'object' && Object.keys(entry).some(key => key !== 'text' && key !== 'level'))) {
       reject('unsupported-list'); return undefined;
     }

package/dist/quote-provenance.js

@@ -3,6 +3,7 @@ import {isValidFormat} from './format-check.js';
 import {attachTextTags,decodeTextTag,groupUnchanged} from './code-provenance.js';
 import {sourceLineParagraphs} from './text-provenance.js';
 import {cleanBase,headingValue,joinRichLines,unwrapQuoteRuns} from './rich-heading.js';
+import {unwrapQuoteMarks} from '@openpresentation/opf/composition';
 
 // FF-57: a `quote` payload exports as native text lines (a body part and an optional footer part). Each line shape carries an
 // OPF_QUOTE_V1 tag, so an unchanged export imports back as {quote: ...} instead of loose text blocks. Like timelines, only topology
@@ -11,10 +12,11 @@ import {cleanBase,headingValue,joinRichLines,unwrapQuoteRuns} from './rich-headi
 // FA-12: a quote with a `photo` also exports one native picture (an ellipse), tagged with the same group; import restores `photo` from
 // that picture's current bytes and description, and `role` from the footer.
 const TAG='OPF_QUOTE_V1',REL='http://schemas.openxmlformats.org/officeDocument/2006/relationships/tags';
-const SEPARATOR=' - ',FIELDS=['attribution','role','source'];
+// Core joins the source with an en dash (WI-4); a file exported before then holds a hyphen, which import still reads.
+const SEPARATOR=' \u2013 ',LEGACY_SEPARATOR=' - ',FIELDS=['attribution','role','source'];
 // Every non-empty footer field list, in core's order (attribution, role, source).
 const FOOTERS=['["attribution"]','["role"]','["source"]','["attribution","role"]','["attribution","source"]','["role","source"]','["attribution","role","source"]'];
-// Core joins the role to the line above with a line break and the source with " - ".
+// Core joins the role to the line above with a line break and the source with " \u2013 ".
 const separatorBefore=field=>field==='role'?'\n':SEPARATOR;
 const parser=new XMLParser({ignoreAttributes:false,attributeNamePrefix:'',parseTagValue:false,trimValues:false});
 const decoder=new TextDecoder('utf-8',{fatal:true}),array=value=>value===undefined?[]:Array.isArray(value)?value:[value];
@@ -22,7 +24,7 @@ export const attachQuoteTags=(entries,records)=>attachTextTags(entries,records,T
 export const quotePhotoName=group=>`OPF quote photo ${group}`;
 
 // The manifest rides on the first body line. `footer` lists which fields the footer part joins (core writes the attribution, the role
-// on its own line and the source after " - ", skipping an absent field) and, from two fields on, where each separator starts, so an
+// on its own line and the source after " \u2013 ", skipping an absent field) and, from two fields on, where each separator starts, so an
 // unchanged footer splits back exactly. `photo` records that a headshot picture belongs to the quote.
 export function quoteManifest(value,layout) {
   const shorthand=typeof value==='string',fields=shorthand?[]:FIELDS.filter(field=>value[field]);
@@ -55,7 +57,7 @@ function validateManifest(manifest) {
   return count;
 }
 
-const unwrap=text=>text.length>=2&&text.startsWith('"')&&text.endsWith('"')?text.slice(1,-1):text;
+const unwrap=unwrapQuoteMarks;
 // Split the current footer text back into fields. A separator whose recorded position no longer matches is searched for from the end of
 // the previous field; a footer with a missing separator keeps everything as the attribution.
 function footerFields(text,footer,report) {
@@ -64,8 +66,10 @@ function footerFields(text,footer,report) {
   const out={};let from=0;
   for(let index=1;index<fields.length;index++){
     const separator=separatorBefore(fields[index]),recorded=footer.splits[index-1];
-    const at=recorded>=from&&text.startsWith(separator,recorded)?recorded:text.indexOf(separator,from);
-    if(at<0){
+    const legacy=separator===SEPARATOR?LEGACY_SEPARATOR:separator,both=[separator,legacy];
+    const found=both.find(candidate=>recorded>=from&&text.startsWith(candidate,recorded));
+    const at=found!==undefined?recorded:Math.min(...both.map(candidate=>text.indexOf(candidate,from)).filter(position=>position>=0),Infinity);
+    if(at===Infinity){
       report({code:'quote-footer-merged',message:'The quote footer no longer separates its attribution, role and source; the current text is kept as the attribution.'});
       return {attribution:text};
     }

package/dist/rich-heading.js

@@ -7,6 +7,7 @@
 // are joined with the boundaries their tags record; soft wraps insert nothing and hard boundaries keep their separator.
 
 import {splitWeightFace} from './font-weights.js';
+import {isWrappedInQuoteMarks, unwrapQuoteMarks} from '@openpresentation/opf/composition';
 
 const object = value => value !== null && typeof value === 'object' && !Array.isArray(value);
 // The run properties that describe how a heading looks. `link` and `text` are never defaults.
@@ -88,11 +89,11 @@ export function headingValue(parts, base) {
   return merged.map(run => Object.keys(run).length === 1 ? run.text : run);
 }
 
-/** Remove the opening and closing quotation mark an exported quote body carries (core joins them to the first and last run). */
+/** Remove the opening and closing quotation mark an exported quote body carries (core joins them to the first and last run; the pair follows the deck language, or is the older ASCII pair). */
 export function unwrapQuoteRuns(value) {
-  if (!Array.isArray(value)) return typeof value === 'string' && value.length >= 2 && value.startsWith('"') && value.endsWith('"') ? value.slice(1, -1) : value;
+  if (!Array.isArray(value)) return typeof value === 'string' ? unwrapQuoteMarks(value) : value;
   const text = run => typeof run === 'string' ? run : run.text;
-  if (!value.length || !text(value[0]).startsWith('"') || !text(value.at(-1)).endsWith('"') || (value.length === 1 && text(value[0]).length < 2)) return value;
+  if (!value.length || !isWrappedInQuoteMarks(text(value[0])[0] + text(value.at(-1)).at(-1)) || (value.length === 1 && text(value[0]).length < 2)) return value;
   const runs = value.map(run => typeof run === 'string' ? run : {...run});
   const edit = (index, change) => {
     const run = runs[index];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openpresentation/opf-pptx",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "Pure local OPF to PPTX export and PPTX to OPF import tooling.",
   "license": "MIT",
   "type": "module",
@@ -38,16 +38,16 @@
   "sideEffects": false,
   "dependencies": {
     "@node-projects/jszip": "4.3.0",
-    "@rgrove/parse-xml": "4.2.3",
+    "@rgrove/parse-xml": "5.0.0",
     "fast-xml-parser": "^5.8.0",
     "fflate": "^0.8.3",
     "pako": "3.0.2",
     "sharp": "0.35.5",
-    "@openpresentation/gallery": "^0.27.0",
-    "@openpresentation/opf": "^0.27.0"
+    "@openpresentation/gallery": "^0.28.0",
+    "@openpresentation/opf": "^0.28.0"
   },
   "peerDependencies": {
-    "@openpresentation/opf-render": "^0.27.0"
+    "@openpresentation/opf-render": "^0.28.0"
   },
   "peerDependenciesMeta": {
     "@openpresentation/opf-render": {
@@ -73,8 +73,8 @@
     "@expo-google-fonts/tinos": "0.4.2",
     "@resvg/resvg-js": "2.6.2",
     "esbuild": "0.28.2",
-    "playwright": "1.64.0",
-    "@openpresentation/opf-render": "0.27.0"
+    "playwright": "1.64.1",
+    "@openpresentation/opf-render": "0.28.0"
   },
   "imports": {
     "#image-fallback": {
@@ -109,5 +109,5 @@
     "test:native-text": "node test/native-text-whitespace.mjs",
     "test:determinism": "node test/determinism.mjs"
   },
-  "gitHead": "f90536d0e9a7a16b25aa718e03ced4e00a7316e1"
+  "gitHead": "abc56634a584db38a305a27edc3bc76b4116637b"
 }