@v1hz/md2docx 2.2.0 → 2.4.0

package/dist/index.js

@@ -103482,7 +103482,7 @@ Actual: ` + parser.attribValue);
     var options;
     var pureJsParser = true;
     var currentElement;
-    function validateOptions(userOptions) {
+    function validateOptions2(userOptions) {
       options = helper.copyOptions(userOptions);
       helper.ensureFlagExists("ignoreDeclaration", options);
       helper.ensureFlagExists("ignoreInstruction", options);
@@ -103730,7 +103730,7 @@ Actual: ` + parser.attribValue);
       var parser = pureJsParser ? sax.parser(true, {}) : parser = new expat.Parser("UTF-8");
       var result = {};
       currentElement = result;
-      options = validateOptions(userOptions);
+      options = validateOptions2(userOptions);
       if (pureJsParser) {
         parser.opt = { strictEntities: true };
         parser.onopentag = onStartElement;
@@ -103764,13 +103764,13 @@ Actual: ` + parser.attribValue);
   require_xml2json = /* @__PURE__ */ __commonJSMin((exports, module) => {
     var helper = require_options_helper();
     var xml2js = require_xml2js();
-    function validateOptions(userOptions) {
+    function validateOptions2(userOptions) {
       var options = helper.copyOptions(userOptions);
       helper.ensureSpacesExists(options);
       return options;
     }
     module.exports = function(xml, userOptions) {
-      var options = validateOptions(userOptions), js = xml2js(xml, options), json, parentKey = "compact" in options && options.compact ? "_parent" : "parent";
+      var options = validateOptions2(userOptions), js = xml2js(xml, options), json, parentKey = "compact" in options && options.compact ? "_parent" : "parent";
       if ("addParent" in options && options.addParent)
         json = JSON.stringify(js, function(k, v) {
           return k === parentKey ? "_" : v;
@@ -103784,7 +103784,7 @@ Actual: ` + parser.attribValue);
     var helper = require_options_helper();
     var isArray = require_array_helper().isArray;
     var currentElement, currentElementName;
