markdown-docx 0.3.0__tar.gz → 0.3.1__tar.gz

{markdown_docx-0.3.0 → markdown_docx-0.3.1}/.github/workflows/ci.yml

@@ -76,12 +76,20 @@ jobs:
           enable-cache: true
 
       - name: Install LibreOffice and Poppler
-        run: sudo apt-get update && sudo apt-get install -y libreoffice-writer poppler-utils
+        run: sudo apt-get update && sudo apt-get install -y libreoffice-writer poppler-utils fonts-liberation
+
+      - name: Install locked test dependencies
+        run: uv sync --locked --all-groups
+
+      - name: Verify rendered theme fonts and theme changes
+        env:
+          MARKDOWN_DOCX_FONT_RENDERER: libreoffice
+        run: uv run pytest tests/test_font_rendering.py
 
       - name: Render showcase DOCX
         run: |
           mkdir -p .visual
-          uvx --from . markdown-docx sample/showcase.md .visual/showcase.docx
+          uv run --locked markdown-docx sample/showcase.md .visual/showcase.docx
 
       - name: Convert showcase to PDF
         run: libreoffice --headless --convert-to pdf --outdir .visual .visual/showcase.docx

{markdown_docx-0.3.0 → markdown_docx-0.3.1}/AGENTS.md

@@ -11,7 +11,7 @@ This repository contains `markdown-docx`, a strict Python CLI that converts cons
 ## Core rules
 
 - Use only supported public `python-docx` APIs in production code, except for the isolated hyperlink helper.
-- Direct OOXML creation is allowed only in `src/markdown_docx/hyperlinks.py` to create native hyperlinks. Replace this helper when a supported public API becomes available.
+- Direct OOXML changes are allowed only in `src/markdown_docx/hyperlinks.py` for native hyperlinks. Replace that helper when a supported public API becomes available. Theme font handling must use the public APIs in `ps-python-docx` 1.3.0.
 - Preserve normal Markdown meaning and keep Word metadata in invisible reserved HTML comments.
 - Reject unsupported behavior with stable, line-aware diagnostics.
 - Treat Word sections as layout boundaries. Headings never create sections.

{markdown_docx-0.3.0 → markdown_docx-0.3.1}/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.3.1
+
+- Use ps-python-docx 1.3.0 public theme APIs. Remove theme-related OOXML access from production code.
+- Apply body and heading font overrides to Word's actual theme fonts. Preserve theme inheritance in mapped styles and linked character styles instead of applying literal fonts to individual headings.
+- Preserve unspecified theme slots and unrelated theme settings. Keep code in its explicit monospace font. Handle missing themes and diagnose malformed themes and conflicting style roles.
+- Add saved-package font cascade tests and layout-engine regression checks that verify PDF fonts before and after changing the theme. Exercise Aptos and Aptos Display with Word and Liberation fonts in visual CI.
+
 ## 0.3.0
 
 - Convert Markdown links into native, clickable, editable Word hyperlinks in paragraphs, headings, blockquotes, lists, and table cells.

