pptx-glimpse 0.9.0 → 0.10.1

package/dist/index.cjs

@@ -21,6 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   DEFAULT_FONT_MAPPING: () => DEFAULT_FONT_MAPPING,
+  clearFontCache: () => clearFontCache,
   collectUsedFonts: () => collectUsedFonts,
   convertPptxToPng: () => convertPptxToPng,
   convertPptxToSvg: () => convertPptxToSvg,
@@ -1544,7 +1545,23 @@ function collectFontNames(font) {
   }
   return names;
 }
+function buildCacheKey(additionalFontDirs, fontMapping) {
+  const dirsKey = additionalFontDirs ? [...additionalFontDirs].sort().join("\0") : "";
+  const mappingKey = fontMapping ? JSON.stringify(fontMapping, Object.keys(fontMapping).sort()) : "";
+  return `${dirsKey}
+${mappingKey}`;
+}
+var cachedSetup = null;
+var cachedSetupKey = null;
+function clearFontCache() {
+  cachedSetup = null;
+  cachedSetupKey = null;
+}
 async function createOpentypeSetupFromSystem(additionalFontDirs, fontMapping) {
+  const key = buildCacheKey(additionalFontDirs, fontMapping);
+  if (cachedSetup && cachedSetupKey === key) {
+    return cachedSetup;
+  }
   const opentype = await tryLoadOpentype();
   if (!opentype) return null;
   const fontFilePaths = collectFontFilePaths(additionalFontDirs);
@@ -1576,7 +1593,10 @@ async function createOpentypeSetupFromSystem(additionalFontDirs, fontMapping) {
     resolverFonts,
     firstResolverFont ?? void 0
   );
-  return { measurer, fontResolver };
+  const setup = { measurer, fontResolver };
+  cachedSetup = setup;
+  cachedSetupKey = key;
+  return setup;
 }
 
 // src/font/script-font-context.ts
@@ -2024,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 = {};
@@ -2036,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;
@@ -3901,7 +3962,7 @@ function parseTextBody(txBody, colorResolver, rels, fontScheme, lstStyleOverride
   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",
@@ -3930,7 +3991,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)
     };
   }
@@ -4004,12 +4065,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);
@@ -4166,7 +4227,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;
@@ -4175,6 +4237,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) {
@@ -4696,6 +4766,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) {
@@ -7671,8 +7786,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;
@@ -8373,13 +8488,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);
@@ -8447,8 +8562,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;
@@ -8502,6 +8617,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,
@@ -8510,7 +8626,9 @@ function renderTextBodyAsPath(textBody, transform, fontResolver) {
               para.properties,
               lineFontSize,
               fontScale,
-              fontResolver
+              fontResolver,
+              firstSeg?.properties.fontFamily,
+              firstSeg?.properties.fontFamilyEa
             )
           );
         }
@@ -8557,7 +8675,9 @@ function renderTextBodyAsPath(textBody, transform, fontResolver) {
             para.properties,
             fontSize,
             fontScale,
-            fontResolver
+            fontResolver,
+            firstRun?.properties.fontFamily,
+            firstRun?.properties.fontFamilyEa
           )
         );
       }
@@ -9004,6 +9124,7 @@ function collectFontsFromTextBody(textBody, fonts) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DEFAULT_FONT_MAPPING,
+  clearFontCache,
   collectUsedFonts,
   convertPptxToPng,
   convertPptxToSvg,

package/dist/index.d.cts