-    function validateOptions(userOptions) {
+    function validateOptions2(userOptions) {
       var options = helper.copyOptions(userOptions);
       helper.ensureFlagExists("ignoreDeclaration", options);
       helper.ensureFlagExists("ignoreInstruction", options);
@@ -104064,7 +104064,7 @@ Actual: ` + parser.attribValue);
       return xml.join("");
     }
     module.exports = function(js, options) {
-      options = validateOptions(options);
+      options = validateOptions2(options);
       var xml = [];
       currentElement = js;
       currentElementName = "_root_";
@@ -128401,7 +128401,7 @@ import { fileURLToPath as fileURLToPath3 } from "node:url";
 // package.json
 var package_default = {
   name: "@v1hz/md2docx",
-  version: "2.2.0",
+  version: "2.4.0",
   description: "基于 pandoc 的 Markdown 转 Word 工具，自动格式化 Markdown，支持自定义样式，AI 友好，用户友好。",
   keywords: [
     "converter",
@@ -128471,8 +128471,8 @@ var package_default = {
 // src/cli.ts
 function createProgram(version, actions) {
   const program2 = new Command;
-  program2.name("md2docx").description("将 Markdown 转换为 Word 文档").version(version, "-v, --version", "显示版本号").helpOption("-h, --help", "显示帮助").helpCommand(false).showHelpAfterError("使用 --help 查看帮助").showSuggestionAfterError().enablePositionalOptions().argument("[markdown]", "Markdown 文件（仅无其他转换选项时）").option("-f, --file <path>", "Markdown 文件").option("-c, --config <path>", "自定义配置文件").option("-s, --style <path>", "自定义样式文件").option("-o, --output <path>", "输出 DOCX 文件").option("--force", "覆盖已有文件").action(async function(markdown, options) {
-    const hasAdditionalOptions = options.config !== undefined || options.style !== undefined || options.output !== undefined || options.force !== undefined;
+  program2.name("md2docx").description("将 Markdown 转换为 Word 文档").version(version, "-v, --version", "显示版本号").helpOption("-h, --help", "显示帮助").helpCommand(false).showHelpAfterError("使用 --help 查看帮助").showSuggestionAfterError().enablePositionalOptions().argument("[markdown]", "Markdown 文件（仅无其他转换选项时）").option("-f, --file <path>", "Markdown 文件").option("-c, --config <path>", "自定义配置文件").option("--style-raw <path>", "自定义底层 Word 样式").option("--style-config <path>", "自定义语义化样式配置").option("-o, --output <path>", "输出 DOCX 文件").action(async function(markdown, options) {
+    const hasAdditionalOptions = options.config !== undefined || options.styleRaw !== undefined || options.styleConfig !== undefined || options.output !== undefined;
     if (markdown !== undefined) {
       if (options.file !== undefined || hasAdditionalOptions) {
         this.error("位置参数不能与转换选项同时使用；使用选项时请通过 -f, --file 指定 Markdown 文件");
@@ -128493,11 +128493,13 @@ function createProgram(version, actions) {
     this.help({ error: true });
   });
   exportCommand.exitOverride();
-  const exportConfigCommand = exportCommand.command("config").description("导出默认配置").helpOption("-h, --help", "显示帮助").option("-o, --output <path>", "输出 JSON 文件，默认 ./config.json").option("--force", "覆盖已有文件").action(actions.exportConfig);
+  const exportConfigCommand = exportCommand.command("config").description("导出默认配置").helpOption("-h, --help", "显示帮助").option("-o, --output <path>", "输出 JSON 文件，默认 ./config.json").action(actions.exportConfig);
   exportConfigCommand.exitOverride();
-  const exportStyleCommand = exportCommand.command("style").description("导出默认样式，或从 DOCX 提取样式").helpOption("-h, --help", "显示帮助").option("-f, --file <path>", "用于提取样式的 DOCX 文件").option("-o, --output <path>", "输出 JSON 文件").option("--force", "覆盖已有文件").action(actions.exportStyle);
-  exportStyleCommand.exitOverride();
-  const formatCommand = program2.command("format").description("预处理并格式化 Markdown").helpOption("-h, --help", "显示帮助").requiredOption("-f, --file <path>", "Markdown 文件").option("-c, --config <path>", "自定义配置文件").option("-o, --output <path>", "输出 Markdown 文件").option("--force", "覆盖已有文件").action(actions.format);
+  const exportStyleRawCommand = exportCommand.command("style-raw").description("导出默认底层 Word 样式，或从 DOCX 提取底层样式").helpOption("-h, --help", "显示帮助").option("-f, --file <path>", "用于提取底层样式的 DOCX 文件").option("-o, --output <path>", "输出 JSON 文件").action(actions.exportStyleRaw);
+  exportStyleRawCommand.exitOverride();
+  const exportStyleConfigCommand = exportCommand.command("style-config").description("导出默认语义化样式配置").helpOption("-h, --help", "显示帮助").option("-o, --output <path>", "输出 JSON 文件，默认 ./style-config.json").action(actions.exportStyleConfig);
+  exportStyleConfigCommand.exitOverride();
+  const formatCommand = program2.command("format").description("预处理并格式化 Markdown").helpOption("-h, --help", "显示帮助").requiredOption("-f, --file <path>", "Markdown 文件").option("-c, --config <path>", "自定义配置文件").option("-o, --output <path>", "输出 Markdown 文件").action(actions.format);
   formatCommand.exitOverride();
   const cleanCommand = program2.command("clean").description("清除 ~/.md2docx 中的预处理文件和样式缓存").helpOption("-h, --help", "显示帮助").action(async () => {
     await actions.clean();
@@ -128595,6 +128597,10 @@ function validateConfig(value, path2) {
   if (!Number.isInteger(mermaid.density) || mermaid.density < 72) {
     invalidConfig(path2, "renderMermaid.density", "必须是不小于 72 的整数");
   }
+  const imageSize = expectRecord(root.imageSize, path2, "imageSize");
+  expectBoolean(imageSize.enabled, path2, "imageSize.enabled");
+  expectPositiveNumber(imageSize.maxWidthCm, path2, "imageSize.maxWidthCm");
+  expectPositiveNumber(imageSize.maxHeightCm, path2, "imageSize.maxHeightCm");
   validateEnabled(root.removeThematicBreaks, path2, "removeThematicBreaks");
   const title = expectRecord(root.detectTitle, path2, "detectTitle");
   expectBoolean(title.enabled, path2, "detectTitle.enabled");
@@ -128629,6 +128635,12 @@ function expectString(value, path2, field) {
     invalidConfig(path2, field, "必须是字符串");
   return value;
 }
+function expectPositiveNumber(value, path2, field) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) {
+    invalidConfig(path2, field, "必须是大于 0 的有限数字");
+  }
+  return value;
+}
 function invalidConfig(path2, field, reason) {
   throw new Error(`配置文件无效：${path2}
 位置：${field}
@@ -128652,11 +128664,7 @@ function resolveOutputPath(path2, defaultName, extensions, label) {
   assertExtension(resolved, extensions, label);
   return resolved;
 }
-function prepareOutput(path2, force) {
-  if (existsSync2(path2) && !force) {
-    throw new Error(`输出文件已存在：${path2}
-使用 --force 覆盖现有文件`);
-  }
+function prepareOutput(path2) {
   mkdirSync(dirname2(path2), { recursive: true });
 }
 function assertExtension(path2, extensions, label) {
@@ -146108,6 +146116,11 @@ var config_default = `{
     "theme": "tokyo-night-light",
     "density": 200
   },
+  "imageSize": {
+    "enabled": true,
+    "maxWidthCm": 12,
+    "maxHeightCm": 12
+  },
   "detectTitle": {
     "enabled": true,
     "strategy": "first-h1"
@@ -146118,6 +146131,102 @@ var config_default = `{
 }
 `;
 
+// config/lua/limit-image-size.lua
+var limit_image_size_default = `local max_width_cm
+local max_height_cm
+local size_cache = {}
+local warned = {}
+
+local function warn_once(source, message)
+  if warned[source] then
+    return
+  end
+  warned[source] = true
+  local text = "无法限制图片尺寸 " .. source .. "：" .. message
+  if pandoc.log and pandoc.log.warn then
+    pandoc.log.warn(text)
+  else
+    io.stderr:write("[WARNING] " .. text .. "\\n")
+  end
+end
+
+local function metadata_number(meta, key)
+  local value = meta[key]
+  if value == nil then
+    return nil
+  end
+  return tonumber(pandoc.utils.stringify(value))
+end
+
+local function read_config(meta)
+  max_width_cm = metadata_number(meta, "md2docx-image-max-width-cm")
+  max_height_cm = metadata_number(meta, "md2docx-image-max-height-cm")
+end
+
+local function image_size(source)
+  local cached = size_cache[source]
+  if cached ~= nil then
+    return cached or nil
+  end
+  if pandoc.image == nil or pandoc.image.size == nil then
+    warn_once(source, "当前 Pandoc 不支持 pandoc.image.size，请升级到 3.1.13 或更高版本")
+    size_cache[source] = false
+    return nil
+  end
+
+  local fetched, _, contents = pcall(pandoc.mediabag.fetch, source)
+  if not fetched or contents == nil then
+    warn_once(source, fetched and "未读取到图片内容" or tostring(_))
+    size_cache[source] = false
+    return nil
+  end
+
+  local measured, size = pcall(pandoc.image.size, contents, PANDOC_WRITER_OPTIONS)
+  if not measured then
+    warn_once(source, tostring(size))
+    size_cache[source] = false
+    return nil
+  end
+
+  size_cache[source] = size
+  return size
+end
+
+local function limit_image(image)
+  if max_width_cm == nil or max_height_cm == nil then
+    return nil
+  end
+  if image.attributes.width ~= nil or image.attributes.height ~= nil then
+    return nil
+  end
+
+  local size = image_size(image.src)
+  if size == nil then
+    return nil
+  end
+
+  local fallback_dpi = PANDOC_WRITER_OPTIONS.dpi or 96
+  local horizontal_dpi = size.dpi_horz > 0 and size.dpi_horz or fallback_dpi
+  local vertical_dpi = size.dpi_vert > 0 and size.dpi_vert or fallback_dpi
+  local width_cm = size.width / horizontal_dpi * 2.54
+  local height_cm = size.height / vertical_dpi * 2.54
+  local scale = math.min(1, max_width_cm / width_cm, max_height_cm / height_cm)
+
+  if scale >= 1 then
+    return nil
+  end
+
+  image.attributes.width = string.format("%.4fcm", width_cm * scale)
+  image.attributes.height = string.format("%.4fcm", height_cm * scale)
+  return image
+end
+
+return {
+  { Meta = read_config },
+  { Image = limit_image },
+}
+`;
+
 // config/lua/add-inline-code.lua
 var add_inline_code_default = `-- Author: Achuan-2
 function Code(el)
@@ -146126,8 +146235,8 @@ function Code(el)
 end
 return { Code = Code }`;
 
-// config/style.json
-var style_default = `{
+// config/style-raw.json
+var style_raw_default = `{
   "default": {
     "document": {
       "run": {
@@ -146688,7 +146797,7 @@ var style_default = `{
           "eastAsia": "zh-CN"
         },
         "shading": {
-          "val": "pct5",
+          "type": "pct5",
           "color": "auto",
           "fill": "auto"
         }
@@ -146700,40 +146809,40 @@ var style_default = `{
         },
         "wordWrap": false,
         "shading": {
-          "val": "clear",
+          "type": "clear",
           "color": "F3F4F4",
           "fill": "FFFFFF",
           "themeFill": "background1"
         },
         "border": {
           "top": {
-            "val": "single",
+            "style": "single",
             "color": "BFBFBF",
-            "sz": 8,
+            "size": 8,
             "space": 10,
             "themeColor": "background1",
             "themeShade": "BF"
           },
           "left": {
-            "val": "single",
+            "style": "single",
             "color": "BFBFBF",
-            "sz": 8,
+            "size": 8,
             "space": 10,
             "themeColor": "background1",
             "themeShade": "BF"
           },
           "bottom": {
-            "val": "single",
+            "style": "single",
             "color": "BFBFBF",
-            "sz": 8,
+            "size": 8,
             "space": 10,
             "themeColor": "background1",
             "themeShade": "BF"
           },
           "right": {
-            "val": "single",
+            "style": "single",
             "color": "BFBFBF",
-            "sz": 8,
+            "size": 8,
             "space": 10,
             "themeColor": "background1",
             "themeShade": "BF"
@@ -146879,7 +146988,7 @@ var style_default = `{
           "eastAsia": "zh-CN"
         },
         "shading": {
-          "val": "clear",
+          "type": "clear",
           "color": "F3F4F4",
           "fill": "FFFFFF",
           "themeFill": "background1"
@@ -146973,16 +147082,16 @@ var style_default = `{
           "eastAsia": "zh-CN"
         },
         "shading": {
-          "val": "clear",
+          "type": "clear",
           "color": "F3F4F4",
           "fill": "F2F2F2",
           "themeFill": "background1",
           "themeFillShade": "F2"
         },
         "border": {
-          "val": "none",
+          "style": "none",
           "color": "auto",
-          "sz": 0,
+          "size": 0,
           "space": 0
         }
       }
@@ -147084,9 +147193,33 @@ var style_default = `{
 }
 `;
 
+// config/style-config.json
+var style_config_default = `{
+  "$schema": "https://raw.githubusercontent.com/WXY-V1hZ/md2docx/main/config/style-config.schema.json",
+  "schemaVersion": 1,
+  "options": {
+    "body": {
+      "firstLineIndent": true
+    },
+    "headings": {
+      "1": {
+        "startOnNewPage": false
+      }
+    },
+    "inlineCode": {
+      "background": true
+    },
+    "codeBlock": {
+      "border": true
+    }
+  }
+}
+`;
+
 // src/resources.ts
 var DEFAULT_CONFIG_TEXT = config_default;
-var DEFAULT_STYLE_TEXT = style_default;
+var DEFAULT_STYLE_CONFIG_TEXT = style_config_default;
+var DEFAULT_STYLE_RAW_TEXT = style_raw_default;
 function materializeResource(name2, content3) {
   const directory = join4(TMP_DIR, "resources");
   const path3 = join4(directory, name2);
@@ -147099,21 +147232,238 @@ function materializeResource(name2, content3) {
 function materializeDefaultConfig() {
   return materializeResource("config.json", DEFAULT_CONFIG_TEXT);
 }
-function materializeDefaultStyle() {
-  return materializeResource("style.json", DEFAULT_STYLE_TEXT);
+function materializeDefaultStyleRaw() {
+  return materializeResource("style-raw.json", DEFAULT_STYLE_RAW_TEXT);
+}
+function materializeDefaultStyleConfig() {
+  return materializeResource("style-config.json", DEFAULT_STYLE_CONFIG_TEXT);
 }
-function materializeLuaFilter() {
+function materializeInlineCodeFilter() {
   return materializeResource("add-inline-code.lua", add_inline_code_default);
 }
+function materializeImageSizeFilter() {
+  return materializeResource("limit-image-size.lua", limit_image_size_default);
+}
+
+// src/style/compiler.ts
+import { readFileSync as readFileSync2 } from "node:fs";
+
+// src/style/config.ts
+function validateStyleConfig(value2, path3) {
+  const root2 = expectRecord2(value2, path3, "样式配置");
+  rejectUnknown(root2, ["$schema", "schemaVersion", "options"], path3, "样式配置");
+  if (root2.$schema !== undefined)
+    expectString2(root2.$schema, path3, "$schema");
+  if (root2.schemaVersion !== 1)
+    invalidStyleConfig(path3, "schemaVersion", "目前只支持版本 1");
+  if (root2.options !== undefined)
+    validateOptions(root2.options, path3);
+  return root2;
+}
+function validateOptions(value2, path3) {
+  const options = expectRecord2(value2, path3, "options");
+  rejectUnknown(options, ["body", "headings", "inlineCode", "codeBlock"], path3, "options");
+  if (options.body !== undefined) {
+    const body = expectRecord2(options.body, path3, "options.body");
+    rejectUnknown(body, ["firstLineIndent"], path3, "options.body");
+    if (body.firstLineIndent !== undefined) {
+      expectBoolean2(body.firstLineIndent, path3, "options.body.firstLineIndent");
+    }
+  }
+  if (options.headings !== undefined) {
+    const headings = expectRecord2(options.headings, path3, "options.headings");
+    rejectUnknown(headings, ["1"], path3, "options.headings");
+    if (headings["1"] !== undefined) {
+      const heading1 = expectRecord2(headings["1"], path3, 'options.headings["1"]');
+      rejectUnknown(heading1, ["startOnNewPage"], path3, 'options.headings["1"]');
+      if (heading1.startOnNewPage !== undefined) {
+        expectBoolean2(heading1.startOnNewPage, path3, 'options.headings["1"].startOnNewPage');
+      }
+    }
+  }
+  if (options.inlineCode !== undefined) {
+    const inlineCode2 = expectRecord2(options.inlineCode, path3, "options.inlineCode");
+    rejectUnknown(inlineCode2, ["background"], path3, "options.inlineCode");
+    if (inlineCode2.background !== undefined) {
+      expectBoolean2(inlineCode2.background, path3, "options.inlineCode.background");
+    }
+  }
+  if (options.codeBlock !== undefined) {
+    const codeBlock = expectRecord2(options.codeBlock, path3, "options.codeBlock");
+    rejectUnknown(codeBlock, ["border"], path3, "options.codeBlock");
+    if (codeBlock.border !== undefined) {
+      expectBoolean2(codeBlock.border, path3, "options.codeBlock.border");
+    }
+  }
+}
+function rejectUnknown(value2, allowed, path3, field) {
+  const unknown2 = Object.keys(value2).find((key) => !allowed.includes(key));
+  if (unknown2 !== undefined)
+    invalidStyleConfig(path3, `${field}.${unknown2}`, "不是支持的配置项");
+}
+function expectRecord2(value2, path3, field) {
+  if (!isRecord(value2))
+    invalidStyleConfig(path3, field, "必须是对象");
+  return value2;
+}
+function isRecord(value2) {
+  return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
+}
+function expectBoolean2(value2, path3, field) {
+  if (typeof value2 !== "boolean")
+    invalidStyleConfig(path3, field, "必须是 boolean");
+}
+function expectString2(value2, path3, field) {
+  if (typeof value2 !== "string")
+    invalidStyleConfig(path3, field, "必须是字符串");
+}
+function invalidStyleConfig(path3, field, reason) {
+  throw new Error(`样式配置无效：${path3}
+位置：${field}
+原因：${reason}`);
+}
+
+// src/style/compiler.ts
+function resolveEffectiveStyles(sources, defaults) {
+  const rawPath = sources.styleRawPath ?? defaults?.styleRawPath ?? materializeDefaultStyleRaw();
+  const rawStyle = loadStyleRaw(rawPath);
+  if (sources.styleConfigPath) {
+    return compileStyleConfig(rawStyle, loadStyleConfig(sources.styleConfigPath));
+  }
+  if (sources.styleRawPath)
+    return rawStyle;
+  const defaultConfigPath = defaults?.styleConfigPath ?? materializeDefaultStyleConfig();
+  return compileStyleConfig(rawStyle, loadStyleConfig(defaultConfigPath));
+}
+function loadStyleRaw(path3) {
+  const source = parseJson(readFileSync2(path3, "utf-8"), path3, "底层样式文件");
+  if (!isRecord2(source))
+    throw new Error(`底层样式文件必须是 JSON 对象：${path3}`);
+  if (looksLikeStyleConfig(source)) {
+    throw new Error(`底层样式文件无效：${path3}
+当前文件看起来是语义化样式配置，请改用 --style-config`);
+  }
+  if (!looksLikeRawStyle(source)) {
+    throw new Error(`底层样式文件无效：${path3}
+缺少 Word 样式定义`);
+  }
+  return source;
+}
+function loadStyleConfig(path3) {
+  const source = parseJson(readFileSync2(path3, "utf-8"), path3, "语义化样式配置");
+  if (isRecord2(source) && looksLikeRawStyle(source)) {
+    throw new Error(`语义化样式配置无效：${path3}
+当前文件看起来是底层样式，请改用 --style-raw`);
+  }
+  return validateStyleConfig(source, path3);
+}
+function compileStyleConfig(rawStyle, config) {
+  const styles = structuredClone(rawStyle);
+  const options = config.options;
+  if (!options)
+    return styles;
+  const firstLineIndent = options.body?.firstLineIndent;
+  if (firstLineIndent !== undefined)
+    applyBodyFirstLineIndent(styles, firstLineIndent);
+  const startOnNewPage = options.headings?.["1"]?.startOnNewPage;
+  if (startOnNewPage !== undefined)
+    applyHeading1PageBreak(styles, startOnNewPage);
+  const inlineCodeBackground = options.inlineCode?.background;
+  if (inlineCodeBackground !== undefined) {
+    applyInlineCodeBackground(styles, inlineCodeBackground);
+  }
+  const codeBlockBorder = options.codeBlock?.border;
+  if (codeBlockBorder !== undefined)
+    applyCodeBlockBorder(styles, codeBlockBorder);
+  return styles;
+}
+function applyBodyFirstLineIndent(styles, enabled) {
+  const firstParagraph = findStyle(styles, "paragraphStyles", "First Paragraph");
+  const bodyText = findStyle(styles, "paragraphStyles", "Body Text");
+  for (const style of [firstParagraph, bodyText]) {
+    const paragraph2 = ensureObject(style, "paragraph");
+    paragraph2.indent = {
+      ...optionalObject(paragraph2.indent),
+      firstLine: enabled ? 200 : 0,
+      firstLineChars: enabled ? 200 : 0
+    };
+  }
+}
+function applyHeading1PageBreak(styles, enabled) {
+  const heading1 = findStyle(styles, "paragraphStyles", "heading 1");
+  ensureObject(heading1, "paragraph").pageBreakBefore = enabled;
+}
+function applyInlineCodeBackground(styles, enabled) {
+  const inlineCode2 = findStyle(styles, "characterStyles", "Inline Code");
+  ensureObject(inlineCode2, "run").shading = {
+    type: "clear",
+    color: enabled ? "F3F4F4" : "auto",
+    fill: enabled ? "F2F2F2" : "auto"
+  };
+}
+function applyCodeBlockBorder(styles, enabled) {
+  const sourceCode = findStyle(styles, "paragraphStyles", "Source Code");
+  const border = () => ({
+    style: enabled ? "single" : "none",
+    color: enabled ? "BFBFBF" : "auto",
+    size: enabled ? 8 : 0,
+    space: enabled ? 10 : 0
+  });
+  ensureObject(sourceCode, "paragraph").border = {
+    top: border(),
+    left: border(),
+    bottom: border(),
+    right: border()
+  };
+}
+function findStyle(styles, collectionName, name2) {
+  const collection = styles[collectionName];
+  if (!Array.isArray(collection)) {
+    throw new Error(`底层样式缺少 ${collectionName}，无法应用语义化样式配置`);
+  }
+  const normalizedName = name2.toLowerCase();
+  const style = collection.find((entry) => isRecord2(entry) && typeof entry.name === "string" && entry.name.toLowerCase() === normalizedName);
+  if (!style)
+    throw new Error(`底层样式缺少“${name2}”，无法应用语义化样式配置`);
+  return style;
+}
+function ensureObject(parent, key) {
+  const current = parent[key];
+  if (isRecord2(current))
+    return current;
+  const created = {};
+  parent[key] = created;
+  return created;
+}
+function optionalObject(value2) {
+  return isRecord2(value2) ? value2 : {};
+}
+function parseJson(text5, path3, kind) {
+  try {
+    return JSON.parse(text5);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`${kind}不是有效的 JSON：${path3}
+${message}`);
+  }
+}
+function looksLikeStyleConfig(value2) {
+  return "schemaVersion" in value2 || "options" in value2 || "preset" in value2;
+}
+function looksLikeRawStyle(value2) {
+  return ["default", "paragraphStyles", "characterStyles", "tableStyles", "tableStylesXml"].some((key) => (key in value2));
+}
+function isRecord2(value2) {
+  return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
+}
 
 // src/style/generate.ts
-import { existsSync as existsSync5, mkdirSync as mkdirSync4, readFileSync as readFileSync2 } from "node:fs";
+import { existsSync as existsSync5, mkdirSync as mkdirSync4 } from "node:fs";
 import { writeFile } from "node:fs/promises";
 import { createHash as createHash2 } from "node:crypto";
 import { dirname as dirname4 } from "path";
-async function generateTemplateDocx(styleJsonPath, outputPath) {
+async function generateTemplateDocxFromStyles(raw, outputPath) {
   const { Document: Document2, Packer: Packer3 } = await Promise.resolve().then(() => (init_dist(), exports_dist));
-  const raw = JSON.parse(readFileSync2(styleJsonPath, "utf-8"));
   const tableStylesXml = raw.tableStylesXml;
   const { tableStylesXml: _, ...styles } = raw;
   const doc = new Document2({
@@ -147138,14 +147488,16 @@ async function generateTemplateDocx(styleJsonPath, outputPath) {
   await writeFile(outputPath, buf);
 }
 var generatePromises = new Map;
-async function ensureTemplateDocx(styleJsonPath) {
-  const raw = readFileSync2(styleJsonPath);
-  const hash = createHash2("sha256").update(raw).digest("hex").slice(0, 16);
+function styleCacheHash(rawStyle) {
+  return createHash2("sha256").update(JSON.stringify(rawStyle)).digest("hex").slice(0, 16);
+}
+async function ensureTemplateDocx(rawStyle) {
+  const hash = styleCacheHash(rawStyle);
   const outputPath = styleTemplateDocx(hash);
   if (!existsSync5(outputPath)) {
     let promise = generatePromises.get(outputPath);
     if (!promise) {
-      promise = generateTemplateDocx(styleJsonPath, outputPath).catch((error) => {
+      promise = generateTemplateDocxFromStyles(rawStyle, outputPath).catch((error) => {
         generatePromises.delete(outputPath);
         throw error;
       });
@@ -147162,25 +147514,29 @@ async function convertMarkdown(options) {
     throw new Error("缺少必填参数：--file");
   const input = resolveInputPath(options.file, [".md", ".markdown"], "Markdown 文件");
   const configPath = options.config ? resolveInputPath(options.config, [".json"], "配置文件") : materializeDefaultConfig();
-  const stylePath = options.style ? resolveInputPath(options.style, [".json"], "样式文件") : materializeDefaultStyle();
+  const styleRawPath = options.styleRaw ? resolveInputPath(options.styleRaw, [".json"], "底层样式文件") : undefined;
+  const styleConfigPath = options.styleConfig ? resolveInputPath(options.styleConfig, [".json"], "语义化样式配置") : undefined;
   const baseName = parse4(input).name;
   const output = resolveOutputPath(options.output, `${baseName}.docx`, [".docx"], "DOCX 输出文件");
-  prepareOutput(output, options.force ?? false);
+  prepareOutput(output);
   const config = await loadConfig(configPath);
   const outDir = preprocessDir(input);
   mkdirSync5(outDir, { recursive: true });
   const formatted = await preprocess2(input, config, outDir);
   const markdownOutput = formattedMdPath(input);
   writeFileSync3(markdownOutput, formatted, "utf-8");
-  const templatePath = await ensureTemplateDocx(stylePath);
-  const luaFilter = materializeLuaFilter();
+  const effectiveStyles = resolveEffectiveStyles({ styleRawPath, styleConfigPath });
+  const templatePath = await ensureTemplateDocx(effectiveStyles);
+  const inlineCodeFilter = materializeInlineCodeFilter();
+  const imageSizeArgs = config.imageSize.enabled ? buildImageSizePandocArgs(config.imageSize, materializeImageSizeFilter()) : [];
   const pandocArgs = [
     markdownOutput,
     "-o",
     output,
     ...buildPandocResourcePathArgs(input),
     `--reference-doc=${templatePath}`,
-    ...existsSync6(luaFilter) ? [`--lua-filter=${luaFilter}`] : []
+    ...existsSync6(inlineCodeFilter) ? [`--lua-filter=${inlineCodeFilter}`] : [],
+    ...imageSizeArgs
   ];
   const { exitCode, stderr } = await runProcess("pandoc", pandocArgs);
   if (exitCode !== 0) {
@@ -147188,6 +147544,15 @@ async function convertMarkdown(options) {
   }
   console.log(`已生成：${output}`);
 }
+function buildImageSizePandocArgs(config, filterPath) {
+  if (!config.enabled)
+    return [];
+  return [
+    `--metadata=md2docx-image-max-width-cm:${config.maxWidthCm}`,
+    `--metadata=md2docx-image-max-height-cm:${config.maxHeightCm}`,
+    `--lua-filter=${filterPath}`
+  ];
+}
 function buildPandocResourcePathArgs(inputPath, workingDirectory = process.cwd()) {
   const workingDir = resolve5(workingDirectory);
   const sourceDir = dirname5(resolve5(inputPath));
@@ -147299,31 +147664,31 @@ function mapShd(shd) {
   if (!shd)
     return;
   const sh = {};
-  for (const a of [
-    "val",
-    "color",
-    "fill",
-    "themeColor",
-    "themeTint",
-    "themeFill",
-    "themeFillShade",
-    "themeShade"
-  ]) {
+  for (const a of ["color", "fill"]) {
     const v = wAttr(shd, a);
     if (v !== null)
       sh[a] = v;
   }
+  const type = wAttr(shd, "val");
+  if (type !== null)
+    sh.type = type;
   return Object.keys(sh).length > 0 ? sh : undefined;
 }
 function mapBorder(bdr) {
   if (!bdr)
     return;
   const b = {};
-  for (const a of ["val", "color", "sz", "space", "themeColor", "themeShade"]) {
+  for (const a of ["color", "space"]) {
     const v = wAttr(bdr, a);
     if (v !== null)
       b[a] = /^\d+$/.test(v) ? Number(v) : v;
   }
+  const style = wAttr(bdr, "val");
+  if (style !== null)
+    b.style = style;
+  const size = wAttr(bdr, "sz");
+  if (size !== null)
+    b.size = /^\d+$/.test(size) ? Number(size) : size;
   return Object.keys(b).length > 0 ? b : undefined;
 }
 function mapRunProps(rPr) {
@@ -147831,23 +148196,32 @@ function extractStylesFromDocx(docxPath) {
 // src/commands/export.ts
 async function exportConfig(options) {
   const output = resolveOutputPath(options.output, "config.json", [".json"], "配置输出文件");
-  prepareOutput(output, options.force ?? false);
+  prepareOutput(output);
   writeFileSync4(output, DEFAULT_CONFIG_TEXT, "utf-8");
   console.log(`已导出配置：${output}`);
 }
-async function exportStyle(options) {
+async function exportStyleRaw(options) {
   const source = options.file ? resolveInputPath(options.file, [".docx"], "DOCX 文件") : undefined;
-  const defaultName = source ? `${parse5(source).name}_style.json` : "style.json";
-  const output = resolveOutputPath(options.output, defaultName, [".json"], "样式输出文件");
-  prepareOutput(output, options.force ?? false);
+  const defaultName = defaultStyleRawOutputName(source);
+  const output = resolveOutputPath(options.output, defaultName, [".json"], "底层样式输出文件");
+  prepareOutput(output);
   if (source) {
     const styles = extractStylesFromDocx(source);
     writeFileSync4(output, `${JSON.stringify(styles, null, 2)}
 `, "utf-8");
   } else {
-    writeFileSync4(output, DEFAULT_STYLE_TEXT, "utf-8");
+    writeFileSync4(output, DEFAULT_STYLE_RAW_TEXT, "utf-8");
   }
-  console.log(`已导出样式：${output}`);
+  console.log(`已导出底层样式：${output}`);
+}
+function defaultStyleRawOutputName(source) {
+  return source ? `${parse5(source).name}_style-raw.json` : "style-raw.json";
+}
+async function exportStyleConfig(options) {
+  const output = resolveOutputPath(options.output, "style-config.json", [".json"], "语义化样式配置输出文件");
+  prepareOutput(output);
+  writeFileSync4(output, DEFAULT_STYLE_CONFIG_TEXT, "utf-8");
+  console.log(`已导出语义化样式配置：${output}`);
 }
 
 // src/commands/format.ts
@@ -147858,17 +148232,12 @@ async function formatMarkdown(options) {
   const configPath = options.config ? resolveInputPath(options.config, [".json"], "配置文件") : materializeDefaultConfig();
   const defaultName = `${parse6(input).name}_formatted.md`;
   const output = resolveOutputPath(options.output, defaultName, [".md", ".markdown"], "Markdown 输出文件");
-  const force = options.force ?? false;
-  prepareOutput(output, force);
+  prepareOutput(output);
   const config = await loadConfig(configPath);
   const outputName = parse6(output).name;
   const assetsName = `${outputName}_assets`;
   const assetsDir = resolve6(dirname6(output), assetsName);
   if (config.renderMermaid.enabled && existsSync7(assetsDir)) {
-    if (!force) {
-      throw new Error(`资源目录已存在：${assetsDir}
-使用 --force 覆盖现有目录`);
-    }
     const parent = resolve6(dirname6(output));
     if (dirname6(assetsDir) !== parent)
       throw new Error(`拒绝清理非输出目录：${assetsDir}`);
@@ -147885,7 +148254,8 @@ async function run(args) {
     convert: convertMarkdown,
     format: formatMarkdown,
     exportConfig,
-    exportStyle,
+    exportStyleRaw,
+    exportStyleConfig,
     clean: cleanIntermediateFiles
   });
   program2.exitOverride();