@v1hz/md2docx 2.4.0 → 2.5.0

package/README.md

@@ -216,8 +216,8 @@ CLI 不支持覆盖单个配置项，所有配置都通过 JSON 文件管理。
 | `renderMermaid.theme`            | beautiful-mermaid 主题                         | `"tokyo-night-light"` |
 | `renderMermaid.density`          | PNG 输出 DPI，最小值 72                        | `200`                 |
 | `imageSize.enabled`              | 等比缩小超过尺寸限制的图片                     | `true`                |
-| `imageSize.maxWidthCm`           | DOCX 图片最大宽度（厘米）                      | `15.5`                |
-| `imageSize.maxHeightCm`          | DOCX 图片最大高度（厘米）                      | `22`                  |
+| `imageSize.maxWidthCm`           | DOCX 图片最大宽度（厘米）                      | `12`                  |
+| `imageSize.maxHeightCm`          | DOCX 图片最大高度（厘米）                      | `12`                  |
 | `removeThematicBreaks.enabled`   | 移除 `---`、`***`、`___` 等分隔符行            | `true`                |
 
 图片尺寸限制在 Pandoc 生成 DOCX 前通过 Lua filter 应用。程序读取图片像素尺寸和 DPI，仅缩小超限图片，不会放大小图；宽度和高度使用同一缩放比例。Markdown 中已经显式设置 `width` 或 `height` 的图片视为用户覆盖，不应用全局限制。单张图片无法读取尺寸时会输出警告并继续转换。