{markdown_docx-0.3.0 → markdown_docx-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: markdown-docx
-Version: 0.3.0
+Version: 0.3.1
 Summary: Convert constrained Markdown documents into editable Word files.
 Project-URL: Homepage, https://github.com/pseudosavant/markdown-docx
 Project-URL: Repository, https://github.com/pseudosavant/markdown-docx
@@ -26,7 +26,7 @@ Requires-Dist: httpx<1,>=0.27
 Requires-Dist: markdown-it-py<5,>=3.0
 Requires-Dist: packaging>=24.0
 Requires-Dist: pillow<13,>=10.0
-Requires-Dist: python-docx==1.2.0
+Requires-Dist: ps-python-docx==1.3.0
 Requires-Dist: pyyaml<7,>=6.0
 Description-Content-Type: text/markdown
 
@@ -171,7 +171,7 @@ Document metadata sets document-wide defaults:
 | `orientation` | Select portrait or landscape orientation |
 | `margins` | Set the top, right, bottom, and left margins |
 | `styles` | Map Markdown constructs to Word style names |
-| `fonts` | Set body, heading, and monospace fonts |
+| `fonts` | Set theme body and heading fonts, plus a fixed monospace font |
 
 Content directives control the following block:
 
@@ -201,8 +201,8 @@ document:
     bottom: 0.75in
     left: 0.75in
   fonts:
-    body: Calibri
-    headings: Calibri
+    body: Aptos
+    headings: Aptos Display
     monospace: Consolas
 -->
 
@@ -215,6 +215,12 @@ Named page sizes are `letter`, `legal`, and `a4`. Custom page sizes use nominal
 
 The `styles` mapping assigns Word paragraph and table styles to semantic Markdown constructs. Ordered and unordered list styles are arrays, with one Word style for each supported nesting depth.
 
+`fonts.body` and `fonts.headings` set the document theme's Latin body and heading fonts. Word's theme font settings show these choices. Mapped paragraph styles and their linked character styles inherit from the theme, so a later theme font change updates existing text and new paragraphs. Font names are not applied to individual body or heading runs. Body overrides also update the default paragraph style and default run font reference. Omitted body or heading overrides preserve that part of the template theme and its styles.
+
+`fonts.monospace` stays explicit for inline code and code blocks because Word has no monospace theme font slot. Templates must use distinct styles for simultaneously overridden body, heading, and code roles. Conflicting mappings report `template_font_style_conflict`. A template without a theme receives the packaged theme when body or heading overrides are requested. A malformed theme reports `template_theme_invalid`.
+
+Theme colors, effects, East Asian fonts, complex script fonts, and supplemental script mappings are preserved. These overrides do not embed or install fonts. Word may substitute fonts that are unavailable on the rendering machine.
+
 ### Sections and page breaks
 
 A section directive starts a next-page Word section before the following content block:
@@ -361,7 +367,7 @@ Read the [**project documentation**](https://example.com/docs "Read the guide").
 Contact [the team](mailto:team@example.com).
 ```
 
-The source alt text for images remains meaningful Markdown content, but `python-docx` 1.2.0 has no public API for embedding it in a Word drawing. A rendered document containing images reports `image_alt_text_not_embedded` in its warning list.
+The source alt text for images remains meaningful Markdown content, but `ps-python-docx` 1.3.0 has no public API for embedding it in a Word drawing. A rendered document containing images reports `image_alt_text_not_embedded` in its warning list.
 
 ## Automation and safety
 
@@ -464,7 +470,18 @@ uvx --refresh --from . markdown-docx sample\showcase.md sample\showcase.docx --f
 
 ## Design and compatibility
 
-Production code uses documented public `python-docx` APIs with one isolated exception. `src/markdown_docx/hyperlinks.py` creates native hyperlink OOXML because `python-docx` 1.2.0 has no public hyperlink creation API. Run formatting, styles, relationship registration, and document saving use library APIs. Replace this helper when upstream supports hyperlink creation. Tests enforce the boundary and inspect generated package XML read-only. See [public API capabilities](docs/public-api-capabilities.md) for the complete decision record.
+Both development installs and published wheels use `ps-python-docx==1.3.0` from PyPI. It retains the `docx` import package and replaces the upstream `python-docx` distribution. Use `uv sync --locked --all-groups` and `uv run markdown-docx` when working from source. CI and the release workflow test a clean wheel installation from PyPI.
+
+Production code uses the public `docx` APIs provided by `ps-python-docx` 1.3.0. Theme fonts, style references, linked styles, and document defaults use public library APIs. The only OOXML exception is `src/markdown_docx/hyperlinks.py` for native hyperlink creation. Replace that helper when a supported creation API becomes available. Tests enforce this boundary and inspect saved theme data, style inheritance, and effective font selection. See [public API capabilities](docs/public-api-capabilities.md) for the decision record.
+
+The visual CI job also renders font regression documents through LibreOffice using installed Liberation fonts. It verifies the fonts recorded in the PDF, then changes only the theme and checks that the rendered fonts follow it. To run the same check through installed Microsoft Word with Aptos and Aptos Display on Windows:
+
+```powershell
+$env:MARKDOWN_DOCX_FONT_RENDERER="word"
+uv run pytest tests/test_font_rendering.py
+```
+
+This optional check uses `uvx office-export` and requires the named fonts to be available to Word. A substituted font fails the test.
 
 Word is the primary compatibility target. LibreOffice Writer is used as a visual smoke-test engine. Differences in pagination or font metrics can occur between layout engines.
 

{markdown_docx-0.3.0 → markdown_docx-0.3.1}/README.md

@@ -139,7 +139,7 @@ Document metadata sets document-wide defaults:
 | `orientation` | Select portrait or landscape orientation |
 | `margins` | Set the top, right, bottom, and left margins |
 | `styles` | Map Markdown constructs to Word style names |
-| `fonts` | Set body, heading, and monospace fonts |
+| `fonts` | Set theme body and heading fonts, plus a fixed monospace font |
 
 Content directives control the following block:
 
@@ -169,8 +169,8 @@ document:
     bottom: 0.75in
     left: 0.75in
   fonts:
-    body: Calibri
-    headings: Calibri
+    body: Aptos
+    headings: Aptos Display
     monospace: Consolas
 -->
 
@@ -183,6 +183,12 @@ Named page sizes are `letter`, `legal`, and `a4`. Custom page sizes use nominal
 
 The `styles` mapping assigns Word paragraph and table styles to semantic Markdown constructs. Ordered and unordered list styles are arrays, with one Word style for each supported nesting depth.
 
+`fonts.body` and `fonts.headings` set the document theme's Latin body and heading fonts. Word's theme font settings show these choices. Mapped paragraph styles and their linked character styles inherit from the theme, so a later theme font change updates existing text and new paragraphs. Font names are not applied to individual body or heading runs. Body overrides also update the default paragraph style and default run font reference. Omitted body or heading overrides preserve that part of the template theme and its styles.
+
+`fonts.monospace` stays explicit for inline code and code blocks because Word has no monospace theme font slot. Templates must use distinct styles for simultaneously overridden body, heading, and code roles. Conflicting mappings report `template_font_style_conflict`. A template without a theme receives the packaged theme when body or heading overrides are requested. A malformed theme reports `template_theme_invalid`.
+
+Theme colors, effects, East Asian fonts, complex script fonts, and supplemental script mappings are preserved. These overrides do not embed or install fonts. Word may substitute fonts that are unavailable on the rendering machine.
+
 ### Sections and page breaks
 
 A section directive starts a next-page Word section before the following content block:
@@ -329,7 +335,7 @@ Read the [**project documentation**](https://example.com/docs "Read the guide").
 Contact [the team](mailto:team@example.com).
 ```
 
-The source alt text for images remains meaningful Markdown content, but `python-docx` 1.2.0 has no public API for embedding it in a Word drawing. A rendered document containing images reports `image_alt_text_not_embedded` in its warning list.
+The source alt text for images remains meaningful Markdown content, but `ps-python-docx` 1.3.0 has no public API for embedding it in a Word drawing. A rendered document containing images reports `image_alt_text_not_embedded` in its warning list.
 
 ## Automation and safety
 
@@ -432,7 +438,18 @@ uvx --refresh --from . markdown-docx sample\showcase.md sample\showcase.docx --f
 
 ## Design and compatibility
 
-Production code uses documented public `python-docx` APIs with one isolated exception. `src/markdown_docx/hyperlinks.py` creates native hyperlink OOXML because `python-docx` 1.2.0 has no public hyperlink creation API. Run formatting, styles, relationship registration, and document saving use library APIs. Replace this helper when upstream supports hyperlink creation. Tests enforce the boundary and inspect generated package XML read-only. See [public API capabilities](docs/public-api-capabilities.md) for the complete decision record.
+Both development installs and published wheels use `ps-python-docx==1.3.0` from PyPI. It retains the `docx` import package and replaces the upstream `python-docx` distribution. Use `uv sync --locked --all-groups` and `uv run markdown-docx` when working from source. CI and the release workflow test a clean wheel installation from PyPI.
+
+Production code uses the public `docx` APIs provided by `ps-python-docx` 1.3.0. Theme fonts, style references, linked styles, and document defaults use public library APIs. The only OOXML exception is `src/markdown_docx/hyperlinks.py` for native hyperlink creation. Replace that helper when a supported creation API becomes available. Tests enforce this boundary and inspect saved theme data, style inheritance, and effective font selection. See [public API capabilities](docs/public-api-capabilities.md) for the decision record.
+
+The visual CI job also renders font regression documents through LibreOffice using installed Liberation fonts. It verifies the fonts recorded in the PDF, then changes only the theme and checks that the rendered fonts follow it. To run the same check through installed Microsoft Word with Aptos and Aptos Display on Windows:
+
+```powershell
+$env:MARKDOWN_DOCX_FONT_RENDERER="word"
+uv run pytest tests/test_font_rendering.py
+```
+
+This optional check uses `uvx office-export` and requires the named fonts to be available to Word. A substituted font fails the test.
 
 Word is the primary compatibility target. LibreOffice Writer is used as a visual smoke-test engine. Differences in pagination or font metrics can occur between layout engines.
 

{markdown_docx-0.3.0 → markdown_docx-0.3.1}/docs/public-api-capabilities.md

@@ -1,12 +1,13 @@
 # Public `python-docx` capability matrix
 
-`markdown-docx` pins `python-docx` 1.2.0. The executable probe is `tests/test_public_api_capabilities.py`.
+`markdown-docx` pins `ps-python-docx` 1.3.0, which retains the `docx` import package. The executable probe is `tests/test_public_api_capabilities.py`.
 
-| Capability | Public API in 1.2.0 | Current behavior |
+| Capability | Public API in fork 1.3.0 | Current behavior |
 | --- | --- | --- |
 | Open and save blank DOCX templates | Yes | Supported |
 | Enumerate and validate styles | Yes | Supported |
 | Change paragraph style fonts | Yes | Supported |
+| Set document theme fonts and theme inheritance | Yes | Uses `Document.theme_fonts`, `Font.theme_font`, `Styles.default_font`, and `Style.linked_style` |
 | Add sections and set page geometry | Yes | Supported |
 | Add explicit page breaks | Yes | Supported |
 | Apply list paragraph styles | Yes | Supported within configured depth |
@@ -19,7 +20,11 @@
 
 The public text API documents hyperlink reading but exposes no `add_hyperlink` method. The authorized exception in `AGENTS.md` permits `src/markdown_docx/hyperlinks.py` to create hyperlink elements and move runs into them. It registers external URL relationships and uses public APIs for run formatting and the Hyperlink character style. Existing template hyperlink styles are preserved. Optional link titles become tooltips. Empty destinations and document-local bookmark links are rejected with `unsupported_feature`. This helper is temporary and should be replaced when a supported upstream creation API becomes available.
 
-`tests/test_public_api_boundary.py` confines private and OOXML access to that helper. `tests/test_hyperlinks.py` checks saved relationships, text, formatting, titles, supported block contexts, and template styling. The dependency pin and these checks bound the compatibility risk of using library internals.
+`tests/test_public_api_boundary.py` confines private and OOXML access to the hyperlink helper, including checking the theme font adapter. `tests/test_hyperlinks.py` checks saved relationships, text, formatting, titles, supported block contexts, and template styling. The dependency pin and these checks bound the compatibility risk of using library internals.
+
+The public theme API implements the requirement that explicit Markdown font overrides appear in Word's actual theme settings. `theme_fonts.py` now contains only Markdown style mapping and diagnostics. It assigns the major and minor Latin typefaces through `Document.theme_fonts`, binds mapped and linked styles through `Font.theme_font`, and sets `Styles.default_font` for body inheritance. The library owns theme creation and XML changes. Font names are never assigned to individual heading runs. Other formatting and script fonts are preserved. Code keeps its explicit monospace font. Malformed themes and conflicting style roles retain their stable template diagnostics.
+
+`tests/test_theme_fonts.py` checks serialized theme definitions, references, effective font resolution, partial overrides, custom mappings, and preservation. `tests/test_font_rendering.py` verifies actual PDF font names after layout and again after a theme change. The default suite runs without Office. CI enables the layout test with LibreOffice and Liberation fonts. The optional Word run uses Aptos and Aptos Display and fails on font substitution.
 
 The public drawing API exposes inline shape dimensions and type but no alt-text property. The hyperlink exception does not authorize direct XML changes for image alt text or other features.
 

{markdown_docx-0.3.0 → markdown_docx-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "markdown-docx"
-version = "0.3.0"
+version = "0.3.1"
 description = "Convert constrained Markdown documents into editable Word files."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -31,7 +31,7 @@ dependencies = [
   "packaging>=24.0",
   "Pillow>=10.0,<13",
   "PyYAML>=6.0,<7",
-  "python-docx==1.2.0",
+  "ps-python-docx==1.3.0",
 ]
 
 [project.urls]
@@ -53,6 +53,7 @@ addopts = "--basetemp=.pytest-tmp"
 [dependency-groups]
 dev = [
   "mypy>=1.15",
+  "pdfplumber>=0.11,<1",
   "pytest>=8.0",
   "ruff==0.16.1",
   "twine>=6.1",

{markdown_docx-0.3.0 → markdown_docx-0.3.1}/sample/showcase.md

@@ -22,8 +22,8 @@ document:
     unordered_list: [List Bullet, List Bullet 2, List Bullet 3]
     table: Table Grid
   fonts:
-    body: Calibri
-    headings: Calibri
+    body: Aptos
+    headings: Aptos Display
     monospace: Consolas
 -->
 

markdown_docx-0.3.1/src/markdown_docx/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.1"

{markdown_docx-0.3.0 → markdown_docx-0.3.1}/src/markdown_docx/assets/syntax.json

@@ -1,14 +1,19 @@
 {
   "format": "markdown-docx",
-  "version": "0.3.0",
-  "text": "markdown-docx 0.3.0 syntax\n\nSupported Markdown:\n  ATX headings, paragraphs, emphasis, strong text, inline code, hard line breaks, fenced code blocks, blockquotes, ordered and unordered lists, pipe tables, links, and images.\n\nLinks use [link text](https://example.com) and become native Word hyperlinks. Labels preserve inline formatting and optional titles become tooltips. Reference links, angle-bracket autolinks, mailto links, relative file links, and linked inline images are supported wherever their content is allowed. Relative file links resolve from the output document. Destinations are not fetched. Bare URLs remain plain text. Heading bookmarks are not generated.\n\nMetadata comments:\n  document metadata must be first\n  section metadata starts a next-page section\n  <!-- markdown-docx: page-break --> inserts a page break\n  table metadata must immediately precede a pipe table\n  image metadata must immediately precede a standalone image\n\nLengths use in, cm, mm, or pt. Image widths may also use percentages.\n\nUnsupported in 0.3.0:\n  empty link destinations, document-local bookmark links, raw HTML, task lists, footnotes, horizontal rules, indented code blocks, multi-paragraph list items, DOTX, floating images, headers and footers from Markdown, page-number fields, and direct OOXML features.",
+  "version": "0.3.1",
+  "text": "markdown-docx 0.3.1 syntax\n\nSupported Markdown:\n  ATX headings, paragraphs, emphasis, strong text, inline code, hard line breaks, fenced code blocks, blockquotes, ordered and unordered lists, pipe tables, links, and images.\n\nLinks use [link text](https://example.com) and become native Word hyperlinks. Labels preserve inline formatting and optional titles become tooltips. Reference links, angle-bracket autolinks, mailto links, relative file links, and linked inline images are supported wherever their content is allowed. Relative file links resolve from the output document. Destinations are not fetched. Bare URLs remain plain text. Heading bookmarks are not generated.\n\nMetadata comments:\n  document metadata must be first\n  section metadata starts a next-page section\n  <!-- markdown-docx: page-break --> inserts a page break\n  table metadata must immediately precede a pipe table\n  image metadata must immediately precede a standalone image\n\nFonts: document.fonts.body and document.fonts.headings set Latin theme fonts. Mapped styles inherit from those theme slots. Omitted overrides preserve template settings. document.fonts.monospace stays explicit for code. Fonts are not embedded or installed.\n\nLengths use in, cm, mm, or pt. Image widths may also use percentages.\n\nUnsupported in 0.3.1:\n  empty link destinations, document-local bookmark links, raw HTML, task lists, footnotes, horizontal rules, indented code blocks, multi-paragraph list items, DOTX, floating images, headers and footers from Markdown, page-number fields, and direct OOXML features.",
   "page_sizes": ["letter", "legal", "a4", "custom"],
   "orientations": ["portrait", "landscape"],
   "length_units": ["in", "cm", "mm", "pt"],
   "directives": {
     "document": {
       "keys": ["page_size", "orientation", "margins", "styles", "fonts"],
-      "placement": "first non-whitespace content"
+      "placement": "first non-whitespace content",
+      "fonts": {
+        "body": "nonempty font name for the minor Latin theme font",
+        "headings": "nonempty font name for the major Latin theme font",
+        "monospace": "nonempty fixed font name for code, default Consolas"
+      }
     },
     "section": {
       "keys": ["page_size", "orientation", "margins"],

{markdown_docx-0.3.0 → markdown_docx-0.3.1}/src/markdown_docx/parser.py

@@ -264,7 +264,7 @@ def _consume_blockquote(tokens: list[Token], index: int, input_path: str) -> tup
     index += 1
     while index < len(tokens) and tokens[index].type != "blockquote_close":
         if tokens[index].type != "paragraph_open":
-            _unsupported("Blockquotes may contain paragraphs only in 0.3.0.", tokens[index], input_path)
+            _unsupported("Blockquotes may contain paragraphs only in 0.3.1.", tokens[index], input_path)
         paragraph, index = _consume_paragraph(tokens, index, input_path)
         if any(fragment.kind == "image" for fragment in paragraph.fragments):
             _unsupported("Images nested in blockquotes are not supported.", opening, input_path)
@@ -299,7 +299,7 @@ def _consume_list(
         if start is not None and int(start) != 1:
             raise ParseError(
                 "ordered_list_start_unsupported",
-                "Ordered lists must begin with 1 in 0.3.0.",
+                "Ordered lists must begin with 1 in 0.3.1.",
                 line=_token_line(opening),
                 input_path=input_path,
             )

{markdown_docx-0.3.0 → markdown_docx-0.3.1}/src/markdown_docx/skill.py

@@ -81,6 +81,8 @@ Start a next-page section with a `section` comment. Insert an explicit page brea
 
 Run `uvx markdown-docx --syntax` for every accepted key and value.
 
+Set `document.fonts.body` and `document.fonts.headings` to change Word's Latin theme fonts. For example, use Aptos for body and Aptos Display for headings. Mapped styles inherit from these theme slots, so later theme changes update the document. Omitted overrides preserve the corresponding template fonts. `document.fonts.monospace` remains a fixed font for code. Fonts are not embedded or installed. Use distinct styles for body, heading, and code roles when overriding their fonts.
+
 ## Supported Markdown
 
 Use ATX headings, paragraphs, emphasis, strong text, inline code, hard line breaks, fenced code blocks, blockquotes, lists, pipe tables, links, and local or remote images. Write `[link text](https://example.com)` for native editable Word hyperlinks. Link labels preserve formatting and optional titles become tooltips. Links work in paragraphs, headings, quotes, lists, and table cells. Reference links, angle-bracket autolinks, mailto links, relative file links, and linked inline images are supported wherever their content is allowed. Relative file links resolve from the output document. Destinations are not fetched. Bare URLs remain plain text. Empty destinations and document-local links such as `[heading](#heading)` are rejected. Heading bookmarks are not generated. Raw HTML, task lists, footnotes, horizontal rules, indented code, multi-paragraph list items, and unsupported nested block content are rejected.

{markdown_docx-0.3.0 → markdown_docx-0.3.1}/src/markdown_docx/styles.py

@@ -5,6 +5,7 @@ from docx.enum.style import WD_STYLE_TYPE
 
 from markdown_docx.errors import TemplateError
 from markdown_docx.models import DocumentOptions
+from markdown_docx.theme_fonts import apply_theme_fonts
 
 
 def validate_styles(document: DocumentObject, options: DocumentOptions) -> None:
@@ -22,20 +23,8 @@ def validate_styles(document: DocumentObject, options: DocumentOptions) -> None:
 
 
 def apply_font_overrides(document: DocumentObject, options: DocumentOptions) -> None:
-    fonts = options.fonts
-    if fonts.body:
-        body_names = {
-            options.styles.paragraph,
-            options.styles.blockquote,
-            *options.styles.ordered_list,
-            *options.styles.unordered_list,
-        }
-        for name in body_names:
-            document.styles[name].font.name = fonts.body
-    if fonts.headings:
-        for name in options.styles.headings.values():
-            document.styles[name].font.name = fonts.headings
-    document.styles[options.styles.code_block].font.name = fonts.monospace
+    document.styles[options.styles.code_block].font.name = options.fonts.monospace
+    apply_theme_fonts(document, options)
 
 
 def _require_style(document: DocumentObject, name: str, expected_type: WD_STYLE_TYPE) -> None:

markdown_docx-0.3.1/src/markdown_docx/theme_fonts.py

@@ -0,0 +1,78 @@
+"""Map Markdown font roles using public python-docx theme and style APIs."""
+
+from __future__ import annotations
+
+from typing import Literal
+
+from docx.document import Document as DocumentObject
+from docx.enum.style import WD_STYLE_TYPE
+from docx.styles.style import CharacterStyle
+
+from markdown_docx.errors import TemplateError
+from markdown_docx.models import DocumentOptions
+
+
+def apply_theme_fonts(document: DocumentObject, options: DocumentOptions) -> None:
+    """Set Latin theme fonts and references without formatting individual runs.
+
+    Preserve the template's East Asian, complex script, and supplemental fonts.
+    Monospace remains an explicit font because Word has no monospace theme slot.
+    """
+    code_style = document.styles[options.styles.code_block]
+    code_style.font.theme_font = None
+
+    if not (options.fonts.body or options.fonts.headings):
+        return
+
+    assignments: dict[str, tuple[CharacterStyle, Literal["major", "minor"]]] = {}
+
+    def assign(style: CharacterStyle, role: Literal["major", "minor"]) -> None:
+        style_id = style.style_id
+        if style_id is None:
+            raise TemplateError("template_style_invalid", "Font styles must have a style ID.")
+        if style_id == code_style.style_id or (style_id in assignments and assignments[style_id][1] != role):
+            raise TemplateError(
+                "template_font_style_conflict",
+                "Body, heading, and code font roles must use distinct styles.",
+                details={"style_id": style_id},
+            )
+        assignments[style_id] = (style, role)
+
+    body_names = {
+        options.styles.paragraph,
+        options.styles.blockquote,
+        *options.styles.ordered_list,
+        *options.styles.unordered_list,
+    }
+    if options.fonts.body:
+        default_style = document.styles.default(WD_STYLE_TYPE.PARAGRAPH)
+        if default_style is not None:
+            body_names.add(default_style.name)
+    roles: tuple[tuple[set[str], str | None, Literal["major", "minor"]], ...] = (
+        (body_names, options.fonts.body, "minor"),
+        (set(options.styles.headings.values()), options.fonts.headings, "major"),
+    )
+    for names, font, role in roles:
+        if not font:
+            continue
+        for name in sorted(names):
+            style = document.styles[name]
+            assign(style, role)
+            linked = style.linked_style
+            if linked is not None and linked.type == WD_STYLE_TYPE.CHARACTER:
+                assign(linked, role)
+
+    try:
+        fonts = document.theme_fonts
+        if options.fonts.body:
+            fonts.minor_latin = options.fonts.body
+        if options.fonts.headings:
+            fonts.major_latin = options.fonts.headings
+        fonts.name = "markdown-docx"
+    except ValueError as exc:
+        raise TemplateError("template_theme_invalid", f"Cannot update template theme fonts: {exc}") from exc
+
+    for style, role in assignments.values():
+        style.font.theme_font = role
+    if options.fonts.body:
+        document.styles.default_font.theme_font = "minor"

markdown_docx-0.3.1/tests/test_font_rendering.py

@@ -0,0 +1,158 @@
+"""Opt-in layout-engine checks. LibreOffice runs in CI and Word runs on Windows."""
+
+from __future__ import annotations
+
+import json
+import os
+import re
+import subprocess
+from pathlib import Path
+from zipfile import ZipFile
+
+import pdfplumber
+import pytest
+from docx import Document
+
+from markdown_docx.parser import parse_document
+from markdown_docx.renderer import render_docx
+from markdown_docx.styles import apply_font_overrides
+
+RENDERER = os.environ.get("MARKDOWN_DOCX_FONT_RENDERER", "")
+pytestmark = pytest.mark.skipif(not RENDERER, reason="Set MARKDOWN_DOCX_FONT_RENDERER to word or libreoffice")
+
+
+def normalized_font(name: str) -> str:
+    return re.sub(r"[^a-z]", "", name.split("+")[-1].lower())
+
+
+def export_pdf(source: Path, tmp_path: Path) -> Path:
+    output = source.with_suffix(".pdf")
+    if RENDERER == "word":
+        command = ["uvx", "office-export", str(source), "--to", "pdf", "--output", str(output), "--json"]
+    elif RENDERER == "libreoffice":
+        profile = (tmp_path / "lo-profile").as_uri()
+        command = [
+            "libreoffice",
+            f"-env:UserInstallation={profile}",
+            "--headless",
+            "--convert-to",
+            "pdf",
+            "--outdir",
+            str(tmp_path),
+            str(source),
+        ]
+    else:
+        raise AssertionError(f"Unknown font renderer: {RENDERER}")
+    result = subprocess.run(command, capture_output=True, text=True, timeout=180, check=False)
+    assert result.returncode == 0, result.stdout + result.stderr
+    if RENDERER == "word":
+        details = json.loads(result.stdout)
+        assert details["ok"], details
+        assert all(warning["code"] == "owned_office_process_forced" for warning in details["warnings"]), details
+    assert output.is_file(), result.stdout + result.stderr
+    return output
+
+
+def assert_pdf_fonts(path: Path, body: str, headings: str, monospace: str) -> None:
+    expected = {f"Heading{level}": headings for level in range(1, 7)}
+    expected.update(
+        dict.fromkeys(
+            [
+                "BodyPlain",
+                "BodyBold",
+                "BodyItalic",
+                "BodyBoth",
+                "BodyLink",
+                "QuoteText",
+                "BulletText",
+                "NumberText",
+                "TableHeader",
+                "TableCell",
+            ],
+            body,
+        )
+    )
+    expected.update({"InlineCode": monospace, "BlockCode": monospace, "HeadingCode": monospace})
+    found = {}
+    with pdfplumber.open(path) as pdf:
+        for page in pdf.pages:
+            for word in page.extract_words(extra_attrs=["fontname"]):
+                text = word["text"]
+                if text in expected:
+                    expected_family = normalized_font(expected[text])
+                    actual = normalized_font(word["fontname"])
+                    suffix = actual.removeprefix(expected_family)
+                    assert suffix in {
+                        "",
+                        "regular",
+                        "bold",
+                        "italic",
+                        "bolditalic",
+                        "mt",
+                        "boldmt",
+                        "italicmt",
+                        "bolditalicmt",
+                    }, (text, expected[text], word["fontname"])
+                    found[text] = word["fontname"]
+    assert set(found) == set(expected), f"Missing rendered text: {set(expected) - set(found)}"
+
+
+def test_rendered_fonts_follow_theme_and_subsequent_theme_change(tmp_path: Path) -> None:
+    if RENDERER == "word":
+        body, headings, mono = "Aptos", "Aptos Display", "Consolas"
+        next_body, next_headings = "Verdana", "Georgia"
+    else:
+        body, headings, mono = "Liberation Sans", "Liberation Serif", "Liberation Mono"
+        next_body, next_headings = headings, body
+    source = f"""<!-- markdown-docx
+document:
+  fonts:
+    body: {body}
+    headings: {headings}
+    monospace: {mono}
+-->
+
+# Heading1 `HeadingCode`
+
+## Heading2
+
+### Heading3
+
+#### Heading4
+
+##### Heading5
+
+###### Heading6
+
+BodyPlain **BodyBold** *BodyItalic* ***BodyBoth*** [BodyLink](https://example.com) `InlineCode`
+
+> QuoteText
+
+- BulletText
+
+1. NumberText
+
+| TableHeader |
+| --- |
+| TableCell |
+
+```text
+BlockCode
+```
+"""
+    model = parse_document(source, input_path=tmp_path / "fonts.md", source_name="fonts.md")
+    output = tmp_path / "fonts.docx"
+    render_docx(model, output, template_path=None, base_dir=tmp_path, allow_remote_images=False)
+    assert_pdf_fonts(export_pdf(output, tmp_path), body, headings, mono)
+
+    document = Document(output)
+    model.options.fonts.body = next_body
+    model.options.fonts.headings = next_headings
+    apply_font_overrides(document, model.options)
+    changed = tmp_path / "changed-theme.docx"
+    document.save(changed)
+    with ZipFile(output) as before, ZipFile(changed) as after:
+        for part in ("word/document.xml", "word/styles.xml"):
+            assert before.read(part) == after.read(part), f"Retheming changed {part}"
+        assert before.read("word/theme/theme1.xml") != after.read("word/theme/theme1.xml")
+    assert_pdf_fonts(export_pdf(changed, tmp_path), next_body, next_headings, mono)

{markdown_docx-0.3.0 → markdown_docx-0.3.1}/tests/test_public_api_boundary.py

@@ -3,10 +3,12 @@ from __future__ import annotations
 from pathlib import Path
 
 
-def test_private_docx_and_ooxml_apis_are_isolated_to_hyperlink_helper() -> None:
+def test_private_docx_and_ooxml_apis_are_isolated_to_authorized_helpers() -> None:
     package_dir = Path(__file__).parents[1] / "src" / "markdown_docx"
     forbidden = (
         "docx.oxml",
+        "docx.opc.oxml",
+        "._blob",
         "._element",
         "._p",
         "._r",
@@ -16,7 +18,7 @@ def test_private_docx_and_ooxml_apis_are_isolated_to_hyperlink_helper() -> None:
         "._part",
     )
     for path in package_dir.rglob("*.py"):
-        if path == package_dir / "hyperlinks.py":
+        if path.name in {"hyperlinks.py"}:
             continue
         source = path.read_text(encoding="utf-8")
         for marker in forbidden: