pptx-glimpse 0.10.0 → 0.10.2

package/dist/index.cjs

@@ -2044,6 +2044,17 @@ function parseDefaultRunProperties(defRPr, colorResolver) {
   }
   return Object.keys(result).length > 0 ? result : void 0;
 }
+var VALID_AUTO_NUM_SCHEMES = /* @__PURE__ */ new Set([
+  "arabicPeriod",
+  "arabicParenR",
+  "romanUcPeriod",
+  "romanLcPeriod",
+  "alphaUcPeriod",
+  "alphaLcPeriod",
+  "alphaLcParenR",
+  "alphaUcParenR",
+  "arabicPlain"
+]);
 function parseParagraphLevelProperties(node, colorResolver) {
   if (!node) return void 0;
   const result = {};
@@ -2056,6 +2067,36 @@ function parseParagraphLevelProperties(node, colorResolver) {
   if (node["@_indent"] !== void 0) {
     result.indent = asEmu(Number(node["@_indent"]));
   }
+  if (node.buNone !== void 0) {
+    result.bullet = { type: "none" };
+  } else if (node.buChar) {
+    const buChar = node.buChar;
+    result.bullet = { type: "char", char: buChar["@_char"] ?? "\u2022" };
+  } else if (node.buAutoNum) {
+    const buAutoNum = node.buAutoNum;
+    const scheme = buAutoNum["@_type"] ?? "arabicPeriod";
+    result.bullet = {
+      type: "autoNum",
+      scheme: VALID_AUTO_NUM_SCHEMES.has(scheme) ? scheme : "arabicPeriod",
+      startAt: Number(buAutoNum["@_startAt"] ?? 1)
+    };
+  }
+  if (node.buFont) {
+    const buFont = node.buFont;
+    const typeface = buFont["@_typeface"] ?? null;
+    if (typeface) result.bulletFont = typeface;
+  }
+  if (colorResolver) {
+    const buClr = node.buClr;
+    if (buClr) {
+      const color = colorResolver.resolve(buClr);
+      if (color) result.bulletColor = color;
+    }
+  }
+  const buSzPct = node.buSzPct;
+  if (buSzPct) {
+    result.bulletSizePct = Number(buSzPct["@_val"]);
+  }
   const defRPr = parseDefaultRunProperties(node.defRPr, colorResolver);
   if (defRPr) {
     result.defaultRunProperties = defRPr;
@@ -3870,6 +3911,114 @@ function findMatchingPlaceholder(placeholderType, placeholderIdx, styles) {
   }
   return void 0;
 }
+function hasMultipleBulletPPr(p, orderedChildren) {
+  const rawPPr = p.pPr;
+  const pPrList = Array.isArray(rawPPr) ? rawPPr : rawPPr ? [rawPPr] : [];
+  let bulletPPrCount = 0;
+  let pPrCounter = 0;
+  for (const child of orderedChildren) {
+    const tag = Object.keys(child).find((k) => k !== ":@");
+    if (tag === "pPr") {
+      const pPrNode = pPrList[pPrCounter];
+      if (pPrNode && (pPrNode.buChar !== void 0 || pPrNode.buAutoNum !== void 0 || pPrNode.buBlip !== void 0)) {
+        bulletPPrCount++;
+        if (bulletPPrCount >= 2) return true;
+      }
+      pPrCounter++;
+    }
+  }
+  return false;
+}
+function splitInterleavedParagraph(p, orderedPChildren, colorResolver, rels, fontScheme, lstStyle) {
+  const rawPPr = p.pPr;
+  const pPrList = Array.isArray(rawPPr) ? rawPPr : rawPPr ? [rawPPr] : [];
+  const rList = p.r ?? [];
+  const fldList = p.fld ?? [];
+  const brList = p.br ?? [];
+  const groups = [];
+  let currentGroup = null;
+  let pPrCounter = 0;
+  const tagCounters = {};
+  for (const child of orderedPChildren) {
+    const tag = Object.keys(child).find((k) => k !== ":@");
+    if (!tag) continue;
+    if (tag === "pPr") {
+      const pPrNode = pPrList[pPrCounter];
+      const hasBullet = pPrNode && (pPrNode.buChar !== void 0 || pPrNode.buAutoNum !== void 0 || pPrNode.buBlip !== void 0);
+      if (hasBullet || !currentGroup) {
+        if (currentGroup) groups.push(currentGroup);
+        currentGroup = {
+          pPrIdx: pPrCounter,
+          rIndices: [],
+          fldIndices: [],
+          brIndices: [],
+          orderedChildren: [child]
+        };
+      } else {
+        currentGroup.orderedChildren.push(child);
+      }
+      pPrCounter++;
+    } else if (tag === "endParaRPr") {
+    } else {
+      const globalIdx = tagCounters[tag] ?? 0;
+      tagCounters[tag] = globalIdx + 1;
+      if (!currentGroup) {
+        currentGroup = {
+          pPrIdx: -1,
+          rIndices: [],
+          fldIndices: [],
+          brIndices: [],
+          orderedChildren: []
+        };
+      }
+      if (tag === "r") currentGroup.rIndices.push(globalIdx);
+      else if (tag === "fld") currentGroup.fldIndices.push(globalIdx);
+      else if (tag === "br") currentGroup.brIndices.push(globalIdx);
+      currentGroup.orderedChildren.push(child);
+    }
+  }
+  if (currentGroup) groups.push(currentGroup);
+  const results = [];
+  for (let g = 0; g < groups.length; g++) {
+    const group = groups[g];
+    const isLast = g === groups.length - 1;
+    const syntheticP = {};
+    if (group.pPrIdx >= 0 && pPrList[group.pPrIdx]) {
+      syntheticP.pPr = pPrList[group.pPrIdx];
+    }
+    if (group.rIndices.length > 0) {
+      syntheticP.r = group.rIndices.map((i) => rList[i]);
+    }
+    if (group.fldIndices.length > 0) {
+      syntheticP.fld = group.fldIndices.map((i) => fldList[i]);
+    }
+    if (group.brIndices.length > 0) {
+      syntheticP.br = group.brIndices.map((i) => brList[i]);
+    }
+    if (isLast && p.endParaRPr) {
+      syntheticP.endParaRPr = p.endParaRPr;
+    }
+    const paragraph = parseParagraph(
+      syntheticP,
+      colorResolver,
+      rels,
+      fontScheme,
+      lstStyle,
+      group.orderedChildren
+    );
+    if (!isLast && paragraph.runs.length > 0) {
+      const lastRun = paragraph.runs[paragraph.runs.length - 1];
+      if (lastRun.text.endsWith("\n")) {
+        paragraph.runs[paragraph.runs.length - 1] = {
+          ...lastRun,
+          text: lastRun.text.slice(0, -1)
+        };
+      }
+    }
+    results.push(paragraph);
+  }
+  return results;
+}
 function parseTextBody(txBody, colorResolver, rels, fontScheme, lstStyleOverride, orderedTxBody) {
   if (!txBody) return null;
   const bodyPr = txBody.bodyPr;
@@ -3914,14 +4063,28 @@ function parseTextBody(txBody, colorResolver, rels, fontScheme, lstStyleOverride
   const paragraphs = [];
   const pList = txBody.p ?? [];
   for (let i = 0; i < pList.length; i++) {
-    paragraphs.push(
-      parseParagraph(pList[i], colorResolver, rels, fontScheme, lstStyle, orderedParagraphs[i])
-    );
+    const orderedChildren = orderedParagraphs[i];
+    if (orderedChildren && hasMultipleBulletPPr(pList[i], orderedChildren)) {
+      paragraphs.push(
+        ...splitInterleavedParagraph(
+          pList[i],
+          orderedChildren,
+          colorResolver,
+          rels,
+          fontScheme,
+          lstStyle
+        )
+      );
+    } else {
+      paragraphs.push(
+        parseParagraph(pList[i], colorResolver, rels, fontScheme, lstStyle, orderedChildren)
+      );
+    }
   }
   if (paragraphs.length === 0) return null;
   return { paragraphs, bodyProperties };
 }
-var VALID_AUTO_NUM_SCHEMES = /* @__PURE__ */ new Set([
+var VALID_AUTO_NUM_SCHEMES2 = /* @__PURE__ */ new Set([
   "arabicPeriod",
   "arabicParenR",
   "romanUcPeriod",
@@ -3950,7 +4113,7 @@ function parseBullet(pPr, colorResolver) {
     const scheme = buAutoNum["@_type"] ?? "arabicPeriod";
     bullet = {
       type: "autoNum",
-      scheme: VALID_AUTO_NUM_SCHEMES.has(scheme) ? scheme : "arabicPeriod",
+      scheme: VALID_AUTO_NUM_SCHEMES2.has(scheme) ? scheme : "arabicPeriod",
       startAt: Number(buAutoNum["@_startAt"] ?? 1)
     };
   }
@@ -4024,12 +4187,12 @@ function parseParagraph(p, colorResolver, rels, fontScheme, lstStyle, orderedPCh
     spaceBefore: parseSpacing(pPr?.spcBef),
     spaceAfter: parseSpacing(pPr?.spcAft),
     level,
-    bullet,
-    bulletFont,
-    bulletColor,
-    bulletSizePct,
-    marginLeft: pPr?.["@_marL"] !== void 0 ? asEmu(Number(pPr["@_marL"])) : lstLevelProps?.marginLeft ?? asEmu(0),
-    indent: pPr?.["@_indent"] !== void 0 ? asEmu(Number(pPr["@_indent"])) : lstLevelProps?.indent ?? asEmu(0),
+    bullet: bullet ?? lstLevelProps?.bullet ?? null,
+    bulletFont: bulletFont ?? lstLevelProps?.bulletFont ?? null,
+    bulletColor: bulletColor ?? lstLevelProps?.bulletColor ?? null,
+    bulletSizePct: bulletSizePct ?? lstLevelProps?.bulletSizePct ?? null,
+    marginLeft: pPr?.["@_marL"] !== void 0 ? asEmu(Number(pPr["@_marL"])) : lstLevelProps?.marginLeft ?? null,
+    indent: pPr?.["@_indent"] !== void 0 ? asEmu(Number(pPr["@_indent"])) : lstLevelProps?.indent ?? null,
     tabStops
   };
   const pPrDefRPr = parseDefaultRunProperties(pPr?.defRPr);
@@ -4186,7 +4349,8 @@ function parseRunProperties(rPr, colorResolver, rels, fontScheme, defaults) {
   );
   const bold = rPr["@_b"] !== void 0 ? rPr["@_b"] === "1" || rPr["@_b"] === "true" : defaults?.bold ?? false;
   const italic = rPr["@_i"] !== void 0 ? rPr["@_i"] === "1" || rPr["@_i"] === "true" : defaults?.italic ?? false;
-  const underline = rPr["@_u"] !== void 0 ? rPr["@_u"] !== "none" : defaults?.underline ?? false;
+  const hasExplicitUnderline = rPr["@_u"] !== void 0;
+  let underline = hasExplicitUnderline ? rPr["@_u"] !== "none" : defaults?.underline ?? false;
   const strikethrough = rPr["@_strike"] !== void 0 ? rPr["@_strike"] !== "noStrike" : defaults?.strikethrough ?? false;
   const baseline = rPr["@_baseline"] ? Number(rPr["@_baseline"]) / 1e3 : 0;
   const solidFill = rPr.solidFill;
@@ -4195,6 +4359,14 @@ function parseRunProperties(rPr, colorResolver, rels, fontScheme, defaults) {
     color = null;
   }
   const hyperlink = parseHyperlink(rPr.hlinkClick, rels);
+  if (hyperlink) {
+    if (!color) {
+      color = colorResolver.resolve({ schemeClr: { "@_val": "hlink" } });
+    }
+    if (!hasExplicitUnderline && !underline) {
+      underline = true;
+    }
+  }
   const ln = rPr.ln;
   let outline = null;
   if (ln) {
@@ -4716,6 +4888,51 @@ function resolveShapeTextInheritance(shape, context) {
         paragraph.properties.alignment = "l";
       }
     }
+    if (paragraph.properties.bullet === null) {
+      for (const source of chainSources) {
+        if (!source) continue;
+        const levelProps = source.levels[level] ?? source.defaultParagraph;
+        if (!levelProps?.bullet) continue;
+        paragraph.properties.bullet = levelProps.bullet;
+        break;
+      }
+    }
+    const hasBullet = paragraph.properties.bullet !== null && paragraph.properties.bullet.type !== "none";
+    if (hasBullet && (paragraph.properties.bulletFont === null || paragraph.properties.bulletColor === null || paragraph.properties.bulletSizePct === null)) {
+      for (const source of chainSources) {
+        if (!source) continue;
+        const levelProps = source.levels[level] ?? source.defaultParagraph;
+        if (!levelProps) continue;
+        if (paragraph.properties.bulletFont === null && levelProps.bulletFont) {
+          paragraph.properties.bulletFont = levelProps.bulletFont;
+        }
+        if (paragraph.properties.bulletColor === null && levelProps.bulletColor) {
+          paragraph.properties.bulletColor = levelProps.bulletColor;
+        }
+        if (paragraph.properties.bulletSizePct === null && levelProps.bulletSizePct) {
+          paragraph.properties.bulletSizePct = levelProps.bulletSizePct;
+        }
+        if (paragraph.properties.bulletFont !== null && paragraph.properties.bulletColor !== null && paragraph.properties.bulletSizePct !== null) {
+          break;
+        }
+      }
+    }
+    if (paragraph.properties.marginLeft === null || paragraph.properties.indent === null) {
+      for (const source of chainSources) {
+        if (!source) continue;
+        const levelProps = source.levels[level] ?? source.defaultParagraph;
+        if (!levelProps) continue;
+        if (paragraph.properties.marginLeft === null && levelProps.marginLeft !== void 0) {
+          paragraph.properties.marginLeft = levelProps.marginLeft;
+        }
+        if (paragraph.properties.indent === null && levelProps.indent !== void 0) {
+          paragraph.properties.indent = levelProps.indent;
+        }
+        if (paragraph.properties.marginLeft !== null && paragraph.properties.indent !== null) {
+          break;
+        }
+      }
+    }
     for (const run of paragraph.runs) {
       const props = run.properties;
       for (const source of chainSources) {
@@ -7691,8 +7908,8 @@ function renderTextBody(textBody, transform) {
   const autoNumCounters = /* @__PURE__ */ new Map();
   let prevSpaceAfterPx = 0;
   for (const para of paragraphs) {
-    const paraMarginLeft = emuToPixels(para.properties.marginLeft);
-    const paraIndent = emuToPixels(para.properties.indent);
+    const paraMarginLeft = emuToPixels(para.properties.marginLeft ?? asEmu(0));
+    const paraIndent = emuToPixels(para.properties.indent ?? asEmu(0));
     const textStartX = marginLeftPx + paraMarginLeft;
     const bulletX = textStartX + paraIndent;
     const effectiveTextWidth = textWidth - paraMarginLeft;
@@ -8393,13 +8610,13 @@ function renderSegmentAsPath(text, props, x, y, fontScale, defaultFontSize, font
   }
   return { svg, width: totalWidth };
 }
-function renderBulletAsPath(bulletText, x, y, paraProps, textFontSizePt, fontScale, fontResolver) {
+function renderBulletAsPath(bulletText, x, y, paraProps, textFontSizePt, fontScale, fontResolver, runFontFamily, runFontFamilyEa) {
   let bulletFontSize = textFontSizePt;
   if (paraProps.bulletSizePct !== null) {
     bulletFontSize = textFontSizePt * (paraProps.bulletSizePct / 1e5);
   }
   const fontSizePx = bulletFontSize * PX_PER_PT3;
-  const font = fontResolver.resolveFont(paraProps.bulletFont, null);
+  const font = paraProps.bulletFont ? fontResolver.resolveFont(paraProps.bulletFont, null) : fontResolver.resolveFont(runFontFamily ?? null, runFontFamilyEa ?? null);
   if (!font) return [];
   const path = font.getPath(bulletText, x, y, fontSizePx);
   const pathData = path.toPathData(2);
@@ -8467,8 +8684,8 @@ function renderTextBodyAsPath(textBody, transform, fontResolver) {
   const autoNumCounters = /* @__PURE__ */ new Map();
   let prevSpaceAfterPx = 0;
   for (const para of paragraphs) {
-    const paraMarginLeft = emuToPixels(para.properties.marginLeft);
-    const paraIndent = emuToPixels(para.properties.indent);
+    const paraMarginLeft = emuToPixels(para.properties.marginLeft ?? asEmu(0));
+    const paraIndent = emuToPixels(para.properties.indent ?? asEmu(0));
     const textStartX = marginLeftPx + paraMarginLeft;
     const bulletX = textStartX + paraIndent;
     const effectiveTextWidth = textWidth - paraMarginLeft;
@@ -8522,6 +8739,7 @@ function renderTextBodyAsPath(textBody, transform, fontResolver) {
         let currentX = lineStartX;
         if (lineIdx === 0 && bulletText) {
           const lineFontSize = getLineFontSize(line.segments, defaultFontSize) * fontScale;
+          const firstSeg = line.segments[0];
           elements.push(
             ...renderBulletAsPath(
               bulletText,
@@ -8530,7 +8748,9 @@ function renderTextBodyAsPath(textBody, transform, fontResolver) {
               para.properties,
               lineFontSize,
               fontScale,
-              fontResolver
+              fontResolver,
+              firstSeg?.properties.fontFamily,
+              firstSeg?.properties.fontFamilyEa
             )
           );
         }
@@ -8577,7 +8797,9 @@ function renderTextBodyAsPath(textBody, transform, fontResolver) {
             para.properties,
             fontSize,
             fontScale,
-            fontResolver
+            fontResolver,
+            firstRun?.properties.fontFamily,
+            firstRun?.properties.fontFamilyEa
           )
         );
       }

package/dist/index.js

@@ -2006,6 +2006,17 @@ function parseDefaultRunProperties(defRPr, colorResolver) {
   }
   return Object.keys(result).length > 0 ? result : void 0;
 }
+var VALID_AUTO_NUM_SCHEMES = /* @__PURE__ */ new Set([
+  "arabicPeriod",
+  "arabicParenR",
+  "romanUcPeriod",
+  "romanLcPeriod",
+  "alphaUcPeriod",
+  "alphaLcPeriod",
+  "alphaLcParenR",
+  "alphaUcParenR",
+  "arabicPlain"
+]);
 function parseParagraphLevelProperties(node, colorResolver) {
   if (!node) return void 0;
   const result = {};
@@ -2018,6 +2029,36 @@ function parseParagraphLevelProperties(node, colorResolver) {
   if (node["@_indent"] !== void 0) {
     result.indent = asEmu(Number(node["@_indent"]));
   }
+  if (node.buNone !== void 0) {
+    result.bullet = { type: "none" };
+  } else if (node.buChar) {
+    const buChar = node.buChar;
+    result.bullet = { type: "char", char: buChar["@_char"] ?? "\u2022" };
+  } else if (node.buAutoNum) {
+    const buAutoNum = node.buAutoNum;
+    const scheme = buAutoNum["@_type"] ?? "arabicPeriod";
+    result.bullet = {
+      type: "autoNum",
+      scheme: VALID_AUTO_NUM_SCHEMES.has(scheme) ? scheme : "arabicPeriod",
+      startAt: Number(buAutoNum["@_startAt"] ?? 1)
+    };
+  }
+  if (node.buFont) {
+    const buFont = node.buFont;
+    const typeface = buFont["@_typeface"] ?? null;
+    if (typeface) result.bulletFont = typeface;
+  }
+  if (colorResolver) {
+    const buClr = node.buClr;
+    if (buClr) {
+      const color = colorResolver.resolve(buClr);
+      if (color) result.bulletColor = color;
+    }
+  }
+  const buSzPct = node.buSzPct;
+  if (buSzPct) {
+    result.bulletSizePct = Number(buSzPct["@_val"]);
+  }
   const defRPr = parseDefaultRunProperties(node.defRPr, colorResolver);
   if (defRPr) {
     result.defaultRunProperties = defRPr;
@@ -3832,6 +3873,114 @@ function findMatchingPlaceholder(placeholderType, placeholderIdx, styles) {
   }
   return void 0;
 }
+function hasMultipleBulletPPr(p, orderedChildren) {
+  const rawPPr = p.pPr;
+  const pPrList = Array.isArray(rawPPr) ? rawPPr : rawPPr ? [rawPPr] : [];
+  let bulletPPrCount = 0;
+  let pPrCounter = 0;
+  for (const child of orderedChildren) {
+    const tag = Object.keys(child).find((k) => k !== ":@");
+    if (tag === "pPr") {
+      const pPrNode = pPrList[pPrCounter];
+      if (pPrNode && (pPrNode.buChar !== void 0 || pPrNode.buAutoNum !== void 0 || pPrNode.buBlip !== void 0)) {
+        bulletPPrCount++;
+        if (bulletPPrCount >= 2) return true;
+      }
+      pPrCounter++;
+    }
+  }
+  return false;
+}
+function splitInterleavedParagraph(p, orderedPChildren, colorResolver, rels, fontScheme, lstStyle) {
+  const rawPPr = p.pPr;
+  const pPrList = Array.isArray(rawPPr) ? rawPPr : rawPPr ? [rawPPr] : [];
+  const rList = p.r ?? [];
+  const fldList = p.fld ?? [];
+  const brList = p.br ?? [];
+  const groups = [];
+  let currentGroup = null;
+  let pPrCounter = 0;
+  const tagCounters = {};
+  for (const child of orderedPChildren) {
+    const tag = Object.keys(child).find((k) => k !== ":@");
+    if (!tag) continue;
+    if (tag === "pPr") {
+      const pPrNode = pPrList[pPrCounter];
+      const hasBullet = pPrNode && (pPrNode.buChar !== void 0 || pPrNode.buAutoNum !== void 0 || pPrNode.buBlip !== void 0);
+      if (hasBullet || !currentGroup) {
+        if (currentGroup) groups.push(currentGroup);
+        currentGroup = {
+          pPrIdx: pPrCounter,
+          rIndices: [],
+          fldIndices: [],
+          brIndices: [],
+          orderedChildren: [child]
+        };
+      } else {
+        currentGroup.orderedChildren.push(child);
+      }
+      pPrCounter++;
+    } else if (tag === "endParaRPr") {
+    } else {
+      const globalIdx = tagCounters[tag] ?? 0;
+      tagCounters[tag] = globalIdx + 1;
+      if (!currentGroup) {
+        currentGroup = {
+          pPrIdx: -1,
+          rIndices: [],
+          fldIndices: [],
+          brIndices: [],
+          orderedChildren: []
+        };
+      }
+      if (tag === "r") currentGroup.rIndices.push(globalIdx);
+      else if (tag === "fld") currentGroup.fldIndices.push(globalIdx);
+      else if (tag === "br") currentGroup.brIndices.push(globalIdx);
+      currentGroup.orderedChildren.push(child);
+    }
+  }
+  if (currentGroup) groups.push(currentGroup);
+  const results = [];
+  for (let g = 0; g < groups.length; g++) {
+    const group = groups[g];
+    const isLast = g === groups.length - 1;
+    const syntheticP = {};
+    if (group.pPrIdx >= 0 && pPrList[group.pPrIdx]) {
+      syntheticP.pPr = pPrList[group.pPrIdx];
+    }
+    if (group.rIndices.length > 0) {
+      syntheticP.r = group.rIndices.map((i) => rList[i]);
+    }
+    if (group.fldIndices.length > 0) {
+      syntheticP.fld = group.fldIndices.map((i) => fldList[i]);
+    }
+    if (group.brIndices.length > 0) {
+      syntheticP.br = group.brIndices.map((i) => brList[i]);
+    }
+    if (isLast && p.endParaRPr) {
+      syntheticP.endParaRPr = p.endParaRPr;
+    }
+    const paragraph = parseParagraph(
+      syntheticP,
+      colorResolver,
+      rels,
+      fontScheme,
+      lstStyle,
+      group.orderedChildren
+    );
+    if (!isLast && paragraph.runs.length > 0) {
+      const lastRun = paragraph.runs[paragraph.runs.length - 1];
+      if (lastRun.text.endsWith("\n")) {
+        paragraph.runs[paragraph.runs.length - 1] = {
+          ...lastRun,
+          text: lastRun.text.slice(0, -1)
+        };
+      }
+    }
+    results.push(paragraph);
+  }
+  return results;
+}
 function parseTextBody(txBody, colorResolver, rels, fontScheme, lstStyleOverride, orderedTxBody) {
   if (!txBody) return null;
   const bodyPr = txBody.bodyPr;
@@ -3876,14 +4025,28 @@ function parseTextBody(txBody, colorResolver, rels, fontScheme, lstStyleOverride
   const paragraphs = [];
   const pList = txBody.p ?? [];
   for (let i = 0; i < pList.length; i++) {
-    paragraphs.push(
-      parseParagraph(pList[i], colorResolver, rels, fontScheme, lstStyle, orderedParagraphs[i])
-    );
+    const orderedChildren = orderedParagraphs[i];
+    if (orderedChildren && hasMultipleBulletPPr(pList[i], orderedChildren)) {
+      paragraphs.push(
+        ...splitInterleavedParagraph(
+          pList[i],
+          orderedChildren,
+          colorResolver,
+          rels,
+          fontScheme,
+          lstStyle
+        )
+      );
+    } else {
+      paragraphs.push(
+        parseParagraph(pList[i], colorResolver, rels, fontScheme, lstStyle, orderedChildren)
+      );
+    }
   }
   if (paragraphs.length === 0) return null;
   return { paragraphs, bodyProperties };
 }
-var VALID_AUTO_NUM_SCHEMES = /* @__PURE__ */ new Set([
+var VALID_AUTO_NUM_SCHEMES2 = /* @__PURE__ */ new Set([
   "arabicPeriod",
   "arabicParenR",
   "romanUcPeriod",
@@ -3912,7 +4075,7 @@ function parseBullet(pPr, colorResolver) {
     const scheme = buAutoNum["@_type"] ?? "arabicPeriod";
     bullet = {
       type: "autoNum",
-      scheme: VALID_AUTO_NUM_SCHEMES.has(scheme) ? scheme : "arabicPeriod",
+      scheme: VALID_AUTO_NUM_SCHEMES2.has(scheme) ? scheme : "arabicPeriod",
       startAt: Number(buAutoNum["@_startAt"] ?? 1)
     };
   }
@@ -3986,12 +4149,12 @@ function parseParagraph(p, colorResolver, rels, fontScheme, lstStyle, orderedPCh
     spaceBefore: parseSpacing(pPr?.spcBef),
     spaceAfter: parseSpacing(pPr?.spcAft),
     level,
-    bullet,
-    bulletFont,
-    bulletColor,
-    bulletSizePct,
-    marginLeft: pPr?.["@_marL"] !== void 0 ? asEmu(Number(pPr["@_marL"])) : lstLevelProps?.marginLeft ?? asEmu(0),
-    indent: pPr?.["@_indent"] !== void 0 ? asEmu(Number(pPr["@_indent"])) : lstLevelProps?.indent ?? asEmu(0),
+    bullet: bullet ?? lstLevelProps?.bullet ?? null,
+    bulletFont: bulletFont ?? lstLevelProps?.bulletFont ?? null,
+    bulletColor: bulletColor ?? lstLevelProps?.bulletColor ?? null,
+    bulletSizePct: bulletSizePct ?? lstLevelProps?.bulletSizePct ?? null,
+    marginLeft: pPr?.["@_marL"] !== void 0 ? asEmu(Number(pPr["@_marL"])) : lstLevelProps?.marginLeft ?? null,
+    indent: pPr?.["@_indent"] !== void 0 ? asEmu(Number(pPr["@_indent"])) : lstLevelProps?.indent ?? null,
     tabStops
   };
   const pPrDefRPr = parseDefaultRunProperties(pPr?.defRPr);
@@ -4148,7 +4311,8 @@ function parseRunProperties(rPr, colorResolver, rels, fontScheme, defaults) {
   );
   const bold = rPr["@_b"] !== void 0 ? rPr["@_b"] === "1" || rPr["@_b"] === "true" : defaults?.bold ?? false;
   const italic = rPr["@_i"] !== void 0 ? rPr["@_i"] === "1" || rPr["@_i"] === "true" : defaults?.italic ?? false;
-  const underline = rPr["@_u"] !== void 0 ? rPr["@_u"] !== "none" : defaults?.underline ?? false;
+  const hasExplicitUnderline = rPr["@_u"] !== void 0;
+  let underline = hasExplicitUnderline ? rPr["@_u"] !== "none" : defaults?.underline ?? false;
   const strikethrough = rPr["@_strike"] !== void 0 ? rPr["@_strike"] !== "noStrike" : defaults?.strikethrough ?? false;
   const baseline = rPr["@_baseline"] ? Number(rPr["@_baseline"]) / 1e3 : 0;
   const solidFill = rPr.solidFill;
@@ -4157,6 +4321,14 @@ function parseRunProperties(rPr, colorResolver, rels, fontScheme, defaults) {
     color = null;
   }
   const hyperlink = parseHyperlink(rPr.hlinkClick, rels);
+  if (hyperlink) {
+    if (!color) {
+      color = colorResolver.resolve({ schemeClr: { "@_val": "hlink" } });
+    }
+    if (!hasExplicitUnderline && !underline) {
+      underline = true;
+    }
+  }
   const ln = rPr.ln;
   let outline = null;
   if (ln) {
@@ -4678,6 +4850,51 @@ function resolveShapeTextInheritance(shape, context) {
         paragraph.properties.alignment = "l";
       }
     }
+    if (paragraph.properties.bullet === null) {
+      for (const source of chainSources) {
+        if (!source) continue;
+        const levelProps = source.levels[level] ?? source.defaultParagraph;
+        if (!levelProps?.bullet) continue;
+        paragraph.properties.bullet = levelProps.bullet;
+        break;
+      }
+    }
+    const hasBullet = paragraph.properties.bullet !== null && paragraph.properties.bullet.type !== "none";
+    if (hasBullet && (paragraph.properties.bulletFont === null || paragraph.properties.bulletColor === null || paragraph.properties.bulletSizePct === null)) {
+      for (const source of chainSources) {
+        if (!source) continue;
+        const levelProps = source.levels[level] ?? source.defaultParagraph;
+        if (!levelProps) continue;
+        if (paragraph.properties.bulletFont === null && levelProps.bulletFont) {
+          paragraph.properties.bulletFont = levelProps.bulletFont;
+        }
+        if (paragraph.properties.bulletColor === null && levelProps.bulletColor) {
+          paragraph.properties.bulletColor = levelProps.bulletColor;
+        }
+        if (paragraph.properties.bulletSizePct === null && levelProps.bulletSizePct) {
+          paragraph.properties.bulletSizePct = levelProps.bulletSizePct;
+        }
+        if (paragraph.properties.bulletFont !== null && paragraph.properties.bulletColor !== null && paragraph.properties.bulletSizePct !== null) {
+          break;
+        }
+      }
+    }
+    if (paragraph.properties.marginLeft === null || paragraph.properties.indent === null) {
+      for (const source of chainSources) {
+        if (!source) continue;
+        const levelProps = source.levels[level] ?? source.defaultParagraph;
+        if (!levelProps) continue;
+        if (paragraph.properties.marginLeft === null && levelProps.marginLeft !== void 0) {
+          paragraph.properties.marginLeft = levelProps.marginLeft;
+        }
+        if (paragraph.properties.indent === null && levelProps.indent !== void 0) {
+          paragraph.properties.indent = levelProps.indent;
+        }
+        if (paragraph.properties.marginLeft !== null && paragraph.properties.indent !== null) {
+          break;
+        }
+      }
+    }
     for (const run of paragraph.runs) {
       const props = run.properties;
       for (const source of chainSources) {
@@ -7653,8 +7870,8 @@ function renderTextBody(textBody, transform) {
   const autoNumCounters = /* @__PURE__ */ new Map();
   let prevSpaceAfterPx = 0;
   for (const para of paragraphs) {
-    const paraMarginLeft = emuToPixels(para.properties.marginLeft);
-    const paraIndent = emuToPixels(para.properties.indent);
+    const paraMarginLeft = emuToPixels(para.properties.marginLeft ?? asEmu(0));
+    const paraIndent = emuToPixels(para.properties.indent ?? asEmu(0));
     const textStartX = marginLeftPx + paraMarginLeft;
     const bulletX = textStartX + paraIndent;
     const effectiveTextWidth = textWidth - paraMarginLeft;
@@ -8355,13 +8572,13 @@ function renderSegmentAsPath(text, props, x, y, fontScale, defaultFontSize, font
   }
   return { svg, width: totalWidth };
 }
-function renderBulletAsPath(bulletText, x, y, paraProps, textFontSizePt, fontScale, fontResolver) {
+function renderBulletAsPath(bulletText, x, y, paraProps, textFontSizePt, fontScale, fontResolver, runFontFamily, runFontFamilyEa) {
   let bulletFontSize = textFontSizePt;
   if (paraProps.bulletSizePct !== null) {
     bulletFontSize = textFontSizePt * (paraProps.bulletSizePct / 1e5);
   }
   const fontSizePx = bulletFontSize * PX_PER_PT3;
-  const font = fontResolver.resolveFont(paraProps.bulletFont, null);
+  const font = paraProps.bulletFont ? fontResolver.resolveFont(paraProps.bulletFont, null) : fontResolver.resolveFont(runFontFamily ?? null, runFontFamilyEa ?? null);
   if (!font) return [];
   const path = font.getPath(bulletText, x, y, fontSizePx);
   const pathData = path.toPathData(2);
@@ -8429,8 +8646,8 @@ function renderTextBodyAsPath(textBody, transform, fontResolver) {
   const autoNumCounters = /* @__PURE__ */ new Map();
   let prevSpaceAfterPx = 0;
   for (const para of paragraphs) {
-    const paraMarginLeft = emuToPixels(para.properties.marginLeft);
-    const paraIndent = emuToPixels(para.properties.indent);
+    const paraMarginLeft = emuToPixels(para.properties.marginLeft ?? asEmu(0));
+    const paraIndent = emuToPixels(para.properties.indent ?? asEmu(0));
     const textStartX = marginLeftPx + paraMarginLeft;
     const bulletX = textStartX + paraIndent;
     const effectiveTextWidth = textWidth - paraMarginLeft;
@@ -8484,6 +8701,7 @@ function renderTextBodyAsPath(textBody, transform, fontResolver) {
         let currentX = lineStartX;
         if (lineIdx === 0 && bulletText) {
           const lineFontSize = getLineFontSize(line.segments, defaultFontSize) * fontScale;
+          const firstSeg = line.segments[0];
           elements.push(
             ...renderBulletAsPath(
               bulletText,
@@ -8492,7 +8710,9 @@ function renderTextBodyAsPath(textBody, transform, fontResolver) {
               para.properties,
               lineFontSize,
               fontScale,
-              fontResolver
+              fontResolver,
+              firstSeg?.properties.fontFamily,
+              firstSeg?.properties.fontFamilyEa
             )
           );
         }
@@ -8539,7 +8759,9 @@ function renderTextBodyAsPath(textBody, transform, fontResolver) {
             para.properties,
             fontSize,
             fontScale,
-            fontResolver
+            fontResolver,
+            firstRun?.properties.fontFamily,
+            firstRun?.properties.fontFamilyEa
           )
         );
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pptx-glimpse",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "A lightweight JavaScript library for rendering PowerPoint (.pptx) files as SVG or PNG in Node.js. No LibreOffice required.",
   "type": "module",
   "main": "./dist/index.cjs",