@@ -177,6 +177,12 @@ interface OpentypeSetup {
  * 同じ Font オブジェクトを measurer と fontResolver の両方に渡す。
  */
 declare function createOpentypeSetupFromBuffers(fontBuffers: FontBuffer[], fontMapping?: FontMapping): Promise<OpentypeSetup | null>;
+/**
+ * フォントオブジェクトキャッシュをクリアする。
+ * 通常は呼び出す必要はないが、フォントのインストール/アンインストール後に
+ * 強制的に再読み込みしたい場合に使用する。
+ */
+declare function clearFontCache(): void;
 
 /**
  * resvg-wasm の WASM モジュールを初期化する。
@@ -185,4 +191,4 @@ declare function createOpentypeSetupFromBuffers(fontBuffers: FontBuffer[], fontM
  */
 declare function initResvgWasm(): Promise<void>;
 
-export { type ConvertOptions, DEFAULT_FONT_MAPPING, type FontBuffer, type FontMapping, type LogLevel, type OpentypeSetup, type SlideImage, type SlideSvg, type UsedFonts, type WarningEntry, type WarningSummary, collectUsedFonts, convertPptxToPng, convertPptxToSvg, createFontMapping, createOpentypeSetupFromBuffers, createOpentypeTextMeasurerFromBuffers, getMappedFont, getWarningEntries, getWarningSummary, initResvgWasm };
+export { type ConvertOptions, DEFAULT_FONT_MAPPING, type FontBuffer, type FontMapping, type LogLevel, type OpentypeSetup, type SlideImage, type SlideSvg, type UsedFonts, type WarningEntry, type WarningSummary, clearFontCache, collectUsedFonts, convertPptxToPng, convertPptxToSvg, createFontMapping, createOpentypeSetupFromBuffers, createOpentypeTextMeasurerFromBuffers, getMappedFont, getWarningEntries, getWarningSummary, initResvgWasm };

package/dist/index.d.ts

@@ -177,6 +177,12 @@ interface OpentypeSetup {
  * 同じ Font オブジェクトを measurer と fontResolver の両方に渡す。
  */
 declare function createOpentypeSetupFromBuffers(fontBuffers: FontBuffer[], fontMapping?: FontMapping): Promise<OpentypeSetup | null>;
+/**
+ * フォントオブジェクトキャッシュをクリアする。
+ * 通常は呼び出す必要はないが、フォントのインストール/アンインストール後に
+ * 強制的に再読み込みしたい場合に使用する。
+ */
+declare function clearFontCache(): void;
 
 /**
  * resvg-wasm の WASM モジュールを初期化する。
@@ -185,4 +191,4 @@ declare function createOpentypeSetupFromBuffers(fontBuffers: FontBuffer[], fontM
  */
 declare function initResvgWasm(): Promise<void>;
 
-export { type ConvertOptions, DEFAULT_FONT_MAPPING, type FontBuffer, type FontMapping, type LogLevel, type OpentypeSetup, type SlideImage, type SlideSvg, type UsedFonts, type WarningEntry, type WarningSummary, collectUsedFonts, convertPptxToPng, convertPptxToSvg, createFontMapping, createOpentypeSetupFromBuffers, createOpentypeTextMeasurerFromBuffers, getMappedFont, getWarningEntries, getWarningSummary, initResvgWasm };
+export { type ConvertOptions, DEFAULT_FONT_MAPPING, type FontBuffer, type FontMapping, type LogLevel, type OpentypeSetup, type SlideImage, type SlideSvg, type UsedFonts, type WarningEntry, type WarningSummary, clearFontCache, collectUsedFonts, convertPptxToPng, convertPptxToSvg, createFontMapping, createOpentypeSetupFromBuffers, createOpentypeTextMeasurerFromBuffers, getMappedFont, getWarningEntries, getWarningSummary, initResvgWasm };

package/dist/index.js

@@ -1508,7 +1508,23 @@ function collectFontNames(font) {
   }
   return names;
 }
+function buildCacheKey(additionalFontDirs, fontMapping) {
+  const dirsKey = additionalFontDirs ? [...additionalFontDirs].sort().join("\0") : "";
+  const mappingKey = fontMapping ? JSON.stringify(fontMapping, Object.keys(fontMapping).sort()) : "";
+  return `${dirsKey}
+${mappingKey}`;
+}
+var cachedSetup = null;
+var cachedSetupKey = null;
+function clearFontCache() {
+  cachedSetup = null;
+  cachedSetupKey = null;
+}
 async function createOpentypeSetupFromSystem(additionalFontDirs, fontMapping) {
+  const key = buildCacheKey(additionalFontDirs, fontMapping);
+  if (cachedSetup && cachedSetupKey === key) {
+    return cachedSetup;
+  }
   const opentype = await tryLoadOpentype();
   if (!opentype) return null;
   const fontFilePaths = collectFontFilePaths(additionalFontDirs);
@@ -1540,7 +1556,10 @@ async function createOpentypeSetupFromSystem(additionalFontDirs, fontMapping) {
     resolverFonts,
     firstResolverFont ?? void 0
   );
-  return { measurer, fontResolver };
+  const setup = { measurer, fontResolver };
+  cachedSetup = setup;
+  cachedSetupKey = key;
+  return setup;
 }
 
 // src/font/script-font-context.ts
@@ -1987,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 = {};
@@ -1999,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;
@@ -3864,7 +3924,7 @@ function parseTextBody(txBody, colorResolver, rels, fontScheme, lstStyleOverride
   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",
@@ -3893,7 +3953,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)
     };
   }
@@ -3967,12 +4027,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);
@@ -4129,7 +4189,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;
@@ -4138,6 +4199,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) {
@@ -4659,6 +4728,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) {
@@ -7634,8 +7748,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;
@@ -8336,13 +8450,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);
@@ -8410,8 +8524,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;
@@ -8465,6 +8579,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,
@@ -8473,7 +8588,9 @@ function renderTextBodyAsPath(textBody, transform, fontResolver) {
               para.properties,
               lineFontSize,
               fontScale,
-              fontResolver
+              fontResolver,
+              firstSeg?.properties.fontFamily,
+              firstSeg?.properties.fontFamilyEa
             )
           );
         }
@@ -8520,7 +8637,9 @@ function renderTextBodyAsPath(textBody, transform, fontResolver) {
             para.properties,
             fontSize,
             fontScale,
-            fontResolver
+            fontResolver,
+            firstRun?.properties.fontFamily,
+            firstRun?.properties.fontFamilyEa
           )
         );
       }
@@ -8966,6 +9085,7 @@ function collectFontsFromTextBody(textBody, fonts) {
 }
 export {
   DEFAULT_FONT_MAPPING,
+  clearFontCache,
   collectUsedFonts,
   convertPptxToPng,
   convertPptxToSvg,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pptx-glimpse",
-  "version": "0.9.0",
+  "version": "0.10.1",
   "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",