@openpresentation/opf-pptx 0.11.1 → 0.11.3

package/dist/index.js

@@ -3,6 +3,8 @@ import {isFaceStyleSuffix} from './font-weights.js';
 import {importTableFrames} from './table-import.js';
 import {applyChartFonts, applyPitchFamilies, finalizeFontsUsed, fontPitchFamilies} from './package-fonts.js';
 import {readChartCategoryHeading,writeChartCategoryHeading} from './chart-workbook.js';
+import {CHARTEX_FALLBACK,resolveChartType,chartTypeFromNative,applyChartConstruct,NATIVE_CHART_ELEMENTS} from './chart-types.js';
+import {attachChartexParts,chartFromChartex,CHARTEX_GRAPHIC_DATA_URI} from './chartex.js';
 import {attachCodeTags, codeManifest, importCodeGroups, nativeShapeParagraphs, nativeTextShapes} from './code-provenance.js';
 import {attachMetricTags,metricManifest,importMetricGroups} from './metric-provenance.js';
 import {attachCardTags,importCardFrames} from './card-provenance.js';
@@ -19,7 +21,7 @@ import {dedupeMedia} from './media-dedupe.js';
 import {placeWatermarks, importWatermark, watermarkName, watermarkBox, watermarkOpacity} from './watermark-provenance.js';
 import {nativeBackgroundFill, nativeImageBackgroundFill, nativePatternPreset} from './background.js';
 import {importBackground} from './background-import.js';
-import {themeSlotColors, writeThemeColors, schemeColorValue, schemeBackgroundFill, readThemeSlotColors, recoverColorScheme, recoverTheme, presentationThemePath} from './theme-colors.js';
+import {themeSlotColors, writeThemeColors, schemeColorValue, schemeBackgroundFill, schemeBackgroundValue, defaultTextSchemeValues, tableTextSchemeValue, solidColorXml, writeMasterBackground, inheritLayoutBackground, readThemeSlotColors, recoverColorScheme, recoverTheme, presentationThemePath} from './theme-colors.js';
 import {languageDiagnostics, observeLanguage, partScriptFonts, planScriptFonts, reconcileLanguage} from './script-fonts.js';
 import { webpToPng } from '#image-fallback';
 import { rasterMetadata, pictureTransform, normalizeImageOrientation } from './image-geometry.js';
@@ -223,7 +225,14 @@ export async function toPptx(input, options = {}) {
   context.metricTags = new Map();
   context.chartHeadings = new Map();
   context.chartFonts = new Map();
+  context.chartex = new Map();
   context.imageFormat = options.imageFormat ?? "compatible";
+  // Native chartex parts are opt-in until the native PowerPoint check confirms them (FF-22b); the default keeps the
+  // clustered column export of the chartex chart types.
+  if (options.chartex !== undefined && !['native', 'fallback'].includes(options.chartex)) {
+    throw new OPFPptxError('invalid-chartex-mode', 'chartex must be native or fallback.', {path: 'options.chartex'});
+  }
+  context.chartexMode = options.chartex ?? 'fallback';
   Object.assign(context, exportTheme(presentation, context));
   context.reportedFontSchemes = new Set();
   // Document references and metadata tags (FF-32, docs/document-roundtrip.md).
@@ -233,6 +242,8 @@ export async function toPptx(input, options = {}) {
     report: diagnostic => options.onDiagnostic?.(diagnostic)
   });
   context.scriptFonts = planScriptFonts(presentation, options.onDiagnostic);
+  context.masterBackground = masterBackground(context);
+  context.linkSentinels = linkSentinels(presentation);
   const pptx = new PptxGenJS();
   configurePresentation(pptx, presentation, {...context,fonts:resolveSlideContext(presentation,presentation.slides[0],context,options).fonts});
 
@@ -610,6 +621,15 @@ function collectSlideItems(entries, slideRoot, slidePath, relationships, dimensi
     const item = importGraphicFrame(entries, frame, slidePath, relationships, tables[index]);
     if (item) items.push(item);
   }
+  // A chartex chart is an mc:AlternateContent: the choice frame references the cx:chartSpace part; the fallback is a classic chart frame
+  // (this exporter) or a text shape (PowerPoint). The choice is read first and the fallback only when it names no OPF chart type.
+  for (const alternate of asArray(tree?.["mc:AlternateContent"])) {
+    const choice = asArray(alternate?.["mc:Choice"]).map((node) => node?.["p:graphicFrame"]).find(Boolean);
+    const fallback = asArray(alternate?.["mc:Fallback"]).map((node) => node?.["p:graphicFrame"]).find(Boolean);
+    const chosen = choice ? importGraphicFrame(entries, choice, slidePath, relationships) : null;
+    const item = chosen?.payload?.type === "chart" ? chosen : fallback ? importGraphicFrame(entries, fallback, slidePath, relationships) : chosen;
+    if (item && item.kind !== "unknown") items.push(item);
+  }
 
   for (const [index, picture] of nativeContext.pictures.entries()) {
     if (furniture.pictures.has(index) || nativeContext.slideImagePictures?.has(index) || nativeContext.watermarkPictures?.has(index)) continue;
@@ -665,9 +685,12 @@ function importGraphicFrame(entries, frame, slidePath, relationships, importedTa
     };
   }
 
