markitdown-ocr 0.1.1b2__tar.gz → 0.1.2__tar.gz

{markitdown_ocr-0.1.1b2 → markitdown_ocr-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.5
+Metadata-Version: 2.4
 Name: markitdown-ocr
-Version: 0.1.1b2
+Version: 0.1.2
 Summary: OCR plugin for MarkItDown - Extracts text from images in PDF, DOCX, PPTX, and XLSX via LLM Vision
 Project-URL: Documentation, https://github.com/microsoft/markitdown#readme
 Project-URL: Issues, https://github.com/microsoft/markitdown/issues
@@ -17,14 +17,14 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Python: >=3.10
-Requires-Dist: mammoth~=1.11.0
-Requires-Dist: markitdown>=0.1.0
+Requires-Dist: mammoth<2,>=1.12.2
+Requires-Dist: markitdown<0.2.0,>=0.1.9
 Requires-Dist: openpyxl
 Requires-Dist: pandas
 Requires-Dist: pdfminer-six>=20251230
 Requires-Dist: pdfplumber>=0.11.9
-Requires-Dist: pillow>=9.0.0
-Requires-Dist: pymupdf>=1.24.0
+Requires-Dist: pillow>=12.1.1
+Requires-Dist: pymupdf<2,>=1.24.0
 Requires-Dist: python-docx
 Requires-Dist: python-pptx
 Provides-Extra: llm
@@ -47,6 +47,8 @@ Uses the same `llm_client` / `llm_model` pattern that MarkItDown already support
 
 ## Installation
 
+Requires `markitdown>=0.1.8,<0.2.0`, which provides the Office image-rendering hooks used by this plugin. Installing the plugin automatically resolves a compatible core version.
+
 ```bash
 pip install markitdown-ocr
 ```
@@ -130,9 +132,11 @@ When a file is converted:
 1. The OCR converter accepts the file
 2. It extracts embedded images from the document
 3. Each image is sent to the LLM with an extraction prompt
-4. The returned text is inserted inline, preserving document structure
+4. The returned text is placed alongside document content (XLSX images follow their sheet's table)
 5. If the LLM call fails, conversion continues without that image's text
 
+The DOCX, PPTX, and XLSX converters subclass their core counterparts and override the same semi-private `_image_to_html` method. Core handles native content, preprocessing, and placement; the plugin supplies escaped OCR HTML, which passes through the shared HTML-to-Markdown renderer. PDF uses its separate existing pipeline.
+
 ## Supported File Formats
 
 ### PDF
@@ -143,21 +147,23 @@ When a file is converted:
 
 ### DOCX
 
-- Images are extracted via document part relationships (`doc.part.rels`).
-- OCR is run before the DOCX→HTML→Markdown pipeline executes: placeholder tokens are injected into the HTML so that the markdown converter does not escape the OCR markers, and the final placeholders are replaced with the formatted `*[Image OCR]...[End OCR]*` blocks after conversion.
-- Document flow (headings, paragraphs, tables) is fully preserved around the OCR blocks.
+- Inherits core DOCX preprocessing, styles, math, and Mammoth conversion.
+- Mammoth provides each embedded image to `_image_to_html`. OCR fragments are inserted into the document's HTML before Markdown rendering, not substituted into finished Markdown.
+- Block fragments split enclosing paragraphs where necessary and remain inside their table cell or list item. Table-cell line breaks follow the shared HTML converter's existing limitations.
 
 ### PPTX
 
 - Picture shapes, placeholder shapes with images, and images inside groups are all supported.
-- Shapes are processed in top-to-left reading order per slide.
+- Inherits core shape ordering, native text, tables, charts, and speaker notes.
+- Slide content now uses the core converter's real line breaks rather than the old plugin's literal `\n` text, and inherits its empty-title and empty-notes handling.
 - If an `llm_client` is configured, the LLM is asked for a description first; OCR is used as the fallback when no description is returned.
 
 ### XLSX
 
-- Images embedded in worksheets (`sheet._images`) are extracted per sheet.
-- Cell position is calculated from the image anchor coordinates (column/row → Excel letter notation).
+- Inherits core workbook repair and table rendering; images are read from the same repaired workbook.
 - Images are listed under a `### Images in this sheet:` section after the sheet's data table — they are not interleaved into the table rows.
+- Sheet heading spacing follows the core converter; no new cell-position labels are added.
+- Legacy `.xls` files remain handled by the existing core converter, without image OCR.
 
 ### Output format
 
@@ -169,6 +175,10 @@ Every extracted OCR block is wrapped as:
 [End OCR]*
 ```
 
+For Office formats, recognized text is escaped as literal HTML text before Markdown rendering. Markdown escaping and line breaks therefore follow the shared HTML converter: for example, underscores may be backslash-escaped, and direct converter results use Markdown hard breaks. `MarkItDown` subsequently strips trailing whitespace from each output line. Empty recognition retains the native image representation (XLSX normally omits images).
+
+Repeated image bytes are recognized once per conversion, while the result is placed at every occurrence. The cache is not shared across documents or service overrides.
+
 ## Troubleshooting
 
 ### OCR text missing from output
@@ -198,6 +208,8 @@ markitdown --list-plugins   # should show: ocr
 
 The plugin propagates LLM API errors as warnings and continues conversion. Check your API key, quota, and that the chosen model supports vision inputs.
 
+For Office OCR, a service-reported error emits a warning and retains native image rendering. Exceptions raised by custom OCR services propagate from direct converter calls; `MarkItDown` can retry another applicable converter through its normal fallback behavior.
+
 ## Development
 
 ### Running Tests
@@ -211,8 +223,8 @@ pytest tests/ -v
 
 ```bash
 git clone https://github.com/microsoft/markitdown.git
-cd markitdown/packages/markitdown-ocr
-pip install -e .
+cd markitdown
+pip install -e 'packages/markitdown[docx,pptx,xlsx]' -e packages/markitdown-ocr
 ```
 
 ## Contributing

{markitdown_ocr-0.1.1b2 → markitdown_ocr-0.1.2}/README.md

@@ -14,6 +14,8 @@ Uses the same `llm_client` / `llm_model` pattern that MarkItDown already support
 
 ## Installation
 
+Requires `markitdown>=0.1.8,<0.2.0`, which provides the Office image-rendering hooks used by this plugin. Installing the plugin automatically resolves a compatible core version.
+
 ```bash
 pip install markitdown-ocr
 ```
@@ -97,9 +99,11 @@ When a file is converted:
 1. The OCR converter accepts the file
 2. It extracts embedded images from the document
 3. Each image is sent to the LLM with an extraction prompt
-4. The returned text is inserted inline, preserving document structure
+4. The returned text is placed alongside document content (XLSX images follow their sheet's table)
 5. If the LLM call fails, conversion continues without that image's text
 
+The DOCX, PPTX, and XLSX converters subclass their core counterparts and override the same semi-private `_image_to_html` method. Core handles native content, preprocessing, and placement; the plugin supplies escaped OCR HTML, which passes through the shared HTML-to-Markdown renderer. PDF uses its separate existing pipeline.
+
 ## Supported File Formats
 
 ### PDF
@@ -110,21 +114,23 @@ When a file is converted:
 
 ### DOCX
 
-- Images are extracted via document part relationships (`doc.part.rels`).
-- OCR is run before the DOCX→HTML→Markdown pipeline executes: placeholder tokens are injected into the HTML so that the markdown converter does not escape the OCR markers, and the final placeholders are replaced with the formatted `*[Image OCR]...[End OCR]*` blocks after conversion.
-- Document flow (headings, paragraphs, tables) is fully preserved around the OCR blocks.
+- Inherits core DOCX preprocessing, styles, math, and Mammoth conversion.
+- Mammoth provides each embedded image to `_image_to_html`. OCR fragments are inserted into the document's HTML before Markdown rendering, not substituted into finished Markdown.
+- Block fragments split enclosing paragraphs where necessary and remain inside their table cell or list item. Table-cell line breaks follow the shared HTML converter's existing limitations.
 
 ### PPTX
 
 - Picture shapes, placeholder shapes with images, and images inside groups are all supported.
-- Shapes are processed in top-to-left reading order per slide.
+- Inherits core shape ordering, native text, tables, charts, and speaker notes.
+- Slide content now uses the core converter's real line breaks rather than the old plugin's literal `\n` text, and inherits its empty-title and empty-notes handling.
 - If an `llm_client` is configured, the LLM is asked for a description first; OCR is used as the fallback when no description is returned.
 
 ### XLSX
 
-- Images embedded in worksheets (`sheet._images`) are extracted per sheet.
-- Cell position is calculated from the image anchor coordinates (column/row → Excel letter notation).
+- Inherits core workbook repair and table rendering; images are read from the same repaired workbook.
 - Images are listed under a `### Images in this sheet:` section after the sheet's data table — they are not interleaved into the table rows.
+- Sheet heading spacing follows the core converter; no new cell-position labels are added.
+- Legacy `.xls` files remain handled by the existing core converter, without image OCR.
 
 ### Output format
 
@@ -136,6 +142,10 @@ Every extracted OCR block is wrapped as:
 [End OCR]*
 ```
 
+For Office formats, recognized text is escaped as literal HTML text before Markdown rendering. Markdown escaping and line breaks therefore follow the shared HTML converter: for example, underscores may be backslash-escaped, and direct converter results use Markdown hard breaks. `MarkItDown` subsequently strips trailing whitespace from each output line. Empty recognition retains the native image representation (XLSX normally omits images).
+
+Repeated image bytes are recognized once per conversion, while the result is placed at every occurrence. The cache is not shared across documents or service overrides.
+
 ## Troubleshooting
 
 ### OCR text missing from output
@@ -165,6 +175,8 @@ markitdown --list-plugins   # should show: ocr
 
 The plugin propagates LLM API errors as warnings and continues conversion. Check your API key, quota, and that the chosen model supports vision inputs.
 
+For Office OCR, a service-reported error emits a warning and retains native image rendering. Exceptions raised by custom OCR services propagate from direct converter calls; `MarkItDown` can retry another applicable converter through its normal fallback behavior.
+
 ## Development
 
 ### Running Tests
@@ -178,8 +190,8 @@ pytest tests/ -v
 
 ```bash
 git clone https://github.com/microsoft/markitdown.git
-cd markitdown/packages/markitdown-ocr
-pip install -e .
+cd markitdown
+pip install -e 'packages/markitdown[docx,pptx,xlsx]' -e packages/markitdown-ocr
 ```
 
 ## Contributing

{markitdown_ocr-0.1.1b2 → markitdown_ocr-0.1.2}/pyproject.toml

@@ -25,16 +25,16 @@ classifiers = [
 
 # Core dependencies — matches the file-format libraries markitdown already uses
 dependencies = [
-  "markitdown>=0.1.0",
+  "markitdown>=0.1.9,<0.2.0",
   "pdfminer.six>=20251230",
   "pdfplumber>=0.11.9",
-  "PyMuPDF>=1.24.0",
-  "mammoth~=1.11.0",
+  "PyMuPDF>=1.24.0,<2",
+  "mammoth>=1.12.2,<2",
   "python-docx",
   "python-pptx",
   "pandas",
   "openpyxl",
-  "Pillow>=9.0.0",
+  "Pillow>=12.1.1",
 ]
 
 # llm_client is passed in by the user (same as for markitdown image descriptions);

{markitdown_ocr-0.1.1b2 → markitdown_ocr-0.1.2}/src/markitdown_ocr/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2025-present Contributors
 # SPDX-License-Identifier: MIT
 
-__version__ = "0.1.1b2"
+__version__ = "0.1.2"

markitdown_ocr-0.1.2/src/markitdown_ocr/_docx_converter_with_ocr.py

@@ -0,0 +1,71 @@
+"""DOCX image OCR using the core document conversion pipeline."""
+
+import hashlib
+import html
+from typing import Any, BinaryIO, Optional
+from warnings import warn
+
+from markitdown import DocumentConverterResult, StreamInfo
+from markitdown.converters import DocxConverter
+
+from ._ocr_service import LLMVisionOCRService, _extract_text_with_metadata
+
+
+class DocxConverterWithOCR(DocxConverter):
+    """Recognize embedded images while inheriting native DOCX conversion."""
+
+    def __init__(self, ocr_service: Optional[LLMVisionOCRService] = None):
+        super().__init__()
+        if not hasattr(DocxConverter, "_image_to_html"):
+            raise RuntimeError(
+                "DOCX OCR requires markitdown>=0.1.8b3 for the "
+                "DocxConverter._image_to_html hook. "
+                "Upgrade with: pip install --upgrade 'markitdown>=0.1.8b3'."
+            )
+        self.ocr_service = ocr_service
+
+    def convert(
+        self,
+        file_stream: BinaryIO,
+        stream_info: StreamInfo,
+        **kwargs: Any,
+    ) -> DocumentConverterResult:
+        # Keep repeated-image recognition local to this document, not the instance.
+        kwargs["_docx_ocr_cache"] = {}
+        return super().convert(file_stream, stream_info, **kwargs)
+
+    def _image_to_html(
+        self,
+        image_stream: BinaryIO,
+        stream_info: StreamInfo,
+        **kwargs: Any,
+    ) -> Optional[str]:
+        ocr_service = kwargs.get("ocr_service") or self.ocr_service
+        if ocr_service is None:
+            return None
+
+        cache: dict[bytes, Optional[str]] = kwargs.get("_docx_ocr_cache", {})
+        key = hashlib.sha256(image_stream.read()).digest()
+        image_stream.seek(0)
+        if key in cache:
+            return cache[key]
+
+        result = _extract_text_with_metadata(ocr_service, image_stream, stream_info)
+        if result.error:
+            warn(
+                f"DOCX image OCR failed: {result.error}. Keeping the native image.",
+                RuntimeWarning,
+                stacklevel=2,
+            )
+            cache[key] = None
+            return None
+        text = result.text.strip()
+        if not text:
+            cache[key] = None
+            return None
+
+        text = text.replace("\r\n", "\n").replace("\r", "\n")
+        content = html.escape(text).replace("\n", "<br>")
+        fragment = f"<p><em>[Image OCR]<br>{content}<br>[End OCR]</em></p>"
+        cache[key] = fragment
+        return fragment

{markitdown_ocr-0.1.1b2 → markitdown_ocr-0.1.2}/src/markitdown_ocr/_ocr_service.py

@@ -4,6 +4,7 @@ Provides LLM Vision-based image text extraction.
 """
 
 import base64
+import inspect
 from typing import Any, BinaryIO
 from dataclasses import dataclass
 
@@ -108,3 +109,19 @@ class LLMVisionOCRService:
             return OCRResult(text="", backend_used="llm_vision", error=str(e))
         finally:
             image_stream.seek(0)
+
+
+def _extract_text_with_metadata(
+    ocr_service: LLMVisionOCRService,
+    image_stream: BinaryIO,
+    stream_info: StreamInfo,
+) -> OCRResult:
+    """Forward metadata when supported, retaining the legacy stream-only call."""
+    extract_text = ocr_service.extract_text
+    try:
+        inspect.signature(extract_text).bind(image_stream, stream_info=stream_info)
+    except (TypeError, ValueError):
+        # Unsupported or uninspectable signatures keep the legacy invocation.
+        return extract_text(image_stream)
+    # Keep service errors outside the signature check; never retry an OCR call.
+    return extract_text(image_stream, stream_info=stream_info)

{markitdown_ocr-0.1.1b2 → markitdown_ocr-0.1.2}/src/markitdown_ocr/_plugin.py

@@ -12,7 +12,6 @@ from ._docx_converter_with_ocr import DocxConverterWithOCR
 from ._pptx_converter_with_ocr import PptxConverterWithOCR
 from ._xlsx_converter_with_ocr import XlsxConverterWithOCR
 
-
 __plugin_interface_version__ = 1
 
 

markitdown_ocr-0.1.2/src/markitdown_ocr/_pptx_converter_with_ocr.py

@@ -0,0 +1,70 @@
+"""PPTX image OCR using the core presentation conversion pipeline."""
+
+import hashlib
+import html
+from typing import Any, BinaryIO, Optional
+from warnings import warn
+
+from markitdown import DocumentConverterResult, StreamInfo
+from markitdown.converters import PptxConverter
+
+from ._ocr_service import LLMVisionOCRService, _extract_text_with_metadata
+
+
+class PptxConverterWithOCR(PptxConverter):
+    """Recognize embedded images while inheriting native PPTX conversion."""
+
+    def __init__(self, ocr_service: Optional[LLMVisionOCRService] = None):
+        super().__init__()
+        if not hasattr(PptxConverter, "_image_to_html"):
+            raise RuntimeError(
+                "PPTX OCR requires markitdown>=0.1.8b3 for the "
+                "PptxConverter._image_to_html hook. "
+                "Upgrade with: pip install --upgrade 'markitdown>=0.1.8b3'."
+            )
+        self.ocr_service = ocr_service
+
+    def convert(
+        self,
+        file_stream: BinaryIO,
+        stream_info: StreamInfo,
+        **kwargs: Any,
+    ) -> DocumentConverterResult:
+        kwargs["_pptx_ocr_cache"] = {}
+        return super().convert(file_stream, stream_info, **kwargs)
+
+    def _image_to_html(
+        self,
+        image_stream: BinaryIO,
+        stream_info: StreamInfo,
+        **kwargs: Any,
+    ) -> Optional[str]:
+        ocr_service = kwargs.get("ocr_service") or self.ocr_service
+        if ocr_service is None:
+            return None
+
+        cache: dict[bytes, Optional[str]] = kwargs.get("_pptx_ocr_cache", {})
+        key = hashlib.sha256(image_stream.read()).digest()
+        image_stream.seek(0)
+        if key in cache:
+            return cache[key]
+
+        result = _extract_text_with_metadata(ocr_service, image_stream, stream_info)
+        if result.error:
+            warn(
+                f"PPTX image OCR failed: {result.error}. Keeping the native image.",
+                RuntimeWarning,
+                stacklevel=2,
+            )
+            cache[key] = None
+            return None
+        text = result.text.strip()
+        if not text:
+            cache[key] = None
+            return None
+
+        text = text.replace("\r\n", "\n").replace("\r", "\n")
+        content = html.escape(text).replace("\n", "<br>")
+        fragment = f"<p><em>[Image OCR]<br>{content}<br>[End OCR]</em></p>"
+        cache[key] = fragment
+        return fragment

markitdown_ocr-0.1.2/src/markitdown_ocr/_xlsx_converter_with_ocr.py

@@ -0,0 +1,70 @@
+"""XLSX image OCR using the core spreadsheet conversion pipeline."""
+
+import hashlib
+import html
+from typing import Any, BinaryIO, Optional
+from warnings import warn
+
+from markitdown import DocumentConverterResult, StreamInfo
+from markitdown.converters import XlsxConverter
+
+from ._ocr_service import LLMVisionOCRService, _extract_text_with_metadata
+
+
+class XlsxConverterWithOCR(XlsxConverter):
+    """Recognize embedded images while inheriting native XLSX conversion."""
+
+    def __init__(self, ocr_service: Optional[LLMVisionOCRService] = None):
+        super().__init__()
+        if not hasattr(XlsxConverter, "_image_to_html"):
+            raise RuntimeError(
+                "XLSX OCR requires markitdown>=0.1.8b3 for the "
+                "XlsxConverter._image_to_html hook. "
+                "Upgrade with: pip install --upgrade 'markitdown>=0.1.8b3'."
+            )
+        self.ocr_service = ocr_service
+
+    def convert(
+        self,
+        file_stream: BinaryIO,
+        stream_info: StreamInfo,
+        **kwargs: Any,
+    ) -> DocumentConverterResult:
+        kwargs["_xlsx_ocr_cache"] = {}
+        return super().convert(file_stream, stream_info, **kwargs)
+
+    def _image_to_html(
+        self,
+        image_stream: BinaryIO,
+        stream_info: StreamInfo,
+        **kwargs: Any,
+    ) -> Optional[str]:
+        ocr_service = kwargs.get("ocr_service") or self.ocr_service
+        if ocr_service is None:
+            return None
+
+        cache: dict[bytes, Optional[str]] = kwargs.get("_xlsx_ocr_cache", {})
+        key = hashlib.sha256(image_stream.read()).digest()
+        image_stream.seek(0)
+        if key in cache:
+            return cache[key]
+
+        result = _extract_text_with_metadata(ocr_service, image_stream, stream_info)
+        if result.error:
+            warn(
+                f"XLSX image OCR failed: {result.error}. Keeping the native image.",
+                RuntimeWarning,
+                stacklevel=2,
+            )
+            cache[key] = None
+            return None
+        text = result.text.strip()
+        if not text:
+            cache[key] = None
+            return None
+
+        text = text.replace("\r\n", "\n").replace("\r", "\n")
+        content = html.escape(text).replace("\n", "<br>")
+        fragment = f"<p><em>[Image OCR]<br>{content}<br>[End OCR]</em></p>"
+        cache[key] = fragment
+        return fragment

{markitdown_ocr-0.1.1b2 → markitdown_ocr-0.1.2}/tests/test_docx_converter.py

@@ -4,10 +4,8 @@ Unit tests for DocxConverterWithOCR.
 For each DOCX test file: convert with a mock OCR service then compare the
 full output string against the expected snapshot.
 
-OCR block format used by the converter:
-    *[Image OCR]
-    MOCK_OCR_TEXT_12345
-    [End OCR]*
+OCR blocks pass through the shared HTML converter, including literal-text
+escaping and two-space Markdown hard breaks in direct conversion.
 """
 
 import io
@@ -30,6 +28,7 @@ from markitdown import StreamInfo  # noqa: E402
 TEST_DATA_DIR = Path(__file__).parent / "ocr_test_data"
 
 _MOCK_TEXT = "MOCK_OCR_TEXT_12345"
+_MOCK_BLOCK = "*[Image OCR]  \nMOCK\\_OCR\\_TEXT\\_12345  \n[End OCR]*"
 
 
 class MockOCRService:
@@ -52,7 +51,7 @@ def _convert(filename: str, ocr_service: MockOCRService) -> str:
     with open(path, "rb") as f:
         return converter.convert(
             f, StreamInfo(extension=".docx"), ocr_service=ocr_service
-        ).text_content
+        ).markdown
 
 
 # ---------------------------------------------------------------------------
@@ -63,7 +62,7 @@ def _convert(filename: str, ocr_service: MockOCRService) -> str:
 def test_docx_image_start(svc: MockOCRService) -> None:
     expected = (
         "Document with Image at Start\n\n"
-        "*[Image OCR]\nMOCK_OCR_TEXT_12345\n[End OCR]*\n\n"
+        f"{_MOCK_BLOCK}\n\n"
         "This is the main content after the header image.\n\n"
         "More text content here."
     )
@@ -80,7 +79,7 @@ def test_docx_image_middle(svc: MockOCRService) -> None:
         "# Introduction\n\n"
         "This is the introduction section.\n\n"
         "We will see an image below.\n\n"
-        "*[Image OCR]\nMOCK_OCR_TEXT_12345\n[End OCR]*\n\n"
+        f"{_MOCK_BLOCK}\n\n"
         "# Analysis\n\n"
         "This section comes after the image."
     )
@@ -98,7 +97,7 @@ def test_docx_image_end(svc: MockOCRService) -> None:
         "Main findings of the report.\n\n"
         "Details and analysis.\n\n"
         "Recommendations.\n\n"
-        "*[Image OCR]\nMOCK_OCR_TEXT_12345\n[End OCR]*"
+        f"{_MOCK_BLOCK}"
     )
     assert _convert("docx_image_end.docx", svc) == expected
 
@@ -112,9 +111,9 @@ def test_docx_multiple_images(svc: MockOCRService) -> None:
     expected = (
         "Multi-Image Document\n\n"
         "First section\n\n"
-        "*[Image OCR]\nMOCK_OCR_TEXT_12345\n[End OCR]*\n\n"
+        f"{_MOCK_BLOCK}\n\n"
         "Second section with another image\n\n"
-        "*[Image OCR]\nMOCK_OCR_TEXT_12345\n[End OCR]*\n\n"
+        f"{_MOCK_BLOCK}\n\n"
         "Conclusion"
     )
     assert _convert("docx_multiple_images.docx", svc) == expected
@@ -130,7 +129,7 @@ def test_docx_multipage(svc: MockOCRService) -> None:
         "# Page 1 - Mixed Content\n\n"
         "This is the first paragraph on page 1.\n\n"
         "BEFORE IMAGE: Important content appears here.\n\n"
-        "*[Image OCR]\nMOCK_OCR_TEXT_12345\n[End OCR]*\n\n"
+        f"{_MOCK_BLOCK}\n\n"
         "AFTER IMAGE: This content follows the image.\n\n"
         "More text on page 1.\n\n"
         "# Page 2 - Image at End\n\n"
@@ -138,9 +137,9 @@ def test_docx_multipage(svc: MockOCRService) -> None:
         "Multiple paragraphs of text.\n\n"
         "Building up to the image...\n\n"
         "Final paragraph before image.\n\n"
-        "*[Image OCR]\nMOCK_OCR_TEXT_12345\n[End OCR]*\n\n"
+        f"{_MOCK_BLOCK}\n\n"
         "# Page 3 - Image at Start\n\n"
-        "*[Image OCR]\nMOCK_OCR_TEXT_12345\n[End OCR]*\n\n"
+        f"{_MOCK_BLOCK}\n\n"
         "Content that follows the header image.\n\n"
         "AFTER IMAGE: This text is after the image."
     )
@@ -161,55 +160,11 @@ def test_docx_complex_layout(svc: MockOCRService) -> None:
         "| Authentication | Active |\n"
         "| Encryption | Enabled |\n\n"
         "Security notice:\n\n"
-        "*[Image OCR]\nMOCK_OCR_TEXT_12345\n[End OCR]*"
+        f"{_MOCK_BLOCK}"
     )
     assert _convert("docx_complex_layout.docx", svc) == expected
 
 
-# ---------------------------------------------------------------------------
-# _inject_placeholders — internal unit tests (no file I/O)
-# ---------------------------------------------------------------------------
-
-
-def test_inject_placeholders_single_image() -> None:
-    converter = DocxConverterWithOCR()
-    html = "<p>Before</p><img src='x.png'/><p>After</p>"
-    result_html, texts = converter._inject_placeholders(html, {"rId1": "TEXT"})
-    assert "<img" not in result_html
-    assert "MARKITDOWNOCRBLOCK0" in result_html
-    assert texts == ["TEXT"]
-
-
-def test_inject_placeholders_two_images_sequential_tokens() -> None:
-    converter = DocxConverterWithOCR()
-    html = "<img src='a.png'/><p>Mid</p><img src='b.png'/>"
-    result_html, texts = converter._inject_placeholders(
-        html, {"rId1": "FIRST", "rId2": "SECOND"}
-    )
-    assert "MARKITDOWNOCRBLOCK0" in result_html
-    assert "MARKITDOWNOCRBLOCK1" in result_html
-    assert result_html.index("MARKITDOWNOCRBLOCK0") < result_html.index(
-        "MARKITDOWNOCRBLOCK1"
-    )
-    assert len(texts) == 2
-
-
-def test_inject_placeholders_no_img_tag_appends_at_end() -> None:
-    converter = DocxConverterWithOCR()
-    html = "<p>No images</p>"
-    result_html, texts = converter._inject_placeholders(html, {"rId1": "ORPHAN"})
-    assert "MARKITDOWNOCRBLOCK0" in result_html
-    assert texts == ["ORPHAN"]
-
-
-def test_inject_placeholders_empty_map_leaves_html_unchanged() -> None:
-    converter = DocxConverterWithOCR()
-    html = "<p>Content</p><img src='pic.jpg'/>"
-    result_html, texts = converter._inject_placeholders(html, {})
-    assert result_html == html
-    assert texts == []
-
-
 # ---------------------------------------------------------------------------
 # No OCR service — no OCR tags emitted
 # ---------------------------------------------------------------------------
@@ -221,7 +176,7 @@ def test_docx_no_ocr_service_no_tags() -> None:
         pytest.skip(f"Test file not found: {path}")
     converter = DocxConverterWithOCR()
     with open(path, "rb") as f:
-        md = converter.convert(f, StreamInfo(extension=".docx")).text_content
+        md = converter.convert(f, StreamInfo(extension=".docx")).markdown
     assert "*[Image OCR]" not in md
     assert "[End OCR]*" not in md
 
@@ -273,7 +228,7 @@ def test_docx_styles_with_redundant_default_namespace(
     assert "# Introduction" in actual
     assert actual == expected
     if use_ocr:
-        assert _MOCK_TEXT in actual
+        assert _MOCK_BLOCK in actual
 
 
 # ---------------------------------------------------------------------------
@@ -399,8 +354,7 @@ def test_docx_zip_filename_casing_mismatch_preserves_ocr(svc: MockOCRService) ->
     """OCR output survives a .docx whose local file headers disagree with the
     central directory on casing.
 
-    The image extraction swallows every exception, so an unrepaired stream used
-    to yield an empty OCR map and silently drop the OCR blocks rather than fail.
+    The inherited core converter repairs the archive before Mammoth opens images.
     """
     path = TEST_DATA_DIR / "docx_image_middle.docx"
     if not path.exists():
@@ -424,5 +378,5 @@ def test_docx_zip_filename_casing_mismatch_preserves_ocr(svc: MockOCRService) ->
         io.BytesIO(mismatched), StreamInfo(extension=".docx"), ocr_service=svc
     ).markdown
 
-    assert _MOCK_TEXT in actual
+    assert _MOCK_BLOCK in actual
     assert actual == expected