feat: wire new lexer to pdf and epub

Author: ekassos

pyproject.toml

@@ -35,6 +35,9 @@ swift_book_epub = "swift_book_pdf.epub.cli.command:epub"
 swift_book_style = "swift_book_pdf.pdf.latex.preamble.styles:CustomSwiftBookStyle"
 swift_book_dark_style = "swift_book_pdf.pdf.latex.preamble.styles:CustomSwiftBookDarkStyle"
 
+[project.entry-points."pygments.lexers"]
+swift_book_swift = "swift_book_pdf.lexer.swift:SwiftLexer"
+
 [dependency-groups]
 dev = [
     "filelock>=3.25.2,<4.0.0",

src/swift_book_pdf/epub/render/code_blocks.py

@@ -21,7 +21,7 @@
 
 from pygments import highlight
 from pygments.formatters import HtmlFormatter
-from pygments.lexers import SwiftLexer
+from pygments.lexers import get_lexer_by_name
 
 WRAPPING_PLACEHOLDER_MIN_LENGTH = 28
 CODE_PLACEHOLDER_PATTERN = re.compile(r"<#(.*?)#>")
@@ -47,7 +47,7 @@ def render_code_block(code_lines: list[str]) -> str:
     else:
         highlighted_lines = highlight(
             "\n".join(code_lines),
-            SwiftLexer(),
+            get_lexer_by_name("swift-book-swift"),
             HtmlFormatter(nowrap=True),
         ).splitlines()
     if not highlighted_lines:
@@ -132,5 +132,7 @@ def _highlight_swift_fragment(fragment: str) -> str:
         Pygments-generated inline XHTML with trailing newlines removed.
     """
     return highlight(
-        fragment, SwiftLexer(), HtmlFormatter(nowrap=True)
+        fragment,
+        get_lexer_by_name("swift-book-swift"),
+        HtmlFormatter(nowrap=True),
     ).rstrip("\n")

src/swift_book_pdf/lexer/swift.py

@@ -709,7 +709,7 @@ class SwiftLexer(Lexer):
     """
 
     name = "Swift"
-    aliases: ClassVar[list[str]] = ["swift"]
+    aliases: ClassVar[list[str]] = ["swift-book-swift"]
     filenames: ClassVar[list[str]] = ["*.swift"]
     mimetypes: ClassVar[list[str]] = ["text/x-swift"]
 

src/swift_book_pdf/pdf/latex/templates/preamble.tex

@@ -360,7 +360,7 @@
   listing only,
   breakable,
   whole on next page if possible,
-  minted language=swift,
+  minted language=swift-book-swift,
   minted options={
     fontsize=\customsmall,
     style=$code_style,

tests/cli/test_cli.py

@@ -160,13 +160,7 @@ def test_command_help_exposes_only_relevant_options(
 
 
 def test_pygments_style_entry_points_load() -> None:
-    if sys.version_info >= (3, 11):
-        import tomllib
-    else:
-        tomllib = pytest.importorskip("tomli")
-
-    pyproject = Path(__file__).parents[2] / "pyproject.toml"
-    project_config = tomllib.loads(pyproject.read_text(encoding="utf-8"))
+    project_config = _load_pyproject_config()
     entry_points = project_config["project"]["entry-points"]["pygments.styles"]
 
     for entry_point in entry_points.values():
@@ -176,6 +170,28 @@ def test_pygments_style_entry_points_load() -> None:
         assert getattr(module, attribute_name) is not None
 
 
+def test_pygments_lexer_entry_points_load() -> None:
+    project_config = _load_pyproject_config()
+    entry_points = project_config["project"]["entry-points"]["pygments.lexers"]
+
+    for entry_point in entry_points.values():
+        module_name, attribute_name = entry_point.split(":", maxsplit=1)
+        module = import_module(module_name)
+
+        assert getattr(module, attribute_name) is not None
+
+
+def _load_pyproject_config() -> dict[str, object]:
+    toml = (
+        import_module("tomllib")
+        if sys.version_info >= (3, 11)
+        else pytest.importorskip("tomli")
+    )
+
+    pyproject = Path(__file__).parents[2] / "pyproject.toml"
+    return toml.loads(pyproject.read_text(encoding="utf-8"))
+
+
 def test_pdf_command_builds_pdf_config_and_calls_pdf_builder(
     runner: CliRunner,
     monkeypatch: pytest.MonkeyPatch,

tests/epub/test_render.py

@@ -14,6 +14,10 @@
 
 from pathlib import Path
 
+import pytest
+from pygments.lexer import Lexer
+from pygments.token import Text
+
 from swift_book_pdf.core.document import DocumentEntry
 from swift_book_pdf.epub.cover.svg import (
     CoverPageOptions,
@@ -24,6 +28,7 @@
 )
 from swift_book_pdf.epub.render import (
     LinkResolver,
+    code_blocks,
     normalize_prose_punctuation,
     render_inline,
 )
@@ -81,6 +86,28 @@ def test_render_inline_supports_code_inside_markdown_link_labels() -> None:
     )
 
 
+def test_render_code_block_uses_project_swift_lexer(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    requested_lexers = []
+
+    class StubLexer(Lexer):
+        def get_tokens_unprocessed(
+            self, text: str
+        ) -> list[tuple[int, Text, str]]:
+            return [(0, Text, text)]
+
+    def get_stub_lexer(alias: str) -> StubLexer:
+        requested_lexers.append(alias)
+        return StubLexer()
+
+    monkeypatch.setattr(code_blocks, "get_lexer_by_name", get_stub_lexer)
+
+    code_blocks.render_code_block(["let x = 1"])
+
+    assert requested_lexers == ["swift-book-swift"]
+
+
 def test_render_cover_text_emits_configured_letter_spacing() -> None:
     rendered = render_cover_text(
         "Swift",