@@ -234,11 +234,32 @@ CLI 不支持覆盖单个配置项，所有配置都通过 JSON 文件管理。
   "schemaVersion": 1,
   "options": {
     "body": {
-      "firstLineIndent": false
+      "firstLineIndent": false,
+      "lineSpacing": "onePointFive"
     },
     "headings": {
       "1": {
-        "startOnNewPage": false
+        "startOnNewPage": false,
+        "alignment": "left",
+        "bold": true
+      },
+      "2": {
+        "bold": true
+      },
+      "3": {
+        "bold": true
+      },
+      "4": {
+        "bold": true,
+        "italic": false
+      },
+      "5": {
+        "bold": true,
+        "italic": false
+      },
+      "6": {
+        "bold": true,
+        "italic": false
       }
     },
     "inlineCode": {
@@ -257,7 +278,7 @@ CLI 不支持覆盖单个配置项，所有配置都通过 JSON 文件管理。
 md2docx -f report.md --style-config style-config.json
 ```
 
-字段缺失表示继承底层样式；`true` 表示显式启用完整效果；`false` 表示显式关闭。当前只开放正文首行缩进、一级标题另起一页、行内代码背景和代码块外框。完整设计见 [`docs/style-config-design.md`](docs/style-config-design.md)。
+字段缺失表示继承底层样式；`true` 表示显式启用完整效果；`false` 表示显式关闭。正文行距为浮点数倍数，例如 `1.5` 表示 1.5 倍行距；一级标题对齐只接受 `left`、`center`。当前还开放一至六级标题粗体，以及四至六级标题斜体。完整设计见 [`docs/style-config-design.md`](docs/style-config-design.md)。
 
 转换时按以下规则选择输入：
 

package/config/config.schema.json

@@ -131,13 +131,13 @@
           "description": "图片最大宽度（厘米）",
           "type": "number",
           "exclusiveMinimum": 0,
-          "default": 15.5
+          "default": 12
         },
         "maxHeightCm": {
           "description": "图片最大高度（厘米）",
           "type": "number",
           "exclusiveMinimum": 0,
-          "default": 22
+          "default": 12
         }
       },
       "required": ["enabled", "maxWidthCm", "maxHeightCm"]

package/config/style-config.json

@@ -3,11 +3,32 @@
   "schemaVersion": 1,
   "options": {
     "body": {
-      "firstLineIndent": true
+      "firstLineIndent": true,
+      "lineSpacing": 1.5
     },
     "headings": {
       "1": {
-        "startOnNewPage": false
+        "startOnNewPage": false,
+        "alignment": "left",
+        "bold": true
+      },
+      "2": {
+        "bold": true
+      },
+      "3": {
+        "bold": true
+      },
+      "4": {
+        "bold": true,
+        "italic": false
+      },
+      "5": {
+        "bold": true,
+        "italic": false
+      },
+      "6": {
+        "bold": true,
+        "italic": false
       }
     },
     "inlineCode": {

package/config/style-config.schema.json

@@ -23,6 +23,11 @@
             "firstLineIndent": {
               "type": "boolean",
               "description": "正文是否使用预设的首行缩进"
+            },
+            "lineSpacing": {
+              "type": "number",
+              "exclusiveMinimum": 0,
+              "description": "正文行距倍数，如 1.5 表示 1.5 倍行距"
             }
           }
         },
@@ -37,8 +42,32 @@
                 "startOnNewPage": {
                   "type": "boolean",
                   "description": "一级标题是否另起一页"
+                },
+                "alignment": {
+                  "type": "string",
+                  "enum": ["left", "center"],
+                  "description": "一级标题左对齐或居中"
+                },
+                "bold": {
+                  "type": "boolean",
+                  "description": "一级标题是否加粗"
                 }
               }
+            },
+            "2": {
+              "$ref": "#/$defs/headingBold"
+            },
+            "3": {
+              "$ref": "#/$defs/headingBold"
+            },
+            "4": {
+              "$ref": "#/$defs/headingBoldItalic"
+            },
+            "5": {
+              "$ref": "#/$defs/headingBoldItalic"
+            },
+            "6": {
+              "$ref": "#/$defs/headingBoldItalic"
             }
           }
         },
@@ -64,5 +93,31 @@
         }
       }
     }
+  },
+  "$defs": {
+    "headingBold": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "bold": {
+          "type": "boolean",
+          "description": "标题是否加粗"
+        }
+      }
+    },
+    "headingBoldItalic": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "bold": {
+          "type": "boolean",
+          "description": "标题是否加粗"
+        },
+        "italic": {
+          "type": "boolean",
+          "description": "标题是否斜体"
+        }
+      }
+    }
   }
 }

package/dist/index.js

@@ -128401,7 +128401,7 @@ import { fileURLToPath as fileURLToPath3 } from "node:url";
 // package.json
 var package_default = {
   name: "@v1hz/md2docx",
-  version: "2.4.0",
+  version: "2.5.0",
   description: "基于 pandoc 的 Markdown 转 Word 工具，自动格式化 Markdown，支持自定义样式，AI 友好，用户友好。",
   keywords: [
     "converter",
@@ -147199,11 +147199,32 @@ var style_config_default = `{
   "schemaVersion": 1,
   "options": {
     "body": {
-      "firstLineIndent": true
+      "firstLineIndent": true,
+      "lineSpacing": 1.5
     },
     "headings": {
       "1": {
-        "startOnNewPage": false
+        "startOnNewPage": false,
+        "alignment": "left",
+        "bold": true
+      },
+      "2": {
+        "bold": true
+      },
+      "3": {
+        "bold": true
+      },
+      "4": {
+        "bold": true,
+        "italic": false
+      },
+      "5": {
+        "bold": true,
+        "italic": false
+      },
+      "6": {
+        "bold": true,
+        "italic": false
       }
     },
     "inlineCode": {
@@ -147265,21 +147286,25 @@ function validateOptions(value2, path3) {
   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");
+    rejectUnknown(body, ["firstLineIndent", "lineSpacing"], path3, "options.body");
     if (body.firstLineIndent !== undefined) {
       expectBoolean2(body.firstLineIndent, path3, "options.body.firstLineIndent");
     }
+    if (body.lineSpacing !== undefined) {
+      if (typeof body.lineSpacing !== "number" || !Number.isFinite(body.lineSpacing) || body.lineSpacing <= 0) {
+        invalidStyleConfig(path3, "options.body.lineSpacing", "必须是大于 0 的有限数字");
+      }
+    }
   }
   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');
-      }
-    }
+    rejectUnknown(headings, ["1", "2", "3", "4", "5", "6"], path3, "options.headings");
+    validateHeading(headings, "1", ["startOnNewPage", "alignment", "bold"], path3);
+    validateHeading(headings, "2", ["bold"], path3);
+    validateHeading(headings, "3", ["bold"], path3);
+    validateHeading(headings, "4", ["bold", "italic"], path3);
+    validateHeading(headings, "5", ["bold", "italic"], path3);
+    validateHeading(headings, "6", ["bold", "italic"], path3);
   }
   if (options.inlineCode !== undefined) {
     const inlineCode2 = expectRecord2(options.inlineCode, path3, "options.inlineCode");
@@ -147296,6 +147321,23 @@ function validateOptions(value2, path3) {
     }
   }
 }
+function validateHeading(headings, level, allowed, path3) {
+  if (headings[level] === undefined)
+    return;
+  const field = `options.headings["${level}"]`;
+  const heading2 = expectRecord2(headings[level], path3, field);
+  rejectUnknown(heading2, allowed, path3, field);
+  if (heading2.startOnNewPage !== undefined) {
+    expectBoolean2(heading2.startOnNewPage, path3, `${field}.startOnNewPage`);
+  }
+  if (heading2.alignment !== undefined) {
+    expectEnum(heading2.alignment, ["left", "center"], path3, `${field}.alignment`);
+  }
+  if (heading2.bold !== undefined)
+    expectBoolean2(heading2.bold, path3, `${field}.bold`);
+  if (heading2.italic !== undefined)
+    expectBoolean2(heading2.italic, path3, `${field}.italic`);
+}
 function rejectUnknown(value2, allowed, path3, field) {
   const unknown2 = Object.keys(value2).find((key) => !allowed.includes(key));
   if (unknown2 !== undefined)
@@ -147317,6 +147359,11 @@ function expectString2(value2, path3, field) {
   if (typeof value2 !== "string")
     invalidStyleConfig(path3, field, "必须是字符串");
 }
+function expectEnum(value2, allowed, path3, field) {
+  if (typeof value2 !== "string" || !allowed.includes(value2)) {
+    invalidStyleConfig(path3, field, `必须是 ${allowed.join("、")} 之一`);
+  }
+}
 function invalidStyleConfig(path3, field, reason) {
   throw new Error(`样式配置无效：${path3}
 位置：${field}
@@ -147324,6 +147371,7 @@ function invalidStyleConfig(path3, field, reason) {
 }
 
 // src/style/compiler.ts
+var HEADING_LEVELS = ["1", "2", "3", "4", "5", "6"];
 function resolveEffectiveStyles(sources, defaults) {
   const rawPath = sources.styleRawPath ?? defaults?.styleRawPath ?? materializeDefaultStyleRaw();
   const rawStyle = loadStyleRaw(rawPath);
@@ -147365,9 +147413,22 @@ function compileStyleConfig(rawStyle, config) {
   const firstLineIndent = options.body?.firstLineIndent;
   if (firstLineIndent !== undefined)
     applyBodyFirstLineIndent(styles, firstLineIndent);
+  const lineSpacing = options.body?.lineSpacing;
+  if (lineSpacing !== undefined)
+    applyBodyLineSpacing(styles, lineSpacing);
   const startOnNewPage = options.headings?.["1"]?.startOnNewPage;
   if (startOnNewPage !== undefined)
     applyHeading1PageBreak(styles, startOnNewPage);
+  const heading1Alignment = options.headings?.["1"]?.alignment;
+  if (heading1Alignment !== undefined)
+    applyHeading1Alignment(styles, heading1Alignment);
+  for (const level of HEADING_LEVELS) {
+    const heading2 = options.headings?.[level];
+    if (heading2?.bold !== undefined)
+      applyHeadingBold(styles, level, heading2.bold);
+    if (heading2?.italic !== undefined)
+      applyHeadingItalic(styles, level, heading2.italic);
+  }
   const inlineCodeBackground = options.inlineCode?.background;
   if (inlineCodeBackground !== undefined) {
     applyInlineCodeBackground(styles, inlineCodeBackground);
@@ -147377,6 +147438,18 @@ function compileStyleConfig(rawStyle, config) {
     applyCodeBlockBorder(styles, codeBlockBorder);
   return styles;
 }
+function applyBodyLineSpacing(styles, multiplier) {
+  const line = Math.round(multiplier * 240);
+  for (const name2 of ["First Paragraph", "Body Text"]) {
+    const style = findStyle(styles, "paragraphStyles", name2);
+    const paragraph2 = ensureObject(style, "paragraph");
+    paragraph2.spacing = {
+      ...optionalObject(paragraph2.spacing),
+      line,
+      lineRule: "auto"
+    };
+  }
+}
 function applyBodyFirstLineIndent(styles, enabled) {
   const firstParagraph = findStyle(styles, "paragraphStyles", "First Paragraph");
   const bodyText = findStyle(styles, "paragraphStyles", "Body Text");
@@ -147393,6 +147466,22 @@ function applyHeading1PageBreak(styles, enabled) {
   const heading1 = findStyle(styles, "paragraphStyles", "heading 1");
   ensureObject(heading1, "paragraph").pageBreakBefore = enabled;
 }
+function applyHeading1Alignment(styles, alignment) {
+  const heading1 = findStyle(styles, "paragraphStyles", "heading 1");
+  ensureObject(heading1, "paragraph").alignment = alignment;
+}
+function applyHeadingBold(styles, level, enabled) {
+  const heading2 = findStyle(styles, "paragraphStyles", `heading ${level}`);
+  const run = ensureObject(heading2, "run");
+  run.bold = enabled;
+  run.boldComplexScript = enabled;
+}
+function applyHeadingItalic(styles, level, enabled) {
+  const heading2 = findStyle(styles, "paragraphStyles", `heading ${level}`);
+  const run = ensureObject(heading2, "run");
+  run.italics = enabled;
+  run.italicsComplexScript = enabled;
+}
 function applyInlineCodeBackground(styles, enabled) {
   const inlineCode2 = findStyle(styles, "characterStyles", "Inline Code");
   ensureObject(inlineCode2, "run").shading = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@v1hz/md2docx",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "基于 pandoc 的 Markdown 转 Word 工具，自动格式化 Markdown，支持自定义样式，AI 友好，用户友好。",
   "keywords": [
     "converter",