pptx-glimpse 0.8.0 → 0.9.0

package/dist/index.cjs

@@ -1043,12 +1043,109 @@ function measureTextWidth(text, fontSizePt, bold, fontFamily, fontFamilyEa) {
   return totalWidth;
 }
 
+// src/warning-logger.ts
+var PREFIX = "[pptx-glimpse]";
+var currentLevel = "off";
+var entries = [];
+var featureCounts = /* @__PURE__ */ new Map();
+function initWarningLogger(level) {
+  currentLevel = level;
+  entries = [];
+  featureCounts.clear();
+}
+function warn(feature, message, context) {
+  if (currentLevel === "off") return;
+  entries.push({ feature, message, ...context !== void 0 && { context } });
+  const existing = featureCounts.get(feature);
+  if (existing) {
+    existing.count++;
+  } else {
+    featureCounts.set(feature, { message, count: 1 });
+  }
+  if (currentLevel === "debug") {
+    const ctx = context ? ` (${context})` : "";
+    console.warn(`${PREFIX} SKIP: ${feature} - ${message}${ctx}`);
+  }
+}
+function debug(feature, message, context) {
+  if (currentLevel !== "debug") return;
+  entries.push({ feature, message, ...context !== void 0 && { context } });
+  const existing = featureCounts.get(feature);
+  if (existing) {
+    existing.count++;
+  } else {
+    featureCounts.set(feature, { message, count: 1 });
+  }
+  const ctx = context ? ` (${context})` : "";
+  console.warn(`${PREFIX} DEBUG: ${feature} - ${message}${ctx}`);
+}
+function getWarningSummary() {
+  const features = [];
+  for (const [feature, { message, count }] of featureCounts) {
+    features.push({ feature, message, count });
+  }
+  return { totalCount: entries.length, features };
+}
+function flushWarnings() {
+  const summary = getWarningSummary();
+  if (currentLevel !== "off" && summary.features.length > 0) {
+    console.warn(`${PREFIX} Summary: ${summary.features.length} unsupported feature(s) detected`);
+    for (const { feature, count } of summary.features) {
+      console.warn(`  - ${feature}: ${count} occurrence(s)`);
+    }
+  }
+  entries = [];
+  featureCounts.clear();
+  return summary;
+}
+function getWarningEntries() {
+  return entries;
+}
+
+// src/font/cjk-font-fallback.ts
+var import_node_os = require("os");
+var MACOS_FALLBACKS = {
+  // ゴシック系
+  "Noto Sans JP": ["Hiragino Sans", "Hiragino Kaku Gothic ProN"],
+  "Noto Sans CJK JP": ["Hiragino Sans", "Hiragino Kaku Gothic ProN"],
+  // 明朝系
+  "Noto Serif CJK JP": ["Hiragino Mincho ProN"]
+};
+var WINDOWS_FALLBACKS = {
+  // ゴシック系
+  "Noto Sans JP": ["Yu Gothic", "Meiryo", "MS Gothic"],
+  "Noto Sans CJK JP": ["Yu Gothic", "Meiryo", "MS Gothic"],
+  // 明朝系
+  "Noto Serif CJK JP": ["Yu Mincho", "MS Mincho"]
+};
+var EMPTY = [];
+var cachedFallbacks = null;
+function getFallbackMap() {
+  if (cachedFallbacks) return cachedFallbacks;
+  const os = (0, import_node_os.platform)();
+  switch (os) {
+    case "darwin":
+      cachedFallbacks = MACOS_FALLBACKS;
+      break;
+    case "win32":
+      cachedFallbacks = WINDOWS_FALLBACKS;
+      break;
+    default:
+      cachedFallbacks = {};
+  }
+  return cachedFallbacks;
+}
+function getCjkFallbackFonts(mappedFontName) {
+  return getFallbackMap()[mappedFontName] ?? EMPTY;
+}
+
 // src/font/opentype-text-measurer.ts
 var PX_PER_PT2 = 96 / 72;
 var BOLD_FACTOR2 = 1.05;
 var OpentypeTextMeasurer = class {
   fonts;
   defaultFont;
+  warnedFonts = /* @__PURE__ */ new Set();
   /**
    * @param fonts - フォント名 → opentype.js Font オブジェクトのマップ
    * @param defaultFont - フォールバックフォント（省略可）
@@ -1098,6 +1195,14 @@ var OpentypeTextMeasurer = class {
     if (mapped) {
       const mappedFont = this.fonts.get(mapped);
       if (mappedFont) return mappedFont;
+      for (const fallback of getCjkFallbackFonts(mapped)) {
+        const fallbackFont = this.fonts.get(fallback);
+        if (fallbackFont) return fallbackFont;
+      }
+    }
+    if (!this.warnedFonts.has(name)) {
+      this.warnedFonts.add(name);
+      warn("font.notFound", `Font not found: "${name}"`);
     }
     return null;
   }
@@ -1105,19 +1210,31 @@ var OpentypeTextMeasurer = class {
 
 // src/font/system-font-loader.ts
 var import_node_fs = require("fs");
-var import_node_os = require("os");
+var import_node_os2 = require("os");
 var import_node_path = require("path");
 var FONT_EXTENSIONS = /* @__PURE__ */ new Set([".ttf", ".otf"]);
-var CJK_TTC_PATTERNS = ["NotoSansCJK", "NotoSerifCJK"];
+var CJK_TTC_PATTERNS = [
+  "NotoSansCJK",
+  "NotoSerifCJK",
+  // macOS
+  "Hiragino",
+  "\u30D2\u30E9\u30AE\u30CE",
+  // Windows
+  "YuGoth",
+  "YuMin",
+  "meiryo",
+  "msgothic",
+  "msmincho"
+];
 var cachedPaths = null;
 var cachedAdditionalDirs = null;
 function getSystemFontDirs() {
-  const os = (0, import_node_os.platform)();
+  const os = (0, import_node_os2.platform)();
   switch (os) {
     case "linux":
       return ["/usr/share/fonts", "/usr/local/share/fonts"];
     case "darwin":
-      return ["/System/Library/Fonts", "/Library/Fonts", (0, import_node_path.join)((0, import_node_os.homedir)(), "Library/Fonts")];
+      return ["/System/Library/Fonts", "/Library/Fonts", (0, import_node_path.join)((0, import_node_os2.homedir)(), "Library/Fonts")];
     case "win32":
       return ["C:\\Windows\\Fonts"];
     default:
@@ -1125,7 +1242,7 @@ function getSystemFontDirs() {
   }
 }
 function isCjkTtc(name) {
-  const lower = name.toLowerCase();
+  const lower = name.normalize("NFC").toLowerCase();
   return lower.endsWith(".ttc") && CJK_TTC_PATTERNS.some((p) => lower.includes(p.toLowerCase()));
 }
 function walk(dir, result) {
@@ -1163,6 +1280,7 @@ function collectFontFilePaths(additionalDirs) {
 var DefaultTextPathFontResolver = class {
   fonts;
   defaultFont;
+  warnedFonts = /* @__PURE__ */ new Set();
   constructor(fonts, defaultFont) {
     this.fonts = fonts;
     this.defaultFont = defaultFont ?? null;
@@ -1180,6 +1298,12 @@ var DefaultTextPathFontResolver = class {
       const font = this.findFont(jpanFallback);
       if (font) return font;
     }
+    for (const name of [fontFamily, fontFamilyEa, jpanFallback]) {
+      if (name && !this.warnedFonts.has(name)) {
+        this.warnedFonts.add(name);
+        warn("font.notFound", `Font not found: "${name}"`);
+      }
+    }
     return this.defaultFont;
   }
   findFont(name) {
@@ -1189,6 +1313,10 @@ var DefaultTextPathFontResolver = class {
     if (mapped) {
       const mappedFont = this.fonts.get(mapped);
       if (mappedFont) return mappedFont;
+      for (const fallback of getCjkFallbackFonts(mapped)) {
+        const fallbackFont = this.fonts.get(fallback);
+        if (fallbackFont) return fallbackFont;
+      }
     }
     return null;
   }
@@ -1621,65 +1749,6 @@ async function svgToPng(svgString, options) {
   };
 }
 
-// src/warning-logger.ts
-var PREFIX = "[pptx-glimpse]";
-var currentLevel = "off";
-var entries = [];
-var featureCounts = /* @__PURE__ */ new Map();
-function initWarningLogger(level) {
-  currentLevel = level;
-  entries = [];
-  featureCounts.clear();
-}
-function warn(feature, message, context) {
-  if (currentLevel === "off") return;
-  entries.push({ feature, message, ...context !== void 0 && { context } });
-  const existing = featureCounts.get(feature);
-  if (existing) {
-    existing.count++;
-  } else {
-    featureCounts.set(feature, { message, count: 1 });
-  }
-  if (currentLevel === "debug") {
-    const ctx = context ? ` (${context})` : "";
-    console.warn(`${PREFIX} SKIP: ${feature} - ${message}${ctx}`);
-  }
-}
-function debug(feature, message, context) {
-  if (currentLevel !== "debug") return;
-  entries.push({ feature, message, ...context !== void 0 && { context } });
-  const existing = featureCounts.get(feature);
-  if (existing) {
-    existing.count++;
-  } else {
-    featureCounts.set(feature, { message, count: 1 });
-  }
-  const ctx = context ? ` (${context})` : "";
-  console.warn(`${PREFIX} DEBUG: ${feature} - ${message}${ctx}`);
-}
-function getWarningSummary() {
-  const features = [];
-  for (const [feature, { message, count }] of featureCounts) {
-    features.push({ feature, message, count });
-  }
-  return { totalCount: entries.length, features };
-}
-function flushWarnings() {
-  const summary = getWarningSummary();
-  if (currentLevel !== "off" && summary.features.length > 0) {
-    console.warn(`${PREFIX} Summary: ${summary.features.length} unsupported feature(s) detected`);
-    for (const { feature, count } of summary.features) {
-      console.warn(`  - ${feature}: ${count} occurrence(s)`);
-    }
-  }
-  entries = [];
-  featureCounts.clear();
-  return summary;
-}
-function getWarningEntries() {
-  return entries;
-}
-
 // src/color/color-transforms.ts
 function applyColorTransforms(color, node) {
   let { hex, alpha } = color;

package/dist/index.d.cts

@@ -125,6 +125,7 @@ interface OpentypeFont {
 declare class OpentypeTextMeasurer implements TextMeasurer {
     private fonts;
     private defaultFont;
+    private warnedFonts;
     /**
      * @param fonts - フォント名 → opentype.js Font オブジェクトのマップ
      * @param defaultFont - フォールバックフォント（省略可）

package/dist/index.d.ts

@@ -125,6 +125,7 @@ interface OpentypeFont {
 declare class OpentypeTextMeasurer implements TextMeasurer {
     private fonts;
     private defaultFont;
+    private warnedFonts;
     /**
      * @param fonts - フォント名 → opentype.js Font オブジェクトのマップ
      * @param defaultFont - フォールバックフォント（省略可）

package/dist/index.js

@@ -1007,12 +1007,109 @@ function measureTextWidth(text, fontSizePt, bold, fontFamily, fontFamilyEa) {
   return totalWidth;
 }
 
+// src/warning-logger.ts
+var PREFIX = "[pptx-glimpse]";
+var currentLevel = "off";
+var entries = [];
+var featureCounts = /* @__PURE__ */ new Map();
+function initWarningLogger(level) {
+  currentLevel = level;
+  entries = [];
+  featureCounts.clear();
+}
+function warn(feature, message, context) {
+  if (currentLevel === "off") return;
+  entries.push({ feature, message, ...context !== void 0 && { context } });
+  const existing = featureCounts.get(feature);
+  if (existing) {
+    existing.count++;
+  } else {
+    featureCounts.set(feature, { message, count: 1 });
+  }
+  if (currentLevel === "debug") {
+    const ctx = context ? ` (${context})` : "";
+    console.warn(`${PREFIX} SKIP: ${feature} - ${message}${ctx}`);
+  }
+}
+function debug(feature, message, context) {
+  if (currentLevel !== "debug") return;
+  entries.push({ feature, message, ...context !== void 0 && { context } });
+  const existing = featureCounts.get(feature);
+  if (existing) {
+    existing.count++;
+  } else {
+    featureCounts.set(feature, { message, count: 1 });
+  }
+  const ctx = context ? ` (${context})` : "";
+  console.warn(`${PREFIX} DEBUG: ${feature} - ${message}${ctx}`);
+}
+function getWarningSummary() {
+  const features = [];
+  for (const [feature, { message, count }] of featureCounts) {
+    features.push({ feature, message, count });
+  }
+  return { totalCount: entries.length, features };
+}
+function flushWarnings() {
+  const summary = getWarningSummary();
+  if (currentLevel !== "off" && summary.features.length > 0) {
+    console.warn(`${PREFIX} Summary: ${summary.features.length} unsupported feature(s) detected`);
+    for (const { feature, count } of summary.features) {
+      console.warn(`  - ${feature}: ${count} occurrence(s)`);
+    }
+  }
+  entries = [];
+  featureCounts.clear();
+  return summary;
+}
+function getWarningEntries() {
+  return entries;
+}
+
+// src/font/cjk-font-fallback.ts
+import { platform } from "os";
+var MACOS_FALLBACKS = {
+  // ゴシック系
+  "Noto Sans JP": ["Hiragino Sans", "Hiragino Kaku Gothic ProN"],
+  "Noto Sans CJK JP": ["Hiragino Sans", "Hiragino Kaku Gothic ProN"],
+  // 明朝系
+  "Noto Serif CJK JP": ["Hiragino Mincho ProN"]
+};
+var WINDOWS_FALLBACKS = {
+  // ゴシック系
+  "Noto Sans JP": ["Yu Gothic", "Meiryo", "MS Gothic"],
+  "Noto Sans CJK JP": ["Yu Gothic", "Meiryo", "MS Gothic"],
+  // 明朝系
+  "Noto Serif CJK JP": ["Yu Mincho", "MS Mincho"]
+};
+var EMPTY = [];
+var cachedFallbacks = null;
+function getFallbackMap() {
+  if (cachedFallbacks) return cachedFallbacks;
+  const os = platform();
+  switch (os) {
+    case "darwin":
+      cachedFallbacks = MACOS_FALLBACKS;
+      break;
+    case "win32":
+      cachedFallbacks = WINDOWS_FALLBACKS;
+      break;
+    default:
+      cachedFallbacks = {};
+  }
+  return cachedFallbacks;
+}
+function getCjkFallbackFonts(mappedFontName) {
+  return getFallbackMap()[mappedFontName] ?? EMPTY;
+}
+
 // src/font/opentype-text-measurer.ts
 var PX_PER_PT2 = 96 / 72;
 var BOLD_FACTOR2 = 1.05;
 var OpentypeTextMeasurer = class {
   fonts;
   defaultFont;
+  warnedFonts = /* @__PURE__ */ new Set();
   /**
    * @param fonts - フォント名 → opentype.js Font オブジェクトのマップ
    * @param defaultFont - フォールバックフォント（省略可）
@@ -1062,6 +1159,14 @@ var OpentypeTextMeasurer = class {
     if (mapped) {
       const mappedFont = this.fonts.get(mapped);
       if (mappedFont) return mappedFont;
+      for (const fallback of getCjkFallbackFonts(mapped)) {
+        const fallbackFont = this.fonts.get(fallback);
+        if (fallbackFont) return fallbackFont;
+      }
+    }
+    if (!this.warnedFonts.has(name)) {
+      this.warnedFonts.add(name);
+      warn("font.notFound", `Font not found: "${name}"`);
     }
     return null;
   }
@@ -1069,14 +1174,26 @@ var OpentypeTextMeasurer = class {
 
 // src/font/system-font-loader.ts
 import { existsSync, readdirSync } from "fs";
-import { homedir, platform } from "os";
+import { homedir, platform as platform2 } from "os";
 import { extname, join } from "path";
 var FONT_EXTENSIONS = /* @__PURE__ */ new Set([".ttf", ".otf"]);
-var CJK_TTC_PATTERNS = ["NotoSansCJK", "NotoSerifCJK"];
+var CJK_TTC_PATTERNS = [
+  "NotoSansCJK",
+  "NotoSerifCJK",
+  // macOS
+  "Hiragino",
+  "\u30D2\u30E9\u30AE\u30CE",
+  // Windows
+  "YuGoth",
+  "YuMin",
+  "meiryo",
+  "msgothic",
+  "msmincho"
+];
 var cachedPaths = null;
 var cachedAdditionalDirs = null;
 function getSystemFontDirs() {
-  const os = platform();
+  const os = platform2();
   switch (os) {
     case "linux":
       return ["/usr/share/fonts", "/usr/local/share/fonts"];
@@ -1089,7 +1206,7 @@ function getSystemFontDirs() {
   }
 }
 function isCjkTtc(name) {
-  const lower = name.toLowerCase();
+  const lower = name.normalize("NFC").toLowerCase();
   return lower.endsWith(".ttc") && CJK_TTC_PATTERNS.some((p) => lower.includes(p.toLowerCase()));
 }
 function walk(dir, result) {
@@ -1127,6 +1244,7 @@ function collectFontFilePaths(additionalDirs) {
 var DefaultTextPathFontResolver = class {
   fonts;
   defaultFont;
+  warnedFonts = /* @__PURE__ */ new Set();
   constructor(fonts, defaultFont) {
     this.fonts = fonts;
     this.defaultFont = defaultFont ?? null;
@@ -1144,6 +1262,12 @@ var DefaultTextPathFontResolver = class {
       const font = this.findFont(jpanFallback);
       if (font) return font;
     }
+    for (const name of [fontFamily, fontFamilyEa, jpanFallback]) {
+      if (name && !this.warnedFonts.has(name)) {
+        this.warnedFonts.add(name);
+        warn("font.notFound", `Font not found: "${name}"`);
+      }
+    }
     return this.defaultFont;
   }
   findFont(name) {
@@ -1153,6 +1277,10 @@ var DefaultTextPathFontResolver = class {
     if (mapped) {
       const mappedFont = this.fonts.get(mapped);
       if (mappedFont) return mappedFont;
+      for (const fallback of getCjkFallbackFonts(mapped)) {
+        const fallbackFont = this.fonts.get(fallback);
+        if (fallbackFont) return fallbackFont;
+      }
     }
     return null;
   }
@@ -1584,65 +1712,6 @@ async function svgToPng(svgString, options) {
   };
 }
 
-// src/warning-logger.ts
-var PREFIX = "[pptx-glimpse]";
-var currentLevel = "off";
-var entries = [];
-var featureCounts = /* @__PURE__ */ new Map();
-function initWarningLogger(level) {
-  currentLevel = level;
-  entries = [];
-  featureCounts.clear();
-}
-function warn(feature, message, context) {
-  if (currentLevel === "off") return;
-  entries.push({ feature, message, ...context !== void 0 && { context } });
-  const existing = featureCounts.get(feature);
-  if (existing) {
-    existing.count++;
-  } else {
-    featureCounts.set(feature, { message, count: 1 });
-  }
-  if (currentLevel === "debug") {
-    const ctx = context ? ` (${context})` : "";
-    console.warn(`${PREFIX} SKIP: ${feature} - ${message}${ctx}`);
-  }
-}
-function debug(feature, message, context) {
-  if (currentLevel !== "debug") return;
-  entries.push({ feature, message, ...context !== void 0 && { context } });
-  const existing = featureCounts.get(feature);
-  if (existing) {
-    existing.count++;
-  } else {
-    featureCounts.set(feature, { message, count: 1 });
-  }
-  const ctx = context ? ` (${context})` : "";
-  console.warn(`${PREFIX} DEBUG: ${feature} - ${message}${ctx}`);
-}
-function getWarningSummary() {
-  const features = [];
-  for (const [feature, { message, count }] of featureCounts) {
-    features.push({ feature, message, count });
-  }
-  return { totalCount: entries.length, features };
-}
-function flushWarnings() {
-  const summary = getWarningSummary();
-  if (currentLevel !== "off" && summary.features.length > 0) {
-    console.warn(`${PREFIX} Summary: ${summary.features.length} unsupported feature(s) detected`);
-    for (const { feature, count } of summary.features) {
-      console.warn(`  - ${feature}: ${count} occurrence(s)`);
-    }
-  }
-  entries = [];
-  featureCounts.clear();
-  return summary;
-}
-function getWarningEntries() {
-  return entries;
-}
-
 // src/color/color-transforms.ts
 function applyColorTransforms(color, node) {
   let { hex, alpha } = color;

package/package.json

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