-  const chartRelId = graphicData?.["c:chart"]?.["r:id"];
+  const chartExRelId = graphicData?.uri === CHARTEX_GRAPHIC_DATA_URI ? graphicData?.["cx:chart"]?.["r:id"] : undefined;
+  const chartRelId = graphicData?.["c:chart"]?.["r:id"] ?? chartExRelId;
   if (chartRelId) {
-    const chart = chartFromRelationship(entries, slidePath, relationships, chartRelId);
+    const chart = chartExRelId
+      ? chartexFromRelationship(entries, relationships, chartExRelId)
+      : chartFromRelationship(entries, slidePath, relationships, chartRelId);
     return {
       kind: "chart",
       bounds,
@@ -851,6 +874,7 @@ function chartFromRelationship(entries, slidePath, relationships, relId) {
 
   const budget = { cells: 0 };
   const cachePath = (index, role) => `${relationship.path}#c:ser[${index}]/${role}`;
+  if (chartNode.type === 'scatter') return scatterFromSeries(entries, relationship.path, series, budget, cachePath);
   const labels = cachedValues(series[0]?.["c:cat"], cachePath(0, 'c:cat'), budget);
   const names = series.map((entry, index) => firstCachedValue(entry?.["c:tx"], cachePath(index, 'c:tx'), budget) ?? `Series ${index + 1}`);
   const values = series.map((entry, index) => {
@@ -880,19 +904,48 @@ function chartFromRelationship(entries, slidePath, relationships, relId) {
   };
 }
 
+// Scatter charts share X values (c:xVal) across Y series (c:yVal). OPF keeps
+// them category-major: [point label, X, Y1, Y2, ...]; native charts carry no
+// point labels, so points are numbered.
+function scatterFromSeries(entries, chartPart, series, budget, cachePath) {
+  // The same cache helpers as every other chart: bounded, indexed by c:pt@idx, with gaps kept as null (never plotted as 0).
+  const xRole = series[0]?.["c:xVal"];
+  const xs = cachedValues(xRole, cachePath(0, "c:xVal"), budget, numericCacheValue);
+  const names = series.map((entry, index) => firstCachedValue(entry?.["c:tx"], cachePath(index, "c:tx"), budget) ?? `Series ${index + 1}`);
+  const values = series.map((entry, index) => cachedValues(entry?.["c:yVal"], cachePath(index, "c:yVal"), budget, numericCacheValue));
+  const rowCount = values.reduce((count, row) => Math.max(count, row.length), xs.length);
+  if (rowCount === 0) return null;
+  if (rowCount * (series.length + 2) > MAX_CHART_CACHE_CELLS) {
+    throw new OPFPptxError('invalid-chart-cache', 'Chart cache exceeds the 1,000,000-cell import limit; reduce its rows or series before importing.', {path: chartPart});
+  }
+  const rows = [];
+  // A chart without c:xVal plots against 1..n natively; a c:xVal gap stays a gap.
+  for (let index = 0; index < rowCount; index += 1) rows.push([String(index + 1), xRole === undefined ? index + 1 : xs[index] ?? null, ...values.map((row) => row[index] ?? null)]);
+  return { type: "scatter", data: { columns: ["Point", readChartCategoryHeading(entries, chartPart) ?? "X", ...names], rows } };
+}
+
+// A chartex part (cx:chartSpace): the series layoutIds name the kept OPF chart
+// type and the cached dimensions restore the category-major data, under the
+// same bounds as the classic chart cache.
+function chartexFromRelationship(entries, relationships, relId) {
+  const relationship = relationships.get(relId);
+  if (!relationship?.path || !entries[relationship.path]) return null;
+  const doc = parseRequiredXml(entries, relationship.path);
+  return chartFromChartex(doc, {
+    heading: readChartCategoryHeading(entries, relationship.path),
+    limits: {points: MAX_CHART_CACHE_POINTS, cells: MAX_CHART_CACHE_CELLS},
+    path: relationship.path,
+    invalid: (message, location) => {
+      throw new OPFPptxError('invalid-chart-cache', `Invalid chart cache: ${message}. Repair the chart data before importing.`, {path: location ?? relationship.path});
+    }
+  });
+}
+
 function firstChartNode(plotArea) {
-  const candidates = [
-    ["c:barChart", (node) => node?.["c:barDir"]?.val === "bar" ? "bar" : "column"],
-    ["c:lineChart", () => "line"],
-    ["c:pieChart", () => "pie"],
-    ["c:doughnutChart", () => "doughnut"],
-    ["c:areaChart", () => "area"],
-    ["c:scatterChart", () => "scatter"],
-    ["c:radarChart", () => "radar"]
-  ];
-  for (const [key, type] of candidates) {
-    const node = asArray(plotArea[key])[0];
-    if (node) return { node, type: type(node) };
+  // Map the native construct back to the kept OPF chart type id (FF-22).
+  for (const element of NATIVE_CHART_ELEMENTS) {
+    const node = asArray(plotArea[`c:${element}`])[0];
+    if (node) return { node, type: chartTypeFromNative(element, node) };
   }
   return null;
 }
@@ -1133,8 +1186,48 @@ function exportColor(entry, context, fallback) {
 // PptxGenJS color for a document color reference: a theme scheme value when the
 // reference names a scheme slot or role that the deck theme holds exactly,
 // otherwise the resolved literal RRGGBB. Alpha stays in the caller's transparency.
-function nativeColor(reference, hex, context) {
-  return schemeColorValue(reference, hex, context, {vendor: true}) ?? normalizeHex(hex);
+function nativeColor(reference, hex, context, fallback) {
+  if (fallback !== undefined && (reference === undefined || reference === null || reference === '')) return pptxColor(fallback);
+  const value = schemeColorValue(reference, hex, context, {vendor: true});
+  if (value) return value;
+  // PptxGenJS cannot write hlink or folHlink: a reserved literal stands in and
+  // is rewritten to the scheme color in the finished slide part.
+  const link = schemeColorValue(reference, hex, context);
+  return (link && context.linkSentinels?.[link]) ?? normalizeHex(hex);
+}
+
+// FF-24c: two literals no document color uses stand in for hlink and folHlink
+// (see nativeColor). When the document uses every candidate, those colors stay literal.
+const LINK_SENTINELS = [['FE01A0', 'FE01A1'], ['FE02B0', 'FE02B1'], ['FE03C0', 'FE03C1']];
+function linkSentinels(presentation) {
+  const text = JSON.stringify(presentation).toUpperCase();
+  const pair = LINK_SENTINELS.find(hexes => hexes.every(hex => !text.includes(hex)));
+  return pair ? {hlink: pair[0], folHlink: pair[1]} : {};
+}
+
+function writeLinkSentinels(xml, sentinels) {
+  const values = Object.entries(sentinels ?? {});
+  if (!values.length) return xml;
+  return xml.replace(/<a:srgbClr val="([0-9A-F]{6})"(\/>|>[\s\S]*?<\/a:srgbClr>)/g, (node, hex, rest) => {
+    const link = values.find(([, value]) => value === hex)?.[0];
+    return link ? `<a:schemeClr val="${link}"${rest.replace(/<\/a:srgbClr>$/, '</a:schemeClr>')}` : node;
+  });
+}
+
+// PptxGenJS color option: a scheme value it can emit (tx1, bg2, ...) or RRGGBB.
+function pptxColor(value) {
+  return /^(?:tx[12]|bg[12])$/.test(value) ? value : normalizeHex(value);
+}
+
+// Deck-level theme background for the slide master, so slides added in
+// PowerPoint match. The vendored layout already uses bg1, so only a theme
+// background on another slot (dark themes, light2, accents) changes the master.
+function masterBackground(context) {
+  const deck = {...context, schemeOverride: false};
+  const value = schemeBackgroundValue(deck.backgroundDefinition, deck);
+  const fill = schemeBackgroundFill(deck.backgroundDefinition, deck);
+  if (!value || value === 'bg1' || !fill || fill.includes('<a:alpha')) return null;
+  return {fill, text: defaultTextSchemeValues(deck).text ?? normalizeHex(context.colors.text)};
 }
 
 // The theme part carries the deck-level scheme (slide overrides stay literal)
@@ -1225,7 +1318,7 @@ async function addSlide(pptx, presentation, opfSlide, slideIndex, context, optio
       options.onDiagnostic?.({code: 'unresolved-asset', path: imagePath, message: 'The background image needs an embedded raster, a declared asset or a host imageResolver; the slide background color was exported instead.'});
     }
   }
-  slide.color = slideContext.colors.text;
+  slide.color = slideContext.textColor;
   if (opfSlide.hidden === true) slide.hidden = true;
 
   const { widthInches, heightInches } = slideContext.dimensions;
@@ -1247,49 +1340,51 @@ async function addSlide(pptx, presentation, opfSlide, slideIndex, context, optio
   if (geometry.slideImage) await addSlideImage(slide, presentation, geometry.slideImage, slideIndex, slideContext, options);
   await addWatermark(slide, presentation, opfSlide, slideIndex, slideContext, context, options);
   for (const item of geometry.items) {
+    // Card text sits on a literal card fill, not the slide background: keep it literal.
+    const itemContext = item.frameBox ? {...slideContext, textColor: slideContext.colors.text, mutedColor: slideContext.colors.mutedText} : slideContext;
     const region = { x: item.box.x / 96, y: item.box.y / 96, w: item.box.width / 96, h: item.box.height / 96 };
     if (item.frameBox) {
       const frame=item.frameBox;
       context.cardTags.set(`OPF card ${item.path}`,item.path);
       const paint=value=>({color:normalizeHex(value),transparency:/^#[0-9a-f]{8}$/i.test(value)?(1-parseInt(value.slice(7),16)/255)*100:0});
-      const surface=slideContext.colorScheme[isDarkHex(slideContext.colors.background)?'dark2':'light2']??`#${slideContext.colors.surface}`;
+      const surface=itemContext.colorScheme[isDarkHex(itemContext.colors.background)?'dark2':'light2']??`#${itemContext.colors.surface}`;
       slide.addShape('roundRect',{x:frame.x/96,y:frame.y/96,w:frame.width/96,h:frame.height/96,
         rectRadius:8*Math.min(widthInches,heightInches)/720,
-        fill:paint(surface),line:{...paint(slideContext.colorScheme.accent5??`#${slideContext.colors.border}`),width:.75},objectName:`OPF card ${item.path}`});
+        fill:paint(surface),line:{...paint(itemContext.colorScheme.accent5??`#${itemContext.colors.border}`),width:.75},objectName:`OPF card ${item.path}`});
     }
     if(['text','title','subtitle','tag'].includes(item.field)&&(item.text?.placement||item.text?.sourceLines)&&!item.text.richLines) {
-      addMeasuredPayloadText(slide,item.value,item.box,slideContext,options,{path:item.path,fit:item.text,textStyle:item.textStyle,sourceText:item.field==='text'&&!!item.text.sourceLines,align:alignmentFor(item),diagnosticsHandled:true,heading:['title','subtitle','tag'].includes(item.field)?item.field:undefined,color:item.field==='tag'?slideContext.colors.accent:slideContext.colors.text});
+      addMeasuredPayloadText(slide,item.value,item.box,itemContext,options,{path:item.path,fit:item.text,textStyle:item.textStyle,sourceText:item.field==='text'&&!!item.text.sourceLines,align:alignmentFor(item),diagnosticsHandled:true,heading:['title','subtitle','tag'].includes(item.field)?item.field:undefined,color:item.field==='tag'?itemContext.colors.accent:itemContext.textColor});
     } else if (["title", "subtitle", "tag"].includes(item.field)) {
       // Estimated-font headings use one native text box, which still needs a
       // role tag. Role recovery must not depend on outline measurement support.
       const objectName = `OPF heading ${item.path} line 0`;
       context.headingTags.set(objectName,{v:1,group:item.path,field:item.field,line:0,count:1});
       slide.addText(item.text.lines.join("\n"), {
-        ...textBoxOptions(region, slideContext, item.text.fontSize * 0.75),
+        ...textBoxOptions(region, itemContext, item.text.fontSize * 0.75),
         ...nativeFontOptions(item.textStyle),
-        color: item.field === "tag" ? slideContext.colors.accent : slideContext.colors.text,
+        color: item.field === "tag" ? itemContext.colors.accent : itemContext.textColor,
         align: alignmentFor(item),
         objectName,
         breakLine: false
       });
     } else if ((item.field === "items" || item.field === "bullets") && item.text?.listEntries) {
-      addMeasuredList(slide,item.text,slideContext,item.path);
+      addMeasuredList(slide,item.text,itemContext,item.path);
     } else if (item.field === "text" && item.text?.richLines) {
       const alignment=item.text.placement?.alignment??alignmentFor(item)??'left';
       for(const [index,line] of item.text.richLines.entries()){
         const runs=line.fragments.map(fragment=>{
-          const runColor=exportColor(fragment.run.color,slideContext,slideContext.colors.text);
-          const color=nativeColor(fragment.run.color,runColor,slideContext);
+          const runColor=exportColor(fragment.run.color,itemContext,itemContext.colors.text);
+          const color=nativeColor(fragment.run.color,runColor,itemContext,itemContext.textColor);
           return {text:fragment.text,options:{...nativeFontOptions(fragment.style),fontSize:fragment.fontSize*.75,color,underline:fragment.run.underline?{style:'sng',color}:undefined,strike:fragment.run.strikethrough?'sngStrike':undefined,baseline:fragment.baselineShift?-fragment.baselineShift/fragment.fontSize*2000:undefined,hyperlink:fragment.run.link&&/^(https?:|mailto:)/i.test(fragment.run.link)?{url:fragment.run.link}:undefined}};
         });
         const placed=item.text.placement?.lines[index],factor=alignment==='right'?1:alignment==='center'?.5:0;
         const area=placed?{...region,x:(placed.x+line.width*factor-item.box.width*factor)/96,y:placed.y/96,h:placed.height/96}:{...region,y:region.y+line.y/96,h:line.height/96};
-        if(runs.length)slide.addText(runs,{...textBoxOptions(area,slideContext,item.text.fontSize*.75),align:alignment,fit:'none',wrap:false,lineSpacingMultiple:1});
+        if(runs.length)slide.addText(runs,{...textBoxOptions(area,itemContext,item.text.fontSize*.75),align:alignment,fit:'none',wrap:false,lineSpacingMultiple:1});
       }
     } else if (item.field === "text" && typeof item.value === "string") {
-      slide.addText(item.text.lines.join("\n"), {...textBoxOptions(region, slideContext, item.text.fontSize * 0.75),...nativeFontOptions(item.textStyle),align:alignmentFor(item)});
+      slide.addText(item.text.lines.join("\n"), {...textBoxOptions(region, itemContext, item.text.fontSize * 0.75),...nativeFontOptions(item.textStyle),align:alignmentFor(item)});
     } else {
-      await addPayload(slide, presentation, item.payload, region, item.path, { ...slideContext, composition: item.composition, contentAlignment: alignmentFor(item) ?? "left" }, options, item.quoteLayout, item.codeLayout,item.metricLayout,item.timelineLayout);
+      await addPayload(slide, presentation, item.payload, region, item.path, { ...itemContext, composition: item.composition, contentAlignment: alignmentFor(item) ?? "left" }, options, item.quoteLayout, item.codeLayout,item.metricLayout,item.timelineLayout);
     }
   }
   // Core composes furniture above all content and opf-render paints it last, so
@@ -1321,7 +1416,17 @@ function resolveSlideContext(presentation, slide, baseContext, options, slideInd
     || Math.abs(resolved.dimensions.heightInches - baseContext.dimensions.heightInches) > 1e-6) {
     throw new OPFPptxError("mixed-slide-dimensions", "PowerPoint requires one canvas size per presentation. Set dimensions on the deck or export this slide separately.");
   }
-  return { ...baseContext, backgroundDefinition: resolved.backgroundDefinition, colorScheme: resolved.colorScheme, fonts: resolved.fonts, colors: resolved.colors, variables: resolved.variables, imageFill: effective.design.imageFill ?? "fit" };
+  const slideContext = { ...baseContext, backgroundDefinition: resolved.backgroundDefinition, colorScheme: resolved.colorScheme, fonts: resolved.fonts, colors: resolved.colors, variables: resolved.variables, imageFill: effective.design.imageFill ?? "fit" };
+  // A slide-level color scheme (directly or through a slide theme) pins every
+  // named color on that slide to literal sRGB; see schemeColorValue().
+  const slideScheme = themeSlotColors(resolved.colorScheme), deckScheme = baseContext.themeColors ?? {};
+  slideContext.schemeOverride = slide.design?.colorScheme !== undefined
+    || Object.keys({...slideScheme, ...deckScheme}).some(slot => slideScheme[slot] !== deckScheme[slot]);
+  // Default and muted text follow the theme only where the background does.
+  const text = defaultTextSchemeValues(slideContext);
+  slideContext.textColor = text.text ?? resolved.colors.text;
+  slideContext.mutedColor = text.muted ?? resolved.colors.mutedText;
+  return slideContext;
 }
 
 function fieldToType(field) {
@@ -1389,10 +1494,10 @@ function addTextPayload(slide, value, region, context) {
   slide.addText(stringifyText(value), textBoxOptions(region, context, 18));
 }
 
-function richLineRuns(line,color,context) {
+function richLineRuns(line,color,native,context) {
   const fallback=color.replace(/^#/,'');
   return line.fragments.map(fragment=>{
-    const runColor=exportColor(fragment.run.color,context,fallback),color=nativeColor(fragment.run.color,runColor,context);
+    const runColor=exportColor(fragment.run.color,context,fallback),color=nativeColor(fragment.run.color,runColor,context,native);
     return {text:fragment.text,options:{...nativeFontOptions(fragment.style),fontSize:fragment.fontSize*.75,color,underline:fragment.run.underline?{style:'sng',color}:undefined,strike:fragment.run.strikethrough?'sngStrike':undefined,baseline:fragment.baselineShift?-fragment.baselineShift/fragment.fontSize*2000:undefined,hyperlink:fragment.run.link&&/^(https?:|mailto:)/i.test(fragment.run.link)?{url:fragment.run.link}:undefined}};
   });
 }
@@ -1404,14 +1509,14 @@ function richLineRuns(line,color,context) {
 function addMeasuredList(slide,fit,context,path) {
   let lineNumber=0;
   for(const entry of fit.listEntries){
-    const addLines=(text,box,color,withBullet)=>{
+    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;
         const region={x:(box.x-inset)/96,y:(box.y+line.y)/96,w:(box.width+inset)/96,h:line.height/96};
         const objectName=`OPF list ${path} line ${lineNumber++}`;
-        if(first)context.listMarkers.set(objectName,{fontFamily:entry.marker.style.fontFamily,fontSize:entry.marker.fontSize*.75,color:normalizeHex(context.colors.text)});
+        if(first)context.listMarkers.set(objectName,{fontFamily:entry.marker.style.fontFamily,fontSize:entry.marker.fontSize*.75,color:pptxColor(context.textColor)});
         const paragraph=first?{bullet:{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,context);
+        const runs=richLineRuns(line,color,native,context);
         if(!runs.length)runs.push({text:'',options:{}});
         // Keep paragraph intent identical across runs. ZIP normalization below
         // removes the duplicate paragraph-property nodes emitted by PptxGenJS.
@@ -1419,8 +1524,8 @@ function addMeasuredList(slide,fit,context,path) {
         slide.addText(runs,{...textBoxOptions(region,context,text.fontSize*.75),fontFace:nativeFontOptions(entry.marker.style).fontFace,objectName,align:'left',fit:'none',wrap:false,lineSpacingMultiple:1,...paragraph});
       });
     };
-    addLines(entry.text,entry.textBox,context.colors.text,true);
-    if(entry.description)addLines(entry.description,entry.descriptionBox,context.colors.mutedText,false);
+    addLines(entry.text,entry.textBox,context.colors.text,context.textColor,true);
+    if(entry.description)addLines(entry.description,entry.descriptionBox,context.colors.mutedText,context.mutedColor,false);
   }
 }
 
@@ -1440,7 +1545,7 @@ function addListPayload(slide, items, region, context) {
       options: {
         bullet: { type: "bullet", indent: 14 + level * 14 },
         breakLine: index < list.length - 1 || Boolean(isPlainObject(item) && item.description),
-        color: context.colors.text,
+        color: context.textColor,
         fontFace: context.fonts.body,
         fontSize: 15,
         hanging: 4 + level * 10
@@ -1451,7 +1556,7 @@ function addListPayload(slide, items, region, context) {
         text: stringifyText(item.description),
         options: {
           breakLine: index < list.length - 1,
-          color: context.colors.mutedText,
+          color: context.mutedColor,
           fontFace: context.fonts.body,
           fontSize: 11,
           margin: [0, 0, 0, 18 + level * 14]
@@ -1546,14 +1651,14 @@ async function addSlideImage(slide, presentation, image, slideIndex, context, op
 }
 
 function addChartPayload(slide, chart, region, context, options = {}, path = "chart") {
-  const chartData = toPptxChartData(chart);
+  const chartData = toPptxChartData(chart, context.chartexMode);
   if (!chartData.series) {
     // Never lose a chart silently: the placeholder frame stands in for it, and a diagnostic names the reason.
     options.onDiagnostic?.({code: "chart-data-unplottable", path, message: chartData.message, reason: chartData.reason});
     addPlaceholderPayload(slide, "Chart", chartData.summary, region, context);
     return;
   }
-  if (chartData.adapted) options.onDiagnostic?.({code: "chart-data-adapted", path, message: chartData.message, adaptation: chartData.adapted});
+  for (const {adaptation, message} of chartData.adaptations ?? []) options.onDiagnostic?.({code: "chart-data-adapted", path, message, adaptation});
 
   // Keep the resolved palette surface (including alpha) explicit in native
   // chart/plot areas, so inherited labels are assessed against their own panel.
@@ -1563,17 +1668,28 @@ function addChartPayload(slide, chart, region, context, options = {}, path = "ch
   const fill = {color:normalizeHex(panelFill),transparency};
   const objectName = `OPF chart ${context.chartHeadings.size + 1}`;
   const circular = chartData.type === 'pie' || chartData.type === 'doughnut';
-  context.chartHeadings.set(objectName,{heading:chartData.type === 'scatter' ? undefined : chartData.heading ?? chart.data.columns[0],labelColor});
+  context.chartHeadings.set(objectName,{heading:chartData.type === 'scatter' ? undefined : chartData.heading ?? chart.data.columns[0],labelColor,spec:chartData.spec});
   context.chartFonts.set(objectName,{heading:context.fonts.heading,body:context.fonts.body});
+  const palette = CHART_COLORS.map(color=>normalizeHex(chartColorForFill(panelFill,`#${color}`)));
+  if (chartData.chartex) {
+    // The native chartex part is added when the package is normalized (attachChartexParts); the classic chart below becomes its fallback.
+    // PptxGenJS rewrites the series it is given (labels become nested levels), so the chartex part keeps its own copy.
+    const series = chartData.series.map((entry) => ({name: entry.name, labels: [...entry.labels], values: [...entry.values]}));
+    context.chartex.set(objectName, {spec: chartData.chartex, series, hasCategories: chartData.hasCategories, fill, labelColor, gridColor: context.colors.border, font: context.fonts.body, palette});
+    if (chartData.chartex.layoutId === 'regionMap') {
+      options.onDiagnostic?.({code: "chart-map-geodata", path, message: `The '${stringifyText(chart.type)}' chart is exported as a native PowerPoint map (chartex regionMap) without cached geography: PowerPoint matches the category names to regions and fetches their shapes from Bing Maps when the deck is opened online, so the map shows no regions offline or where Office map data is disabled. The clustered column fallback shows the same values in other readers.`});
+    }
+  }
+  const percent = chartData.spec.grouping === 'percentStacked';
   slide.addChart(chartData.type, chartData.series, {
     objectName,
     x: region.x,
     y: region.y,
     w: region.w,
     h: region.h,
-    showLegend: circular || chartData.series.length > 1,
+    showLegend: circular || chartData.series.length > (chartData.type === 'scatter' ? 2 : 1),
     showTitle: false,
-    chartColors: CHART_COLORS.map(color=>normalizeHex(chartColorForFill(panelFill,`#${color}`))),
+    chartColors: palette,
     chartArea: {fill:{...fill},roundedCorners:false},
     // Paint alpha once in the chart area, rather than stacking two alpha fills.
     plotArea: {fill:{color:null}},
@@ -1589,7 +1705,12 @@ function addChartPayload(slide, chart, region, context, options = {}, path = "ch
     showValue: false,
     valGridLine: { color: context.colors.border, transparency: 30, size: 1 },
     barDir: chartData.barDir,
-    barGrouping: chartData.barGrouping
+    barGrouping: chartData.barGrouping,
+    ...(percent ? { valAxisLabelFormatCode: '0%' } : {}),
+    ...(chartData.spec.markers === undefined ? {} : { lineDataSymbol: chartData.spec.markers ? 'circle' : 'none' }),
+    ...(chartData.spec.radarStyle ? { radarStyle: chartData.spec.radarStyle } : {}),
+    // ScatterWithMarkers: markers only, no connecting line.
+    ...(chartData.type === 'scatter' ? { lineSize: 0, lineDataSymbol: 'circle' } : {})
   });
 }
 
@@ -1612,8 +1733,13 @@ function addTablePayload(slide, table, region, context, options, path) {
     const cellStyle = cell.style ?? {};
     const defaultFillHex = header ? context.colors.accent : context.colors.surface;
     const baseFill = exportColor(cellStyle.fill ?? defaultFillHex, context, defaultFillHex);
+    // FF-24c: engine chrome resolves from scheme roles (header accent1, body surface), so it follows the deck theme like a named fill.
+    const fillReference = cellStyle.fill ?? (header ? 'accent1' : 'surface');
+    const fillValue = schemeColorValue(fillReference, baseFill, context);
     const inheritedText = textColorForFill(`#${baseFill}`, header ? "#FFFFFF" : `#${context.colors.text}`);
     const baseColor = exportColor(cellStyle.color ?? inheritedText.replace(/^#/, ""), context, inheritedText.replace(/^#/, ""));
+    // Default cell text follows the theme only with a theme-referenced fill: paired slot on a light or dark fill, light1/dark1 on an accent fill.
+    const defaultText = cellStyle.color === undefined ? tableTextSchemeValue(fillValue, baseColor, context) : undefined;
     const alpha = value => value.length === 8 ? (1 - parseInt(value.slice(6), 16) / 255) * 100 : 0;
     const text = stringifyText(cell.value), style = cell.textStyle;
     const fragments = rich ? fit.richLines.flatMap(line => line.fragments) : [];
@@ -1622,7 +1748,7 @@ function addTablePayload(slide, table, region, context, options, path) {
       const fragment = fragments.find(item => item.runIndex === index);
       const runStyle = fragment?.style ?? resolveTextStyle({...style,fontFamily:run.fontFamily ?? style.fontFamily,fontWeight:run.bold === undefined ? style.fontWeight : run.bold ? 700 : 400,italic:run.italic ?? style.italic}, options.textMeasurement);
       const rawColor = run.color !== undefined && run.color !== '' ? exportColor(run.color, context, baseColor) : baseColor;
-      const color = nativeColor(run.color !== undefined && run.color !== '' ? run.color : cellStyle.color, rawColor, context), transparency = rawColor.length === 8 ? (1 - parseInt(rawColor.slice(6), 16) / 255) * 100 : 0;
+      const color = nativeColor(run.color !== undefined && run.color !== '' ? run.color : cellStyle.color, rawColor, context, defaultText), transparency = rawColor.length === 8 ? (1 - parseInt(rawColor.slice(6), 16) / 255) * 100 : 0;
       const runOptions = {
         ...nativeFontOptions(runStyle),fontSize:fragment ? fragment.fontSize * .75 : fit.fontSize * .75,
         underline:run.underline ? {style:'sng',color} : undefined,strike:run.strikethrough ? 'sngStrike' : undefined,
@@ -1652,17 +1778,17 @@ function addTablePayload(slide, table, region, context, options, path) {
         valign: cellStyle.verticalAlign ?? 'top',
         ...(cell.colSpan > 1 ? {colspan:cell.colSpan} : {}),
         ...(cell.rowSpan > 1 ? {rowspan:cell.rowSpan} : {}),
-        color: nativeColor(cellStyle.color, baseColor, context),
+        color: nativeColor(cellStyle.color, baseColor, context, defaultText),
         // Rich runs carry resolved alpha. A translucent cell default would
         // overwrite an explicit opaque run because PptxGenJS inherits falsy 0.
         ...(cellStyle.color && !rich ? {transparency:alpha(baseColor)} : {}),
-        fill: { color: nativeColor(cellStyle.fill, baseFill, context), ...(cellStyle.fill ? {transparency:alpha(baseFill)} : {}) },
+        fill: { color: nativeColor(fillReference, baseFill, context), ...(cellStyle.fill ? {transparency:alpha(baseFill)} : {}) },
       },
     };
   }));
   const objectName = `OPF table ${context.tableHeaders.size + 1}`;
   context.tableHeaders.set(objectName, hasHeaders);
-  if (layout.rows.some(row => row.cells.some(cell => Object.keys(cell.style ?? {}).length))) context.tableCells.set(objectName, {layout, scale, defaultBorder:{color:"#"+context.colors.border,width:1/scale}});
+  if (layout.rows.some(row => row.cells.some(cell => Object.keys(cell.style ?? {}).length))) context.tableCells.set(objectName, {layout, scale, context, defaultBorder:{color:"accent5",width:1/scale}});
   slide.addTable(rows, {
     objectName,
     x: region.x,
@@ -1678,7 +1804,7 @@ function addTablePayload(slide, table, region, context, options, path) {
     fontFace: context.fonts.body,
     fontSize: 15 * scale * 0.75,
     color: context.colors.text,
-    border: { type: "solid", color: context.colors.border, pt: 0.75 },
+    border: { type: "solid", color: nativeColor("accent5", context.colors.border, context), pt: 0.75 },
     margin: [6 * scale, 7.5 * scale, 3 * scale, 7.5 * scale],
     valign: "top"
   });
@@ -1720,7 +1846,7 @@ function addMeasuredPayloadText(slide, text, box, context, options, config) {
     else if(config.sourceText)context.plainTextTags.set(objectName,{v:1,group:config.path,line:index,count:fit.lines.length,...boundary});
     const area=placed?{x:(placed.x+placed.width*factor-box.width*factor)/96,y:(placed.baseline-fit.fontSize)/96,w:box.width/96,h:placed.height/96}:{x:box.x/96,y:(box.y+index*fit.lineHeight)/96,w:box.width/96,h:fit.lineHeight/96};
     // A run-level link keeps the muted, non-underlined furniture look of the preview (hlinkClr=tx, u=none).
-    const lineColor = normalizeHex(config.color ?? context.colors.text);
+    const lineColor = pptxColor(config.color ?? context.textColor);
     slide.addText(link?.href && line ? [{text: line, options: {hyperlink: {url: link.href}, color: lineColor, underline: {style: 'none'}}}] : line, {
       ...textBoxOptions(area, context, fit.fontSize * .75),
       ...nativeFontOptions(style),
@@ -1768,7 +1894,7 @@ async function addFurniture(slide,presentation,source,layout,context,options,sli
           if(marker) staticDates.set(index,marker);
         }
       }
-      addMeasuredPayloadText(slide,part.text,part.box,context,options,{path:part.path,fit:part.fit,textStyle:part.style,align:part.alignment,diagnosticsHandled:true,color:context.colors.mutedText,keepEmpty:true,objectName:`OPF furniture ${slideIndex} part ${index}`,furniture:{group:String(slideIndex),part:index},liveFields,links:part.links});
+      addMeasuredPayloadText(slide,part.text,part.box,context,options,{path:part.path,fit:part.fit,textStyle:part.style,align:part.alignment,diagnosticsHandled:true,color:context.mutedColor,keepEmpty:true,objectName:`OPF furniture ${slideIndex} part ${index}`,furniture:{group:String(slideIndex),part:index},liveFields,links:part.links});
     }
   }
   const manifest = furnitureManifest(presentation, source, layout, slideIndex, staticDates);
@@ -1823,7 +1949,7 @@ function addMetricPayload(slide,value,layout,context,path) {
       slide.addText(part.text.slice(line.start,line.end),{
         ...textBoxOptions({x:(anchor-part.box.width*factor)/96,y:(origin.baseline-part.fit.fontSize)/96,w:part.box.width/96,h:part.fit.lineHeight/96},context,part.fit.fontSize*.75),
         ...nativeFontOptions(part.style),
-        color:part.role==='value'?context.colors.accent:context.colors.text,align:layout.alignment,fit:'none',wrap:false,lineSpacingMultiple:1,
+        color:part.role==='value'?context.colors.accent:context.textColor,align:layout.alignment,fit:'none',wrap:false,lineSpacingMultiple:1,
         tabStops:tabStops.length?tabStops:undefined,objectName,
       });
     }
@@ -1836,7 +1962,7 @@ function addQuotePayload(slide, layout, context, options, path) {
     if (!part.fit) throw new OPFPptxError('layout-overflow', 'Quote content has no usable internal space; increase its cell size before exporting.', {path:part.path,issues:layout.diagnostics});
     addMeasuredPayloadText(slide,part.text,part.box,context,options,{
       path:part.path,fit:part.fit,textStyle:part.style,diagnosticsHandled:true,
-      color:part.role==='footer'?context.colors.mutedText:context.colors.text,
+      color:part.role==='footer'?context.mutedColor:context.textColor,
     });
   }
 }
@@ -1972,7 +2098,7 @@ function addPlaceholderPayload(slide, label, description, region, context) {
     margin: 0,
     fontFace: context.fonts.body,
     fontSize: 11,
-    color: context.colors.mutedText,
+    color: context.mutedColor,
     fit: "shrink",
     valign: "mid",
     align: "center"
@@ -2040,7 +2166,7 @@ function textBoxOptions(region, context, fontSize) {
     lineSpacingMultiple: 1.22,
     fontFace: context.fonts.body,
     fontSize,
-    color: context.colors.text,
+    color: context.textColor,
     breakLine: false,
     fit: "shrink",
     valign: "top"
@@ -2054,7 +2180,7 @@ function textRuns(value, context, fallbackFontSize) {
       return {
         text: run,
         options: {
-          color: context.colors.text,
+          color: context.textColor,
           fontFace: context.fonts.body,
           fontSize: fallbackFontSize
         }
@@ -2065,9 +2191,9 @@ function textRuns(value, context, fallbackFontSize) {
       options: {
         bold: run?.bold,
         italic: run?.italic,
-        underline: run?.underline ? { style: "sng", color: nativeColor(run?.color, exportColor(run?.color, context, context.colors.text), context) } : undefined,
+        underline: run?.underline ? { style: "sng", color: nativeColor(run?.color, exportColor(run?.color, context, context.colors.text), context, context.textColor) } : undefined,
         strike: run?.strikethrough ? "sngStrike" : undefined,
-        color: nativeColor(run?.color, exportColor(run?.color, context, context.colors.text), context),
+        color: nativeColor(run?.color, exportColor(run?.color, context, context.colors.text), context, context.textColor),
         fontFace: run?.fontFamily ?? context.fonts.body,
         fontSize: run?.fontSize ?? fallbackFontSize,
         superscript: run?.superscript,
@@ -2085,7 +2211,7 @@ function textRuns(value, context, fallbackFontSize) {
  * into equal-width bins and exported as a column chart of the counts, every other type plots the values against
  * their row numbers. `adapted` names that transformation so it is reported, never silent.
  */
-function toPptxChartData(chart) {
+function toPptxChartData(chart, chartexMode = 'fallback') {
   const data = chart?.data;
   const unplottable = (reason, summary, message) => ({reason, summary, message: `${message} No native chart was exported; a placeholder frame stands in for it.`});
   if (!data || !Array.isArray(data.columns) || !Array.isArray(data.rows)) {
@@ -2093,7 +2219,20 @@ function toPptxChartData(chart) {
   }
   if (data.rows.length === 0) return unplottable("no-rows", "The chart has no data rows.", "The chart data has no rows.");
   if (data.columns.length === 0) return unplottable("no-columns", "The chart has no data columns.", "The chart data has no columns.");
-  const mapped = mapChartType(chart.type);
+  const resolved = resolveChartType(chart.type).spec;
+  // A chartex type (treemap, histogram, pareto, box & whisker, waterfall, funnel, map) has no classic construct. With
+  // `chartex: 'native'` it is written as its cx:chartSpace part and the clustered column chart of the same data is its
+  // mc:Fallback (src/chartex.js); by default (pending the native PowerPoint check, FF-22b) it exports as the clustered
+  // column chart alone and reports chartex-fallback, never silently.
+  const native = chartexMode === 'native';
+  const chartex = resolved.family === 'chartex' && native ? resolved : null;
+  const spec = resolved.family === 'chartex' ? CHARTEX_FALLBACK : resolved;
+  const typeName = stringifyText(chart.type);
+  const adaptations = [];
+  if (resolved.family === 'chartex' && !native) {
+    adaptations.push({adaptation: "chartex-fallback", message: `The '${typeName}' chart is a PowerPoint extension (chartex) chart that this exporter does not write; its data is exported as a native clustered column chart instead.`});
+  }
+  const mapped = {type: spec.pptx, spec, chartex, barDir: spec.barDir, barGrouping: spec.pptx === 'bar' || spec.pptx === 'area' ? spec.grouping : undefined};
   if (data.columns.length === 1) {
     const heading = stringifyText(data.columns[0]);
     const cell = (row) => Array.isArray(row) ? row[0] : row;
@@ -2104,13 +2243,15 @@ function toPptxChartData(chart) {
     }
     const skipped = data.rows.length - points.length;
     const skippedNote = skipped ? ` (${skipped} non-numeric ${skipped === 1 ? "cell was" : "cells were"} skipped)` : "";
-    if (String(chart.type ?? "").toLowerCase() === "histogram") {
+    if (!native && String(chart.type ?? "").toLowerCase() === "histogram") {
       const bins = histogramBins(points.map((point) => point.value));
       return {
-        type: "bar", barDir: "col", barGrouping: "clustered", heading: "Bin",
+        type: "bar", spec: CHARTEX_FALLBACK, barDir: "col", barGrouping: "clustered", heading: "Bin",
         series: [{name: "Frequency", labels: bins.map((bin) => bin.label), values: bins.map((bin) => bin.count)}],
-        adapted: "histogram-binned",
-        message: `The histogram's single data column '${heading}' (${points.length} values${skippedNote}) was binned into ${bins.length} equal-width bins and exported as a column chart of the counts; PowerPoint's own histogram chart is not exported, and the binned counts do not restore the raw values on re-import.`
+        adaptations: [{
+          adaptation: "histogram-binned",
+          message: `The histogram's single data column '${heading}' (${points.length} values${skippedNote}) was binned into ${bins.length} equal-width bins and exported as a column chart of the counts; PowerPoint's own histogram chart is not exported, and the binned counts do not restore the raw values on re-import.`
+        }]
       };
     }
     // Rows keep their own row numbers, so a skipped cell leaves a gap in the numbering.
@@ -2119,26 +2260,39 @@ function toPptxChartData(chart) {
     const series = mapped.type === "scatter"
       ? [{name: "Row", labels, values: points.map((point) => point.row)}, {name: heading, labels, values: numbers}]
       : [{name: heading, labels, values: numbers}];
-    return {
-      ...mapped, series, heading: "Row", adapted: "row-numbers",
-      message: `The chart's single data column '${heading}' has no category column, so its ${points.length} values${skippedNote} are plotted against their row numbers.`
-    };
+    // A native histogram or Pareto chart bins the values themselves (PowerPoint's automatic bins); only its classic fallback plots them against row numbers.
+    if (chartex?.binning) return {...mapped, series, heading: "Row", hasCategories: false, adaptations};
+    adaptations.push({adaptation: "row-numbers", message: `The chart's single data column '${heading}' has no category column, so its ${points.length} values${skippedNote} are plotted against their row numbers.`});
+    return {...mapped, series, heading: "Row", hasCategories: true, adaptations};
   }
 
   const labels = data.rows.map((row) => stringifyText(row?.[0]));
-  const series = data.columns.slice(1).map((name, seriesIndex) => ({
+  let series = data.columns.slice(1).map((name, seriesIndex) => ({
     name: stringifyText(name),
     labels,
     values: data.rows.map((row) => numericValue(row?.[seriesIndex + 1]))
   }));
-
-  return { ...mapped, series };
+  const plotted = spec.family === 'circular' ? 1 : chartex ? chartex.series : Infinity;
+  if (series.length > plotted) {
+    // A pie, doughnut or single-series chartex construct plots one series; name the ones left out instead of dropping them silently.
+    const dropped = series.slice(plotted).map((entry) => `'${entry.name}'`);
+    adaptations.push({adaptation: "series-dropped", message: `The ${typeName} chart plots one series, so its first series '${series[0].name}' is exported and the other ${dropped.length} (${dropped.join(", ")}) ${dropped.length === 1 ? "is" : "are"} not.`});
+    series = series.slice(0, plotted);
+  }
+  if (spec.family === 'xy' && series.length === 1) {
+    // [Point, X, Y...] carries its own X column; a lone value column is plotted against the row numbers.
+    series = [{name: 'X', labels, values: data.rows.map((_, index) => index + 1)}, ...series];
+    adaptations.push({adaptation: "row-numbers", message: `The scatter chart has no X column (a point label column and one value column), so its ${data.rows.length} values are plotted against their row numbers.`});
+  }
+  return {...mapped, series, hasCategories: true, adaptations};
 }
 
+
 /**
  * Equal-width bins (Sturges' count, at most 50) from the minimum to the maximum; every bin but the last is [low, high).
  * Arithmetic stays finite for any finite input (values of +-1e308 and denormals included): the bin edges are
  * computed by interpolating the edges rather than from a width, and a value is placed by comparing it with the edges.
+ * Used by the default (fallback) histogram export only; the native chartex histogram bins in PowerPoint.
  */
 function histogramBins(values) {
   const min = values.reduce((a, b) => Math.min(a, b)), max = values.reduce((a, b) => Math.max(a, b));
@@ -2154,34 +2308,12 @@ function histogramBins(values) {
   // Labels carry six significant digits, and more when that would make two bins read alike.
   for (let precision = 6; ; precision++) {
     const format = (value) => String(Number(value.toPrecision(precision)));
-    const labels = bins.map((bin) => min === max ? format(min) : `${format(bin.low)}\u2013${format(bin.high)}`);
+    const labels = bins.map((bin) => min === max ? format(min) : `${format(bin.low)}–${format(bin.high)}`);
     if (new Set(labels).size === labels.length) return bins.map((bin, index) => ({...bin, label: labels[index]}));
     if (precision === 17) return bins.map((bin, index) => ({...bin, label: `${labels[index]} (bin ${index + 1})`}));
   }
 }
 
-function mapChartType(type) {
-  const normalized = String(type ?? "").toLowerCase();
-  if (normalized.includes("pie")) return { type: "pie" };
-  if (normalized.includes("doughnut") || normalized.includes("donut")) return { type: "doughnut" };
-  if (normalized.includes("area")) return { type: "area" };
-  if (normalized.includes("line") || normalized.includes("sparkline")) return { type: "line" };
-  if (normalized.includes("scatter")) return { type: "scatter" };
-  if (normalized.includes("radar")) return { type: "radar" };
-  if (normalized.includes("bar")) {
-    return {
-      type: "bar",
-      barDir: "bar",
-      barGrouping: normalized.includes("stacked") ? "stacked" : "clustered"
-    };
-  }
-  return {
-    type: "bar",
-    barDir: "col",
-    barGrouping: normalized.includes("stacked") ? "stacked" : "clustered"
-  };
-}
-
 async function resolveImage(asset, presentation, options, path) {
   const assetObject = dereferenceAsset(asset, presentation, path);
   const src = typeof assetObject === "string" ? assetObject : assetObject?.src;
@@ -2400,14 +2532,21 @@ async function normalizePptxZip(raw, context) {
       if(!context.chartHeadings.has(name))continue;
       const id=frame.match(/<c:chart\b[^>]*\br:id="([^"]+)"/)?.[1],chartPart=relationships.get(id)?.path;
       if(!chartPart)throw new OPFPptxError('packaging-failed','Generated chart relationship is missing.');
-      const {heading,labelColor}=context.chartHeadings.get(name);
+      const {heading,labelColor,spec}=context.chartHeadings.get(name);
       if(heading!==undefined)writeChartCategoryHeading(entries,chartPart,heading);
+      entries[chartPart]=encodeText(applyChartConstruct(decodeText(entries[chartPart]),spec));
       // PptxGenJS hardcodes a black fallback in pie/doughnut label properties.
       // Normalize only our generated chart text styles; point/series fills stay intact.
       entries[chartPart]=encodeText(decodeText(entries[chartPart]).replace(/<c:txPr>[\s\S]*?<\/c:txPr>/g,properties=>properties.replace(/<a:solidFill>[\s\S]*?<\/a:solidFill>/g,()=>`<a:solidFill><a:srgbClr val="${labelColor}"/></a:solidFill>`)));
     }
   }
   applyChartFonts(entries,context.chartFonts,parseRelationships);
+  // Chartex charts: the native cx:chartSpace part, its style parts and the mc:AlternateContent frame (the classic chart above is the fallback).
+  try {
+    attachChartexParts(entries, context.chartex, parseRelationships);
+  } catch (error) {
+    throw new OPFPptxError('packaging-failed', `Chartex chart parts could not be attached: ${errorMessage(error)}`);
+  }
   applyPitchFamilies(entries,context.fontPitch);
   const imageSources = new Map();
   for (const [part, bytes] of Object.entries(entries)) {
@@ -2457,7 +2596,7 @@ async function normalizePptxZip(raw, context) {
     if (!slide) continue;
     context.partSlides.set(part, Number(slide[1]) - 1);
     for (const relationship of parseRelationships(entries, part).values()) {
-      if (/\/(?:chart|notesSlide)$/.test(relationship.type)) context.partSlides.set(relationship.path, Number(slide[1]) - 1);
+      if (/\/(?:chart|chartEx|notesSlide)$/.test(relationship.type)) context.partSlides.set(relationship.path, Number(slide[1]) - 1);
     }
   }
   const output = {};
@@ -2559,8 +2698,11 @@ function normalizePartBytes(path, bytes, context, renameMaps, entries, imageMeta
       xml = xml.replace('</Types>', `${overrides}</Types>`);
     }
     if (/^ppt\/slideMasters\/slideMaster\d+\.xml$/.test(path)) xml = themeMasterBulletFonts(xml);
+    if (context.masterBackground && path === 'ppt/slideMasters/slideMaster1.xml') xml = writeMasterBackground(xml, context.masterBackground);
+    if (context.masterBackground && /^ppt\/slideLayouts\/slideLayout\d+\.xml$/.test(path)) xml = inheritLayoutBackground(xml);
     if (path === 'ppt/theme/theme1.xml') xml = writeThemeColors(xml, {colors: context.themeColors, schemeName: context.schemeName, themeName: context.themeName});
     if (/^ppt\/slides\/slide\d+\.xml$/.test(path)) {
+      xml = writeLinkSentinels(xml, context.linkSentinels);
       const fill = context.backgroundFills.get(path);
       if (typeof fill === 'string') xml = xml.replace(/<p:bg>[\s\S]*?<\/p:bg>/, `<p:bg><p:bgPr>${fill}<a:effectLst/></p:bgPr></p:bg>`);
       else if (fill?.image) {
@@ -2631,10 +2773,10 @@ function normalizePartBytes(path, bytes, context, renameMaps, entries, imageMeta
               for (const [edge, native] of [['left','lnL'],['right','lnR'],['top','lnT'],['bottom','lnB']]) {
                 const border = style.borders?.[edge];
                 if (!border) continue;
-                const borderHex = exportColor(border.color, context, context.colors.border);
+                const slideContext = table.context, borderHex = exportColor(border.color, slideContext, slideContext.colors.border);
                 const borderOpacity = borderHex.length === 8 ? parseInt(borderHex.slice(6), 16) / 255 : 1;
-                const borderScheme = borderOpacity === 1 ? schemeColorValue(border.color, borderHex, context) : undefined;
-                const fill = border.width === 0 ? '<a:noFill/>' : borderScheme ? `<a:solidFill><a:schemeClr val="${borderScheme}"/></a:solidFill>` : nativeBackgroundFill({type:'solid',color:'#' + borderHex.slice(0, 6), opacity: borderOpacity},{width:1,height:1}, context.colors.border);
+                const borderScheme = borderOpacity === 1 ? schemeColorValue(border.color, borderHex, slideContext) : undefined;
+                const fill = border.width === 0 ? '<a:noFill/>' : borderScheme ? `<a:solidFill><a:schemeClr val="${borderScheme}"/></a:solidFill>` : nativeBackgroundFill({type:'solid',color:'#' + borderHex.slice(0, 6), opacity: borderOpacity},{width:1,height:1}, slideContext.colors.border);
                 const dash = {solid:'solid',dash:'dash',dot:'sysDot'}[border.dash ?? 'solid'];
                 const line = `<a:${native} w="${Math.round(border.width * table.scale * 9525)}" cap="flat" cmpd="sng" algn="ctr">${fill}<a:prstDash val="${dash}"/></a:${native}>`;
                 const existing = new RegExp(`<a:${native}\\b[^>]*>[\\s\\S]*?<\\/a:${native}>`);
@@ -2670,7 +2812,7 @@ function normalizePartBytes(path, bytes, context, renameMaps, entries, imageMeta
         const marker=context.listMarkers.get(shape.match(/name="(OPF list [^"]* line \d+)"/)?.[1]);
         if(!marker)return shape;
         const family=marker.fontFamily.replace(/[&<>"']/g,char=>({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&apos;'}[char]));
-        return shape.replace(/<a:buSzPct val="100000"\/>/g,`<a:buClr><a:srgbClr val="${marker.color}"/></a:buClr><a:buSzPts val="${Math.round(marker.fontSize*100)}"/><a:buFont typeface="${family}"/>`);
+        return shape.replace(/<a:buSzPct val="100000"\/>/g,`<a:buClr>${solidColorXml(marker.color)}</a:buClr><a:buSzPts val="${Math.round(marker.fontSize*100)}"/><a:buFont typeface="${family}"/>`);
       });
       // PptxGenJS gives shapes no alternative text. An unavailable image's panel
       // carries the accessible name the preview gives its group.