text-compositor 0.3.6__tar.gz → 0.3.8__tar.gz

{text_compositor-0.3.6/text_compositor.egg-info → text_compositor-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: text-compositor
-Version: 0.3.6
+Version: 0.3.8
 Summary: A tool for composing multiple text files into a PDF document.
 License-Expression: MIT
 Project-URL: Repository, https://github.com/tokudiro/text-compositor
@@ -36,7 +36,7 @@ Files listed in `chapters` are handled differently depending on their extension:
 
 - `.md`/`.markdown`: converted as Markdown
 - `.yaml`/`.yml`/`.json`: rendered as monospaced text with syntax highlighting
-- `.dot`/`.gv`, `.mmd`, `.puml`/`.plantuml`/`.pu`, `.d2`: each rendered as a one-chapter diagram (Graphviz, Mermaid, PlantUML, D2 respectively)
+- `.dot`/`.gv`, `.mmd`, `.puml`/`.plantuml`/`.pu`, `.d2`, `.pikchr`: each rendered as a one-chapter diagram (Graphviz, Mermaid, PlantUML, D2, Pikchr respectively)
 - `.csv`: rendered as a structured Typst table
 - everything else (plain text, code files, etc.): rendered as plain monospaced text
 
@@ -77,7 +77,7 @@ No Typst compiler binary is bundled; it's obtained from the `typst` package (PyP
 
 ### Keeping up to date
 
-Security and bug fixes ship as new releases. There is no automatic update, so use the latest release: `pipx upgrade text-compositor` (or `pip install -U text-compositor`). For the [Obunzu Viewer](viewer/README.md), download the latest ZIP from the [Releases page](https://github.com/tokudiro/text-compositor/releases/latest). The Viewer bundles its own Python, so a new ZIP also updates that Python and the other bundled parts.
+Security and bug fixes ship as new releases. There is no automatic update, so use the latest release: `pipx upgrade text-compositor` (or `pip install -U text-compositor`). For the [Obunzu Viewer](viewer/README.md), download the latest ZIP from the [Releases page](https://github.com/tokudiro/text-compositor/releases/latest). The Viewer bundles its own Python, so a new ZIP also updates that Python and the other bundled parts. A guide to using Obunzu (in Japanese) is in [doc/obunzu-guide/](doc/obunzu-guide/); its PDF is attached to each release.
 
 ### Using Mermaid diagrams (optional)
 
@@ -163,7 +163,7 @@ with Session() as session:  # reuses the Mermaid browser and the Typst compiler
     print(result.ok, result.pdf_path, [d.message for d in result.diagnostics])
 ```
 
-`session.render_html("doc.md")` (experimental, [#161](https://github.com/tokudiro/text-compositor/issues/161)) writes a self-contained HTML file instead. Diagrams (Mermaid, PlantUML, D2, `svg`) become images next to it. `typst-exec` and raw HTML are not supported yet and are shown as code with a warning. Graphviz is drawn only in the Obunzu Viewer; elsewhere it is shown as code with a warning.
+`session.render_html("doc.md")` (experimental, [#161](https://github.com/tokudiro/text-compositor/issues/161)) writes a self-contained HTML file instead. Diagrams (Mermaid, PlantUML, D2, Graphviz, Pikchr, CeTZ, Fletcher, `svg`) become images next to it. `typst-exec` and raw HTML are not supported yet and are shown as code with a warning. Graphviz, Pikchr, CeTZ and Fletcher are drawn with the Typst packages `diagraph`, `kip`, `cetz` and `fletcher`, the same as in the PDF (Graphviz's `shape=record` and a graph-level `label` cannot be drawn and produce a warning).
 
 See [sample/text-compositor.config.yaml](sample/text-compositor.config.yaml) for how to write the config file, and the [usage guide](doc/usage/) for details on `document:`/`plugins:`, front matter, Marp directives, and more. The Markdown files listed in `chapters` are concatenated in order to produce the PDF.
 

{text_compositor-0.3.6 → text_compositor-0.3.8}/README.md

@@ -18,7 +18,7 @@ Files listed in `chapters` are handled differently depending on their extension:
 
 - `.md`/`.markdown`: converted as Markdown
 - `.yaml`/`.yml`/`.json`: rendered as monospaced text with syntax highlighting
-- `.dot`/`.gv`, `.mmd`, `.puml`/`.plantuml`/`.pu`, `.d2`: each rendered as a one-chapter diagram (Graphviz, Mermaid, PlantUML, D2 respectively)
+- `.dot`/`.gv`, `.mmd`, `.puml`/`.plantuml`/`.pu`, `.d2`, `.pikchr`: each rendered as a one-chapter diagram (Graphviz, Mermaid, PlantUML, D2, Pikchr respectively)
 - `.csv`: rendered as a structured Typst table
 - everything else (plain text, code files, etc.): rendered as plain monospaced text
 
@@ -59,7 +59,7 @@ No Typst compiler binary is bundled; it's obtained from the `typst` package (PyP
 
 ### Keeping up to date
 
-Security and bug fixes ship as new releases. There is no automatic update, so use the latest release: `pipx upgrade text-compositor` (or `pip install -U text-compositor`). For the [Obunzu Viewer](viewer/README.md), download the latest ZIP from the [Releases page](https://github.com/tokudiro/text-compositor/releases/latest). The Viewer bundles its own Python, so a new ZIP also updates that Python and the other bundled parts.
+Security and bug fixes ship as new releases. There is no automatic update, so use the latest release: `pipx upgrade text-compositor` (or `pip install -U text-compositor`). For the [Obunzu Viewer](viewer/README.md), download the latest ZIP from the [Releases page](https://github.com/tokudiro/text-compositor/releases/latest). The Viewer bundles its own Python, so a new ZIP also updates that Python and the other bundled parts. A guide to using Obunzu (in Japanese) is in [doc/obunzu-guide/](doc/obunzu-guide/); its PDF is attached to each release.
 
 ### Using Mermaid diagrams (optional)
 
@@ -145,7 +145,7 @@ with Session() as session:  # reuses the Mermaid browser and the Typst compiler
     print(result.ok, result.pdf_path, [d.message for d in result.diagnostics])
 ```
 
-`session.render_html("doc.md")` (experimental, [#161](https://github.com/tokudiro/text-compositor/issues/161)) writes a self-contained HTML file instead. Diagrams (Mermaid, PlantUML, D2, `svg`) become images next to it. `typst-exec` and raw HTML are not supported yet and are shown as code with a warning. Graphviz is drawn only in the Obunzu Viewer; elsewhere it is shown as code with a warning.
+`session.render_html("doc.md")` (experimental, [#161](https://github.com/tokudiro/text-compositor/issues/161)) writes a self-contained HTML file instead. Diagrams (Mermaid, PlantUML, D2, Graphviz, Pikchr, CeTZ, Fletcher, `svg`) become images next to it. `typst-exec` and raw HTML are not supported yet and are shown as code with a warning. Graphviz, Pikchr, CeTZ and Fletcher are drawn with the Typst packages `diagraph`, `kip`, `cetz` and `fletcher`, the same as in the PDF (Graphviz's `shape=record` and a graph-level `label` cannot be drawn and produce a warning).
 
 See [sample/text-compositor.config.yaml](sample/text-compositor.config.yaml) for how to write the config file, and the [usage guide](doc/usage/) for details on `document:`/`plugins:`, front matter, Marp directives, and more. The Markdown files listed in `chapters` are concatenated in order to produce the PDF.
 

{text_compositor-0.3.6 → text_compositor-0.3.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "text-compositor"
-version = "0.3.6"
+version = "0.3.8"
 description = "A tool for composing multiple text files into a PDF document."
 readme = "README.md"
 license = "MIT"

text_compositor-0.3.8/tests/test_bundled_typst_assets.py

@@ -0,0 +1,92 @@
+"""ViewerのZIPに同梱した、フォントとTypstのパッケージを使う仕組み（#263）のテスト。ネットワークは使わない。"""
+import os
+import re
+import urllib.request
+from pathlib import Path
+
+import pytest
+
+import text_compositor.deps as deps_mod
+from text_compositor import cetz_render, pikchr_render
+from text_compositor.compiler import TYPST_PACKAGES_ENV, typst_package_options
+from text_compositor.deps import FONT_DIR_ENV, NOTO_SANS_JP_FILES, ensure_fonts
+
+ROOT = Path(__file__).resolve().parent.parent
+
+
+@pytest.fixture
+def no_download(monkeypatch, tmp_path):
+    """取得を試みたら、失敗させる。ユーザーのキャッシュも、使い捨てにする。"""
+    monkeypatch.setattr(deps_mod, "_user_cache_dir", lambda: str(tmp_path / "cache"))
+    monkeypatch.setattr(urllib.request, "urlretrieve", lambda *a, **k: pytest.fail("downloaded"))
+
+
+class TestBundledFonts:
+    def test_a_complete_bundled_folder_is_used_without_downloading(self, tmp_path, monkeypatch, no_download):
+        bundled = tmp_path / "fonts"
+        bundled.mkdir()
+        for name in NOTO_SANS_JP_FILES:
+            (bundled / name).write_bytes(b"font")
+        monkeypatch.setenv(FONT_DIR_ENV, str(bundled))
+        assert ensure_fonts() == str(bundled)
+        assert not (tmp_path / "cache").exists()   # ユーザーのキャッシュにも、何も作らない
+
+    def test_an_incomplete_folder_warns_and_falls_back_to_the_download(self, tmp_path, monkeypatch, no_download, capsys):
+        bundled = tmp_path / "fonts"
+        bundled.mkdir()
+        (bundled / "NotoSansJP-Regular.otf").write_bytes(b"font")   # Boldが無い
+        monkeypatch.setenv(FONT_DIR_ENV, str(bundled))
+        with pytest.raises(BaseException, match="downloaded"):
+            ensure_fonts()   # 通常の取得へ進む（このテストでは、取得を失敗させてある）
+        captured = capsys.readouterr()
+        assert FONT_DIR_ENV in captured.out + captured.err   # 警告が出る（出力先は、ログの実装に任せる）
+
+    def test_without_the_variable_the_behavior_is_unchanged(self, tmp_path, monkeypatch, no_download):
+        monkeypatch.delenv(FONT_DIR_ENV, raising=False)
+        with pytest.raises(BaseException, match="downloaded"):
+            ensure_fonts()
+
+
+class TestBundledTypstPackages:
+    def test_no_variable_means_no_option(self, monkeypatch):
+        monkeypatch.delenv(TYPST_PACKAGES_ENV, raising=False)
+        assert typst_package_options() == {}
+
+    def test_an_existing_folder_becomes_package_cache_path(self, tmp_path, monkeypatch):
+        monkeypatch.setenv(TYPST_PACKAGES_ENV, str(tmp_path))
+        assert typst_package_options() == {"package_cache_path": str(tmp_path)}
+
+    def test_a_missing_folder_is_ignored(self, tmp_path, monkeypatch):
+        monkeypatch.setenv(TYPST_PACKAGES_ENV, str(tmp_path / "nope"))
+        assert typst_package_options() == {}
+
+    def test_a_bundled_package_folder_is_enough_to_compile_offline(self, tmp_path, monkeypatch):
+        """置いたパッケージだけで、`@preview/...`が解決される（ダウンロードには、頼らない）。"""
+        typst = pytest.importorskip("typst")
+        package = tmp_path / "packages" / "preview" / "mini" / "0.1.0"
+        package.mkdir(parents=True)
+        (package / "typst.toml").write_text('[package]\nname = "mini"\nversion = "0.1.0"\nentrypoint = "lib.typ"\n', encoding="utf-8")
+        (package / "lib.typ").write_text('#let hello() = [bundled]\n', encoding="utf-8")
+        source = tmp_path / "doc.typ"
+        source.write_text('#import "@preview/mini:0.1.0": hello\n#hello()\n', encoding="utf-8")
+        monkeypatch.setenv(TYPST_PACKAGES_ENV, str(tmp_path / "packages"))
+        pdf = typst.compile(str(source), root=str(tmp_path), ignore_system_fonts=True, **typst_package_options())
+        assert pdf.startswith(b"%PDF")
+
+
+def test_build_dist_pins_the_same_fonts_and_packages_as_the_tool():
+    """配布物（build-dist.js）が同梱するフォントと、Typstのパッケージの版・SHA256が、ツール本体（deps.py・テンプレート）と、
+    ずれていないこと。ずれると、配布物で、CLIと違うフォント・パッケージが使われる。"""
+    script = (ROOT / "viewer" / "scripts" / "build-dist.js").read_text(encoding="utf-8")
+    for name, sha256 in NOTO_SANS_JP_FILES.items():
+        assert f"'{name}': '{sha256}'" in script, name
+    assert deps_mod.NOTO_SANS_JP_RELEASE_URL in script
+    common = (ROOT / "text_compositor" / "templates" / "_common.typ").read_text(encoding="utf-8")
+    used = set(re.findall(r"@preview/([a-z0-9-]+):([\d.]+)", common))
+    used.add(("kip", pikchr_render.KIP_VERSION))   # Pikchr（#213）は、テンプレートではなく、生成コードが読み込む
+    # CeTZ・Fletcher（#236）も、生成コードが読み込む。Fletcher 0.5.8が内部で使うcetz 0.3.4・oxifmtと、cetz 0.5.2が使うoxifmt 1.0.0は、
+    # ネットワークなしで動くように、推移的な依存として、同梱する（同梱の不足は、viewer/scripts/check-dist.jsの、オフラインでのコンパイルが検出する）
+    used |= {("cetz", cetz_render.CETZ_VERSION), ("fletcher", cetz_render.FLETCHER_VERSION),
+             ("cetz", "0.3.4"), ("oxifmt", "0.2.1"), ("oxifmt", "1.0.0")}
+    bundled = set(re.findall(r"name: '([a-z0-9-]+)', version: '([\d.]+)'", script))
+    assert used and used == bundled, (used, bundled)

text_compositor-0.3.8/tests/test_cetz_render.py

@@ -0,0 +1,219 @@
+"""CeTZ・Fletcher（Typstのパッケージ。cetz_render.py・図のフェンスの変換、#236）のテスト。"""
+import os
+import re
+
+import pytest
+
+from text_compositor import cetz_render, diagnostics
+from text_compositor.api import build_markdown, render_html
+from text_compositor.cetz_render import FigureCodeError, FigureRenderError, check_code, render_svg
+from text_compositor.renderer import TypstRenderer
+
+REPO_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+PLAIN = {"mermaid": False, "plantuml": False, "d2": False, "graphviz": False}
+
+CETZ = 'circle((0, 0), radius: 1)\nline((0, 0), (2, 1))\ncontent((1, 0.5), [日本語])'
+FLETCHER = 'node((0, 0), [開始]), edge("->"), node((1, 0), [終了])'
+
+
+def _read(relative):
+    with open(os.path.join(REPO_ROOT, relative), encoding="utf-8") as f:
+        return f.read()
+
+
+def test_the_versions_are_the_same_in_the_source_and_the_bundle():
+    """生成コードが読み込む版と、ZIPに同梱するパッケージの版が、ずれると、配布物で、取得（ネットワーク）が起きる。"""
+    script = _read("viewer/scripts/build-dist.js")
+    bundled = set(re.findall(r"name: '([a-z0-9-]+)', version: '([\d.]+)'", script))
+    assert ("cetz", cetz_render.CETZ_VERSION) in bundled
+    assert ("fletcher", cetz_render.FLETCHER_VERSION) in bundled
+
+
+class TestCheckCode:
+    @pytest.mark.parametrize("code", [
+        'import "x.typ"',
+        '#import "x.typ"',
+        'circle((0, 0))\ninclude "a.typ"',
+        'content((0, 0), [#f({ import "/s.typ" })])',
+        'let x = {\n  import "a"\n}',
+        'content((0, 0), [#let x = { import "a" }])',
+        'f(a, (import "a"))',
+        '/* c */ import "x"',
+        '// c\nimport "x"',
+        'content((0, 0), [a #include "x"])',
+    ])
+    def test_import_and_include_are_rejected(self, code):
+        with pytest.raises(FigureCodeError):
+            check_code(code)
+
+    @pytest.mark.parametrize("code", [
+        'content((0, 0), [import])',
+        'content((0, 0), "import and include")',
+        '// import x\ncircle((0, 0))',
+        'content((0, 0), [Data (import) and include])',
+        'my-import(1)',
+        'line((0, 0), (1, 1)) /* import */',
+        'content((0, 0), `import`)',
+        'content((0, 0), [#strong[import]])',
+        'content((0, 0), "a\\"import")',
+    ])
+    def test_the_same_words_in_a_string_a_comment_or_text_are_fine(self, code):
+        check_code(code)
+
+    def test_the_error_carries_the_line_in_the_code(self):
+        with pytest.raises(FigureCodeError) as e:
+            check_code('circle((0, 0))\n\nline((0, 0), (1, 1))\nimport "x"')
+        assert e.value.code_line == 4
+
+
+class TestRender:
+    def test_cetz_becomes_an_svg_without_a_page_background(self):
+        svg = render_svg("cetz", CETZ)
+        assert svg.startswith("<svg") and 'fill="#ffffff"' not in svg
+
+    def test_fletcher_becomes_an_svg(self):
+        assert render_svg("fletcher", FLETCHER).startswith("<svg")
+
+    def test_the_compiler_is_reused_and_a_later_figure_is_not_a_leftover(self):
+        first = render_svg("cetz", "circle((0, 0))")
+        assert render_svg("cetz", "circle((0, 0))\nline((0, 0), (3, 3))") != first
+        assert render_svg("cetz", "circle((0, 0))") == first
+
+    def test_the_cetz_scope_has_the_drawing_functions_and_the_cetz_module(self):
+        assert render_svg("cetz", "let f = cetz.vector.add((1, 0, 0), (0, 1, 0))\nline((0, 0), f)").startswith("<svg")
+
+    def test_a_typst_error_is_reported_with_its_message(self):
+        with pytest.raises(FigureRenderError) as e:
+            render_svg("fletcher", 'node((0, 0), [A]), nope(1)')
+        assert "unknown variable: nope" in str(e.value)
+        assert render_svg("cetz", "circle((0, 0))").startswith("<svg")   # エラーの後でも、同じCompilerで、次の図が描ける
+
+    @pytest.mark.parametrize("kind, code", [
+        ("cetz", 'content((0, 0), read("/etc/passwd"))'),
+        ("cetz", 'content((0, 0), std.read("x"))'),
+        ("cetz", 'content((0, 0), eval("1"))'),
+        ("cetz", 'content((0, 0), str(json("x.json")))'),
+        ("cetz", 'let f = read\ncontent((0, 0), f("x"))'),
+        ("cetz", 'pdf.embed("x")'),
+        ("fletcher", 'node((0, 0), read("x"))'),
+        ("fletcher", 'node((0, 0), std.plugin("x"))'),
+    ])
+    def test_functions_that_read_files_are_denied_with_a_clear_message(self, kind, code):
+        with pytest.raises(FigureRenderError) as e:
+            render_svg(kind, code)
+        assert "is not available" in str(e.value) or "no key" in str(e.value) or "dictionary" in str(e.value), str(e.value)
+
+    def test_import_is_rejected_before_typst_runs(self):
+        with pytest.raises(FigureCodeError):
+            render_svg("cetz", 'import "/secret.typ"')
+
+    def test_the_code_is_passed_as_data_so_quotes_and_typst_syntax_are_harmless(self):
+        assert render_svg("cetz", 'content((0, 0), "#panic(\\"x\\") $ \\\\ ")').startswith("<svg")
+
+
+def _html(tmp_path, text, name="doc.md", plugins=PLAIN):
+    md = tmp_path / name
+    md.write_text(text, encoding="utf-8")
+    result = render_html(str(md), plugins=plugins)
+    html = open(result.html_path, encoding="utf-8").read() if result.ok else ""
+    return result, html
+
+
+class TestHtmlOutput:
+    @pytest.mark.parametrize("lang, code", [("cetz", CETZ), ("fletcher", FLETCHER)])
+    def test_a_fence_becomes_a_cached_svg_img(self, tmp_path, lang, code):
+        result, html = _html(tmp_path, f'a\n\n```{lang} {{width=300pt}}\n{code}\n```\n')
+        assert result.ok and not result.warnings
+        m = re.search(rf'<img src="([^"]+)" alt="{lang} diagram" style="width:300pt">', html)
+        assert m, html
+        assert (tmp_path / ".text-compositor" / m.group(1)).read_text(encoding="utf-8").startswith("<svg")
+
+    def test_a_typst_error_is_reported_at_the_line_of_the_fence(self, tmp_path):
+        result, _ = _html(tmp_path, 'a\n\n```fletcher\nnode((0, 0), [A]\n```\n')
+        assert not result.ok
+        error = result.errors[0]
+        assert error.message == "Fletcher diagram failed to render"
+        assert error.line == 3 and "unclosed delimiter" in error.detail
+
+    def test_import_is_reported_at_the_line_in_the_manuscript(self, tmp_path):
+        # フェンスは3行目。`import`は、コードの3行目で、原稿の6行目
+        result, _ = _html(tmp_path, 'a\n\n```cetz\ncircle((0, 0))\nline((0, 0), (1, 1))\nimport "/secret.typ"\n```\n')
+        assert not result.ok
+        assert result.errors[0].line == 6 and "'import' cannot be used" in result.errors[0].detail
+
+    def test_a_denied_function_is_an_error_not_a_file_read(self, tmp_path):
+        (tmp_path / "secret.txt").write_text("TOP-SECRET", encoding="utf-8")
+        result, html = _html(tmp_path, '```cetz\ncontent((0, 0), read("/secret.txt"))\n```\n')
+        assert not result.ok and "is not available" in result.errors[0].detail
+        assert "TOP-SECRET" not in html
+
+    @pytest.mark.parametrize("lang", ["cetz", "fletcher"])
+    def test_the_plugin_setting_falls_back_to_a_code_block_without_a_warning(self, tmp_path, lang):
+        result, html = _html(tmp_path, f'```{lang}\nnode((0, 0), [x])\n```\n', plugins={**PLAIN, lang: False})
+        assert result.ok and f'class="language-{lang}"' in html and not result.warnings
+
+    def test_one_plugin_setting_does_not_disable_the_other(self, tmp_path):
+        result, html = _html(tmp_path, f'```cetz\n{CETZ}\n```\n\n```fletcher\n{FLETCHER}\n```\n', plugins={**PLAIN, "cetz": False})
+        assert result.ok and 'class="language-cetz"' in html and 'alt="fletcher diagram"' in html
+
+
+class TestPdfCode:
+    def _render(self, text, **kwargs):
+        renderer = TypstRenderer(line_mapping="off", **kwargs)
+        with diagnostics.collect():
+            return renderer.render(text, filepath="doc.md")
+
+    def test_the_fence_becomes_code_that_imports_the_pinned_package_and_evals_the_code_as_a_string(self):
+        code = self._render(f'```cetz\n{CETZ}\n```\n')
+        assert f'import "@preview/cetz:{cetz_render.CETZ_VERSION}"' in code
+        assert 'eval("circle((0, 0), radius: 1)\\nline' in code and 'mode: "code"' in code
+        assert "measure(fig)" in code   # 自動縮小
+
+    def test_fletcher_wraps_the_code_in_diagram(self):
+        code = self._render(f'```fletcher\n{FLETCHER}\n```\n')
+        assert f'import "@preview/fletcher:{cetz_render.FLETCHER_VERSION}"' in code
+        assert 'eval("diagram(\\n" + "node((0, 0)' in code
+
+    def test_the_file_reading_functions_are_denied_in_the_generated_code(self):
+        code = self._render('```cetz\ncircle((0, 0))\n```\n')
+        assert '"read", "json"' in code and "std: denied" in code
+
+    def test_a_size_attribute_scales_to_that_size(self):
+        code = self._render('```cetz {width=5cm}\ncircle((0, 0))\n```\n')
+        assert "(5cm)" in code and "scale(s * 100%" in code and "calc.min" in code   # 縦横比を保つ（引き伸ばさない）
+        code = self._render('```fletcher {width=50%}\nnode((0, 0), [A])\n```\n')
+        assert "50 * 1% * size.width" in code
+
+    def test_it_is_generated_without_touching_the_templates_public_names(self):
+        """カスタムテンプレートが、新しい公開名を、持たなくても、動く（生成コードが、パッケージを直接importする）。"""
+        code = self._render('```cetz\ncircle((0, 0))\n```\n')
+        assert "render-cetz" not in code and "render-fletcher" not in code
+
+    def test_the_plugin_setting_leaves_a_plain_code_block(self):
+        code = self._render('```cetz\ncircle((0, 0))\n```\n', cetz_enabled=False)
+        assert "@preview/cetz" not in code and "circle" in code
+
+    def test_import_stops_the_build_at_the_line_in_the_manuscript(self):
+        renderer = TypstRenderer(line_mapping="off")
+        with diagnostics.collect() as sink:
+            with pytest.raises(SystemExit):
+                renderer.render('a\n\n```cetz\ncircle((0, 0))\nimport "x"\n```\n', filepath="doc.md")
+        errors = sink.errors
+        assert errors and errors[0].line == 5 and "'import' cannot be used" in errors[0].detail
+
+
+def test_a_pdf_with_both_figures_is_built(tmp_path):
+    md = tmp_path / "doc.md"
+    md.write_text(f'# 図\n\n```cetz\n{CETZ}\n```\n\n```fletcher\n{FLETCHER}\n```\n\n'
+                  '```cetz {width=5cm}\ncircle((0, 0))\n```\n\n```fletcher {width=50% height=3cm}\n'
+                  'node((0, 0), [A]), edge("->"), node((1, 0), [B])\n```\n', encoding="utf-8")
+    result = build_markdown(str(md), str(tmp_path / "doc.pdf"))
+    assert result.ok, [(e.message, e.detail) for e in result.errors]
+    assert (tmp_path / "doc.pdf").read_bytes().startswith(b"%PDF")
+
+
+def test_a_denied_function_in_the_pdf_is_a_compile_error(tmp_path):
+    md = tmp_path / "doc.md"
+    md.write_text('```cetz\ncontent((0, 0), read("/secret.txt"))\n```\n', encoding="utf-8")
+    result = build_markdown(str(md), str(tmp_path / "doc.pdf"))
+    assert not result.ok and "is not available" in result.errors[0].message

{text_compositor-0.3.6 → text_compositor-0.3.8}/tests/test_check_pins.py

@@ -20,7 +20,7 @@ def test_read_pins_finds_every_pin_in_the_sources(check_pins):
     pins = check_pins.read_pins()
     missing = [name for name, version in pins.items() if version is None]
     assert missing == []
-    for name in ("Mermaid", "Viz.js", "PlantUML", "D2", "Temurin JRE 21", "Noto Sans JP", "組込版Python"):
+    for name in ("Mermaid", "PlantUML", "D2", "Temurin JRE 21", "Noto Sans JP", "組込版Python"):
         assert name in pins
     assert any(name.startswith("Typstパッケージ ") for name in pins)
 
@@ -28,7 +28,6 @@ def test_read_pins_finds_every_pin_in_the_sources(check_pins):
 def test_read_pins_matches_the_source_constants(check_pins):
     from text_compositor import deps
     pins = check_pins.read_pins()
-    assert pins["Viz.js"] == deps.VIZ_JS_VERSION
     assert f"v{pins['D2']}" == deps.D2_RELEASE
     assert f"jdk-{pins['Temurin JRE 21']}" == deps.TEMURIN_JRE_RELEASE
 

{text_compositor-0.3.6 → text_compositor-0.3.8}/tests/test_diagram_cache_key.py

@@ -1,7 +1,7 @@
 """図のキャッシュキーを複合ハッシュにする設計（#26）のリグレッションテスト。"""
 import os
 
-import text_compositor.renderer as renderer_mod
+import text_compositor.renderer_diagrams as diagrams_mod
 from text_compositor.deps import D2_RELEASE
 from text_compositor.renderer import TypstRenderer, _diagram_cache_key
 
@@ -33,13 +33,13 @@ class TestDiagramCachePath:
         assert os.path.isdir(os.path.dirname(path))
 
     def test_d2_version_uses_system_d2_output(self, tmp_path, monkeypatch):
-        monkeypatch.setattr(renderer_mod, "find_system_d2", lambda: "/usr/bin/d2")
-        monkeypatch.setattr(renderer_mod, "_system_d2_version", lambda _bin: "v9.9.9")
+        monkeypatch.setattr(diagrams_mod, "find_system_d2", lambda: "/usr/bin/d2")
+        monkeypatch.setattr(diagrams_mod, "_system_d2_version", lambda _bin: "v9.9.9")
         renderer = TypstRenderer(base_dir=str(tmp_path), line_mapping="off")
         assert renderer._d2_version() == "v9.9.9"
 
     def test_d2_version_falls_back_to_pinned_release_without_downloading(self, tmp_path, monkeypatch):
-        monkeypatch.setattr(renderer_mod, "find_system_d2", lambda: None)
-        monkeypatch.setattr(renderer_mod, "ensure_d2_binary", lambda: (_ for _ in ()).throw(AssertionError("must not download")))
+        monkeypatch.setattr(diagrams_mod, "find_system_d2", lambda: None)
+        monkeypatch.setattr(diagrams_mod, "ensure_d2_binary", lambda: (_ for _ in ()).throw(AssertionError("must not download")))
         renderer = TypstRenderer(base_dir=str(tmp_path), line_mapping="off")
         assert renderer._d2_version() == D2_RELEASE

{text_compositor-0.3.6 → text_compositor-0.3.8}/tests/test_distribution.py

@@ -1,6 +1,7 @@
 """Viewerの配布物（#168）の前提のテスト。
 
-- PDF専用の依存（typst）と、Mermaid用のplaywrightが、なくても、HTML出力が動くこと（配布物に、同梱しない）。
+- typstとMermaid用のplaywrightが、なくても、Graphviz以外のHTML出力が動くこと（pipで入れる場合の、最小の構成。
+  Graphvizは、Typstのdiagraphで描くため（#264）、typstが要る。配布物は、typstを同梱する。#263）。
 - 配布物のPython依存（viewer/dist-requirements.txt）が、pyproject.tomlの依存と、ずれていないこと。"""
 import json
 import re
@@ -41,7 +42,19 @@ class TestWithoutTypstAndPlaywright:
             "from text_compositor.compiler import typst_lib\n"
             "try:\n    typst_lib.compile\nexcept ImportError as e:\n    print('IMPORTERROR', e)")
         result = run_python(code, tmp_path)
-        assert "IMPORTERROR" in result.stdout and "not needed for HTML output" in result.stdout
+        assert "IMPORTERROR" in result.stdout and "pip install typst" in result.stdout
+
+    def test_graphviz_in_html_output_without_typst_is_an_error_that_says_what_is_missing(self, tmp_path):
+        md = tmp_path / "doc.md"
+        md.write_text("```dot\ndigraph { a -> b }\n```\n", encoding="utf-8")
+        code = self.BLOCK + (
+            "import json\nfrom text_compositor.api import render_html\n"
+            f"r = render_html({str(md)!r}, plugins={{'mermaid': False, 'plantuml': False, 'd2': False}})\n"
+            "print(json.dumps({'ok': r.ok, 'detail': [d.detail for d in r.errors]}))")
+        result = run_python(code, tmp_path)
+        assert result.returncode == 0, result.stderr
+        reply = json.loads(result.stdout.strip().splitlines()[-1])
+        assert reply["ok"] is False and "pip install typst" in reply["detail"][0]
 
 
 def _pins(lines):
@@ -60,9 +73,11 @@ def test_the_distribution_requirements_follow_pyproject():
     project = _pins(dependencies.splitlines())
     dist = _pins((ROOT / "viewer" / "dist-requirements.txt").read_text(encoding="utf-8").splitlines())
 
-    assert "typst" in project and "typst" not in dist   # PDF専用のため、同梱しない
     assert dist, "no pinned requirements found"
     for name, version in dist.items():
         assert project.get(name) == version, f"{name}: dist {version} != pyproject {project.get(name)}"
-    # HTML出力に必要なもの（typst以外）は、すべて同梱する
-    assert set(project) - {"typst"} == set(dist)
+    # typstは、Typstを通す処理のために、同梱する（#263。#237で決めた）。Mermaid用のplaywrightは、pyprojectの必須の依存ではなく、
+    # ElectronのChromiumで描画するため、同梱しない
+    assert "typst" in project and "typst" in dist
+    assert "playwright" not in dist
+    assert set(project) == set(dist)

{text_compositor-0.3.6 → text_compositor-0.3.8}/tests/test_download.py

@@ -9,7 +9,7 @@ import zipfile
 
 import pytest
 
-from text_compositor.deps import DOWNLOAD_ATTEMPTS, VIZ_JS_URL, VIZ_JS_VERSION, _download, ensure_fonts, ensure_mermaid_js, ensure_viz_js
+from text_compositor.deps import DOWNLOAD_ATTEMPTS, _download, ensure_fonts, ensure_mermaid_js
 import text_compositor.deps as deps_mod
 import time
 import urllib.request
@@ -186,32 +186,6 @@ class TestOtherDownloads:
         path = ensure_mermaid_js()
         assert open(path, "rb").read() == content
 
-    def test_viz_js_is_verified_by_checksum_and_only_a_verified_file_is_kept(self, tmp_path, monkeypatch):
-        monkeypatch.setattr(deps_mod, "_user_cache_dir", lambda: str(tmp_path / "cache"))
-        monkeypatch.setattr(time, "sleep", lambda seconds: None)
-
-        def fetch(content):
-            def retrieve(url, filename):
-                with open(filename, "wb") as f:
-                    f.write(content)
-            return retrieve
-
-        monkeypatch.setattr(deps_mod, "VIZ_JS_SHA256", hashlib.sha256(b"viz-bundle").hexdigest())
-        monkeypatch.setattr(urllib.request, "urlretrieve", fetch(b"tampered"))
-        with pytest.raises(SystemExit):
-            ensure_viz_js()
-        assert list((tmp_path / "cache" / "viz").iterdir()) == []   # 検証に通らなければ、何も残らない
-
-        monkeypatch.setattr(urllib.request, "urlretrieve", fetch(b"viz-bundle"))
-        path = ensure_viz_js()
-        assert open(path, "rb").read() == b"viz-bundle"
-        # 取得済みなら、ネットワークを使わない
-        monkeypatch.setattr(urllib.request, "urlretrieve", lambda *a: pytest.fail("downloaded again"))
-        assert ensure_viz_js() == path
-
-    def test_the_pinned_viz_js_url_names_the_pinned_version(self):
-        assert f"@viz-js/viz@{VIZ_JS_VERSION}/" in VIZ_JS_URL
-
     def test_plantuml_jar_cached_by_an_older_version_is_not_reused(self, tmp_path, monkeypatch):
         """版を上げたとき、取得済みの古いjar（固定名plantuml-mit.jar）が使われ続けると、修正が届かない（#240）。"""
         cache = tmp_path / "cache"

text_compositor-0.3.8/tests/test_emphasis_lint.py

@@ -0,0 +1,111 @@
+"""効かずに、文字として残った太字（`**`）の警告（emphasis_lint.py、#215）のテスト。"""
+import os
+
+import pytest
+
+from text_compositor import diagnostics
+from text_compositor.api import render_html
+from text_compositor.emphasis_lint import find_unapplied_bold
+from text_compositor.renderer import TypstRenderer
+
+PLAIN = {"mermaid": False, "plantuml": False, "d2": False, "graphviz": False}
+
+
+def _inline(text):
+    md = TypstRenderer(line_mapping="off").md
+    return [t for t in md.parse(text) if t.type == "inline"][0]
+
+
+def _inline_children(text):
+    return _inline(text).children
+
+
+def _find(text):
+    inline = _inline(text)
+    return find_unapplied_bold(inline.children, inline.content)
+
+
+class TestFindUnappliedBold:
+    @pytest.mark.parametrize("text, snippet", [
+        ("これは**「重要」**です。", "**「重要」**"),
+        ("結果は**100%**です", "**100%**"),
+        ("**注意：**この点に注意", "**注意：**"),
+        ("値は**（仮）**とする", "**（仮）**"),
+    ])
+    def test_finds_bold_that_commonmark_did_not_apply(self, text, snippet):
+        assert _find(text)[0] == (0, snippet)
+
+    @pytest.mark.parametrize("text", [
+        "これは**重要**です。",          # 日本語の文字に挟まれても、効く
+        "これは **重要** です。",
+        "「**重要**」です",
+        "**注意:** この点",
+        "`**code**`",                    # コードスパン
+        r"\*\*not bold\*\*",             # エスケープ
+        "a ** b ** c",                   # 空白で挟まれた`**`は、太字のつもりではない
+        "def f(*args, **kwargs)",        # `**`が1つだけ
+        "2**3 and 4**5",                 # 数字の間は、太字として効く
+        "__太字__です",                   # `__`は、対象外
+        "**a**b**c**",
+        "普通の文章です。",
+    ])
+    def test_does_not_flag_what_is_fine(self, text):
+        assert _find(text) == []
+
+    def test_reports_the_line_offset_inside_a_multi_line_paragraph(self):
+        found = _find("1行目です。\n2行目は**「重要」**です。\n3行目。")
+        assert found == [(1, "**「重要」**")]
+
+    def test_bold_around_a_code_span_is_found_with_a_placeholder(self):
+        assert _find("式は**`x`**です") == [(0, "**…**")]
+
+    def test_a_long_match_is_shortened(self):
+        found = _find("あ**「" + "長" * 80 + "」**い")
+        assert len(found[0][1]) == 40 and found[0][1].endswith("…")
+
+    def test_no_children_is_fine(self):
+        assert find_unapplied_bold(None) == []
+
+
+def _html_warnings(tmp_path, text):
+    md = tmp_path / "doc.md"
+    md.write_text(text, encoding="utf-8")
+    result = render_html(str(md), plugins=PLAIN)
+    return result, [w for w in result.warnings if "Bold markup" in w.message]
+
+
+class TestHtmlOutput:
+    def test_a_failed_bold_is_a_warning_with_the_manuscript_line(self, tmp_path):
+        result, warnings = _html_warnings(tmp_path, "# 見出し\n\n本文です。\n\nこれは**「重要」**です。\n")
+        assert result.ok
+        assert len(warnings) == 1 and warnings[0].line == 5
+        assert "**「重要」**" in warnings[0].message and "space" in warnings[0].message
+
+    def test_the_line_counts_the_lines_inside_a_paragraph_and_after_a_layout_block(self, tmp_path):
+        text = "a\n\n::: layout-right\n```mermaid\ngraph TD\n A-->B\n```\n本文\n:::\n\n1行目\n2行目は**「重要」**です\n"
+        _, warnings = _html_warnings(tmp_path, text)
+        assert [w.line for w in warnings] == [12]
+
+    def test_a_working_bold_and_code_are_not_flagged(self, tmp_path):
+        _, warnings = _html_warnings(tmp_path, "これは**重要**です。\n\n`**code**`\n\n```\n**fence**\n```\n")
+        assert warnings == []
+
+    def test_the_text_is_still_shown(self, tmp_path):
+        result, _ = _html_warnings(tmp_path, "これは**「重要」**です。\n")
+        with open(result.html_path, encoding="utf-8") as f:
+            assert "<p>これは**「重要」**です。</p>" in f.read()
+
+    def test_a_table_cell_and_a_list_item_are_checked(self, tmp_path):
+        text = "| a | b |\n| - | - |\n| **「x」**です | y |\n\n- 項目**（仮）**です\n"
+        _, warnings = _html_warnings(tmp_path, text)
+        assert [w.line for w in warnings] == [3, 5]
+
+
+class TestPdfPath:
+    def test_the_pdf_renderer_warns_with_the_line(self, tmp_path):
+        renderer = TypstRenderer(line_mapping="off")
+        with diagnostics.collect() as collected:
+            renderer.render("# 見出し\n\n本文\n\nこれは**「重要」**です。\n", filepath=str(tmp_path / "doc.md"))
+        warnings = [w for w in collected.warnings if "Bold markup" in w.message]
+        assert len(warnings) == 1 and warnings[0].line == 5
+        assert os.path.basename(warnings[0].file) == "doc.md"