text-compositor 0.4.0__tar.gz → 0.4.2__tar.gz

{text_compositor-0.4.0 → text_compositor-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: text-compositor
-Version: 0.4.0
+Version: 0.4.2
 Summary: A tool for composing multiple text files into a PDF document.
 License-Expression: MIT
 Project-URL: Repository, https://github.com/tokudiro/text-compositor
@@ -11,7 +11,7 @@ Requires-Dist: typst==0.15.0
 Requires-Dist: markdown-it-py==4.2.0
 Requires-Dist: mdit-py-plugins==0.6.1
 Requires-Dist: PyYAML==6.0.3
-Requires-Dist: platformdirs==4.11.10
+Requires-Dist: platformdirs==4.11.14
 Provides-Extra: mermaid
 Requires-Dist: playwright==1.63.0; extra == "mermaid"
 Dynamic: license-file
@@ -87,13 +87,13 @@ This is only needed if your source documents use ` ```mermaid ` fences (or speci
 
 ```bash
 pipx install "text-compositor[mermaid]"
-# or, if already installed: pipx inject text-compositor playwright==1.62.0
+# or, if already installed: pipx inject text-compositor playwright==1.63.0
 ```
 
 With Option B (clone and run directly):
 
 ```bash
-pip install playwright==1.62.0
+pip install playwright==1.63.0
 ```
 
 - **A Google Chrome or Microsoft Edge installation already present on your system** (no new download by default; it's auto-detected and reused at build time)
@@ -175,7 +175,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, Structurizr, 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).
+`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, Structurizr, Graphviz, Pikchr, CeTZ, Fletcher, timeliney, Vega-Lite, Vega, `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, Fletcher and timeliney are drawn with the Typst packages `diagraph`, `kip`, `cetz`, `fletcher` and `timeliney`, 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.4.0 → text_compositor-0.4.2}/README.md

@@ -69,13 +69,13 @@ This is only needed if your source documents use ` ```mermaid ` fences (or speci
 
 ```bash
 pipx install "text-compositor[mermaid]"
-# or, if already installed: pipx inject text-compositor playwright==1.62.0
+# or, if already installed: pipx inject text-compositor playwright==1.63.0
 ```
 
 With Option B (clone and run directly):
 
 ```bash
-pip install playwright==1.62.0
+pip install playwright==1.63.0
 ```
 
 - **A Google Chrome or Microsoft Edge installation already present on your system** (no new download by default; it's auto-detected and reused at build time)
@@ -157,7 +157,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, Structurizr, 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).
+`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, Structurizr, Graphviz, Pikchr, CeTZ, Fletcher, timeliney, Vega-Lite, Vega, `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, Fletcher and timeliney are drawn with the Typst packages `diagraph`, `kip`, `cetz`, `fletcher` and `timeliney`, 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.4.0 → text_compositor-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "text-compositor"
-version = "0.4.0"
+version = "0.4.2"
 description = "A tool for composing multiple text files into a PDF document."
 readme = "README.md"
 license = "MIT"
@@ -14,7 +14,7 @@ dependencies = [
     "markdown-it-py==4.2.0",
     "mdit-py-plugins==0.6.1",
     "PyYAML==6.0.3",
-    "platformdirs==4.11.10",
+    "platformdirs==4.11.14",
 ]
 
 # plugins.mermaid: true（既定）を使う場合のみ必要（11章）。

{text_compositor-0.4.0 → text_compositor-0.4.2}/tests/test_asset_resolution.py

@@ -2,6 +2,7 @@
 
 いずれも仕様9章のFail-fast方針どおり、画像欠損時はフォールバックせず即エラー終了する。
 """
+import base64
 import os
 
 import pytest
@@ -51,6 +52,47 @@ class TestResolveAsset:
         assert renderer._resolve_asset("a.png") == "/project/a.png"
 
 
+class TestResolveDataUriAsset:
+    """`data:`のURI画像は、キャッシュへ書き出してから解決する。PDF（Typstの#image()）は、data:のURIを
+    直接受け取れないため（HTMLと挙動をそろえ、`Image not found`のエラーにしない。#238）。"""
+
+    PNG_BASE64 = base64.b64encode(b"\x89PNG\r\n\x1a\n" + b"\x00" * 10).decode()
+
+    def _renderer(self, tmp_path):
+        renderer = TypstRenderer(line_mapping="off", base_dir=str(tmp_path), typst_root=str(tmp_path))
+        renderer.current_dir = str(tmp_path)
+        renderer.current_file = str(tmp_path / "doc.md")
+        return renderer
+
+    def test_data_uri_is_written_to_the_cache_and_resolved(self, tmp_path):
+        renderer = self._renderer(tmp_path)
+        result = renderer._resolve_asset(f"data:image/png;base64,{self.PNG_BASE64}")
+        assert result.startswith("/.text-compositor/cache/datauri_") and result.endswith(".png")
+        cache_path = tmp_path / result.lstrip("/")
+        assert cache_path.is_file()
+        assert cache_path.read_bytes() == base64.b64decode(self.PNG_BASE64)
+
+    def test_the_same_data_uri_reuses_the_cached_file(self, tmp_path):
+        renderer = self._renderer(tmp_path)
+        src = f"data:image/png;base64,{self.PNG_BASE64}"
+        first = renderer._resolve_asset(src)
+        cache_path = tmp_path / first.lstrip("/")
+        mtime = cache_path.stat().st_mtime_ns
+        second = renderer._resolve_asset(src)
+        assert second == first
+        assert cache_path.stat().st_mtime_ns == mtime
+
+    def test_unsupported_mime_type_exits(self, tmp_path):
+        renderer = self._renderer(tmp_path)
+        with pytest.raises(SystemExit):
+            renderer._resolve_asset("data:application/pdf;base64,AAAA")
+
+    def test_non_base64_data_uri_exits(self, tmp_path):
+        renderer = self._renderer(tmp_path)
+        with pytest.raises(SystemExit):
+            renderer._resolve_asset("data:image/png,not-base64-encoded")
+
+
 class TestResolveProjectImagePath:
     """document.background/logo、chapters[].background/logo（project_dir基準）の解決。"""
 

{text_compositor-0.4.0 → text_compositor-0.4.2}/tests/test_bundled_diagram_tools.py

@@ -143,3 +143,9 @@ def test_build_dist_pins_the_same_java_plantuml_d2_structurizr_and_mermaid_as_th
 
     assert deps_mod.MERMAID_JS_URL in script
     assert deps_mod.MERMAID_JS_SHA256 in script
+
+    # Vega・Vega-Lite（#351）
+    assert deps_mod.VEGA_JS_URL in script
+    assert deps_mod.VEGA_JS_SHA256 in script
+    assert deps_mod.VEGA_LITE_JS_URL in script
+    assert deps_mod.VEGA_LITE_JS_SHA256 in script

{text_compositor-0.4.0 → text_compositor-0.4.2}/tests/test_bundled_typst_assets.py

@@ -84,9 +84,12 @@ def test_build_dist_pins_the_same_fonts_and_packages_as_the_tool():
     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の、オフラインでのコンパイルが検出する）
+    # CeTZ・Fletcher（#236）・timeliney（#294）も、生成コードが読み込む。Fletcher 0.5.8が内部で使うcetz 0.3.4・oxifmt、
+    # cetz 0.5.2が使うoxifmt 1.0.0、timeliney 0.4.0が使うcetz 0.4.1は、ネットワークなしで動くように、推移的な依存として、
+    # 同梱する（同梱の不足は、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")}
+             ("timeliney", cetz_render.TIMELINEY_VERSION),
+             ("cetz", "0.3.4"), ("cetz", cetz_render.TIMELINEY_CETZ_VERSION),
+             ("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.4.0 → text_compositor-0.4.2}/tests/test_cetz_render.py

@@ -1,4 +1,4 @@
-"""CeTZ・Fletcher（Typstのパッケージ。cetz_render.py・図のフェンスの変換、#236）のテスト。"""
+"""CeTZ・Fletcher・timeliney（Typstのパッケージ。cetz_render.py・図のフェンスの変換、#236・#294）のテスト。"""
 import os
 import re
 
@@ -14,6 +14,7 @@ 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), [終了])'
+TIMELINEY = 'headerline(group(([*2024*], 2)))\ntaskgroup(title: [日本語], {\n  task("A", (0, 1))\n})'
 
 
 def _read(relative):
@@ -27,6 +28,8 @@ def test_the_versions_are_the_same_in_the_source_and_the_bundle():
     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
+    assert ("timeliney", cetz_render.TIMELINEY_VERSION) in bundled
+    assert ("cetz", cetz_render.TIMELINEY_CETZ_VERSION) in bundled
 
 
 class TestCheckCode:
@@ -74,6 +77,9 @@ class TestRender:
     def test_fletcher_becomes_an_svg(self):
         assert render_svg("fletcher", FLETCHER).startswith("<svg")
 
+    def test_timeliney_becomes_an_svg(self):
+        assert render_svg("timeliney", TIMELINEY).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
@@ -97,6 +103,7 @@ class TestRender:
         ("cetz", 'pdf.embed("x")'),
         ("fletcher", 'node((0, 0), read("x"))'),
         ("fletcher", 'node((0, 0), std.plugin("x"))'),
+        ("timeliney", 'task(str(read("x")), (0, 1))'),
     ])
     def test_functions_that_read_files_are_denied_with_a_clear_message(self, kind, code):
         with pytest.raises(FigureRenderError) as e:
@@ -120,7 +127,7 @@ def _html(tmp_path, text, name="doc.md", plugins=PLAIN):
 
 
 class TestHtmlOutput:
-    @pytest.mark.parametrize("lang, code", [("cetz", CETZ), ("fletcher", FLETCHER)])
+    @pytest.mark.parametrize("lang, code", [("cetz", CETZ), ("fletcher", FLETCHER), ("timeliney", TIMELINEY)])
     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
@@ -147,7 +154,7 @@ class TestHtmlOutput:
         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"])
+    @pytest.mark.parametrize("lang", ["cetz", "fletcher", "timeliney"])
     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
@@ -174,6 +181,12 @@ class TestPdfCode:
         assert f'import "@preview/fletcher:{cetz_render.FLETCHER_VERSION}"' in code
         assert 'eval("diagram(\\n" + "node((0, 0)' in code
 
+    def test_timeliney_wraps_the_code_in_timeline(self):
+        code = self._render(f'```timeliney\n{TIMELINEY}\n```\n')
+        assert f'import "@preview/timeliney:{cetz_render.TIMELINEY_VERSION}"' in code
+        assert 'timeliney.timeline(show-grid: true, { eval(' in code
+        assert 'eval("headerline(group' 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
@@ -184,6 +197,14 @@ class TestPdfCode:
         code = self._render('```fletcher {width=50%}\nnode((0, 0), [A])\n```\n')
         assert "50 * 1% * size.width" in code
 
+    def test_a_size_attribute_on_timeliney_sets_the_container_width_instead_of_scaling(self):
+        """timelineyは、measure()+scale()ではなく、box/blockのwidthへそのまま渡す（cetz_render.pdf_sourceのdocstring参照）。"""
+        code = self._render(f'```timeliney {{width=10cm}}\n{TIMELINEY}\n```\n')
+        assert "block(width: 10cm, height: auto)" in code
+        assert "measure(fig)" not in code and "scale(" not in code
+        code = self._render(f'```timeliney\n{TIMELINEY}\n```\n')   # 指定なしは、行の幅いっぱい
+        assert "block(width: 100%, height: auto)" in code
+
     def test_it_is_generated_without_touching_the_templates_public_names(self):
         """カスタムテンプレートが、新しい公開名を、持たなくても、動く（生成コードが、パッケージを直接importする）。"""
         code = self._render('```cetz\ncircle((0, 0))\n```\n')
@@ -204,9 +225,10 @@ class TestPdfCode:
 
 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'
+    md.write_text(f'# 図\n\n```cetz\n{CETZ}\n```\n\n```fletcher\n{FLETCHER}\n```\n\n```timeliney\n{TIMELINEY}\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")
+                  'node((0, 0), [A]), edge("->"), node((1, 0), [B])\n```\n\n```timeliney {width=10cm}\n'
+                  f'{TIMELINEY}\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")

text_compositor-0.4.2/tests/test_cli_single_markdown.py

@@ -0,0 +1,129 @@
+"""CLI: 単一のMarkdownファイルを直接指定してPDFにする（`text-compositor FILE.md`、#179）のテスト。"""
+import os
+import sys
+
+import pytest
+
+import text_compositor.build as build_mod
+from text_compositor import log
+import text_compositor.project as project_mod
+from text_compositor.build import _single_markdown_output, parse_args
+
+
+@pytest.fixture(autouse=True)
+def _restore_verbosity():
+    """`build()`は、-q/-vを、プロセスグローバルへ反映する。他のテストへ、残さない。"""
+    yield
+    log.set_verbosity(False, False)
+
+
+def parse(monkeypatch, *argv):
+    monkeypatch.setattr(sys, "argv", ["text-compositor", *argv])
+    return parse_args()
+
+
+class TestParseArgs:
+    def test_a_single_file_with_output_and_template(self, monkeypatch):
+        args = parse(monkeypatch, "doc.md", "-o", "out.pdf", "-t", "slide", "-q", "--keep-temp")
+        assert (args.markdown, args.output, args.template, args.quiet, args.keep_temp) == ("doc.md", "out.pdf", "slide", True, True)
+
+    def test_existing_usage_without_a_file_is_unchanged(self, monkeypatch):
+        args = parse(monkeypatch, "--config", "c.yaml", "--if-changed")
+        assert args.markdown is None and args.config == "c.yaml" and args.if_changed
+
+    @pytest.mark.parametrize("flags", [
+        ["--config", "c.yaml"], ["--config-list", "l.txt"], ["--check-env"], ["--watch"], ["--if-changed"],
+        ["--clean"], ["--clean-cache"],
+    ])
+    def test_options_that_need_a_config_cannot_be_combined_with_a_file(self, monkeypatch, capsys, flags):
+        with pytest.raises(SystemExit) as e:
+            parse(monkeypatch, "doc.md", *flags)
+        assert e.value.code == 2
+        assert "同時に指定できません" in capsys.readouterr().err
+
+    @pytest.mark.parametrize("flags", [["-o", "out.pdf"], ["-t", "slide"]])
+    def test_output_and_template_need_a_file(self, monkeypatch, capsys, flags):
+        with pytest.raises(SystemExit) as e:
+            parse(monkeypatch, *flags)
+        assert e.value.code == 2 and "FILE.md" in capsys.readouterr().err
+
+    def test_only_markdown_files_are_accepted(self, monkeypatch, capsys):
+        with pytest.raises(SystemExit) as e:
+            parse(monkeypatch, "notes.txt")
+        assert e.value.code == 2
+        assert parse(monkeypatch, "A.MD").markdown == "A.MD" and parse(monkeypatch, "a.markdown").markdown == "a.markdown"
+
+
+class TestOutputPath:
+    def test_the_default_is_next_to_the_manuscript(self, tmp_path):
+        md = str(tmp_path / "sub" / "note.md")
+        assert _single_markdown_output(md, None) == str(tmp_path / "sub" / "note.pdf")
+
+    def test_an_explicit_file_and_a_folder(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        md = str(tmp_path / "note.md")
+        assert _single_markdown_output(md, "out.pdf") == str(tmp_path / "out.pdf")
+        (tmp_path / "existing").mkdir()
+        assert _single_markdown_output(md, "existing") == str(tmp_path / "existing" / "note.pdf")
+        assert _single_markdown_output(md, "new" + os.sep) == str(tmp_path / "new" / "note.pdf")
+
+
+class TestBuildSingleMarkdown:
+    @pytest.fixture
+    def calls(self, monkeypatch):
+        recorded = []
+        monkeypatch.setattr(project_mod, "_build_project", lambda *a, **k: recorded.append((a, k)))
+        return recorded
+
+    def run(self, tmp_path, *argv, monkeypatch):
+        monkeypatch.setattr(build_mod, "check_typst_version", lambda *a: None)
+        monkeypatch.setattr(build_mod, "ensure_fonts", lambda: "fonts")
+        monkeypatch.setattr(sys, "argv", ["text-compositor", *argv])
+        build_mod.build()
+
+    def test_it_builds_the_api_config_and_writes_next_to_the_manuscript(self, tmp_path, calls, monkeypatch):
+        md = tmp_path / "note.md"
+        md.write_text("# T\n", encoding="utf-8")
+        self.run(tmp_path, str(md), monkeypatch=monkeypatch)
+        (args, kwargs), = calls
+        project_dir, config, chapters = args[3], args[4], args[5]
+        assert project_dir == str(tmp_path) and chapters == ["note.md"]
+        assert config["document"]["cover"] == "markdown" and config["document"]["title"] == "note"   # APIと同じ既定
+        assert config["template"]["path"] == "template"
+        assert kwargs["out_pdf"] == str(tmp_path / "note.pdf")
+
+    def test_the_template_name_and_a_typ_path_relative_to_the_cwd(self, tmp_path, calls, monkeypatch):
+        md = tmp_path / "note.md"
+        md.write_text("# T\n", encoding="utf-8")
+        monkeypatch.chdir(tmp_path)
+        self.run(tmp_path, "note.md", "-t", "paper", monkeypatch=monkeypatch)
+        self.run(tmp_path, "note.md", "-t", "my/own.typ", "-o", "build/o.pdf", monkeypatch=monkeypatch)
+        assert calls[0][0][4]["template"]["path"] == "paper"
+        assert calls[1][0][4]["template"]["path"] == str(tmp_path / "my" / "own.typ")
+        assert calls[1][1]["out_pdf"] == str(tmp_path / "build" / "o.pdf") and (tmp_path / "build").is_dir()
+
+    def test_a_missing_file_and_an_unknown_template_fail_with_exit_code_1(self, tmp_path, calls, monkeypatch, capsys):
+        with pytest.raises(SystemExit) as e:
+            self.run(tmp_path, str(tmp_path / "nope.md"), monkeypatch=monkeypatch)
+        assert e.value.code == 1 and "Markdown file not found" in capsys.readouterr().out
+        md = tmp_path / "note.md"
+        md.write_text("# T\n", encoding="utf-8")
+        with pytest.raises(SystemExit) as e:
+            self.run(tmp_path, str(md), "-t", "nosuch", monkeypatch=monkeypatch)
+        assert e.value.code == 1 and "Unknown template" in capsys.readouterr().out
+        assert calls == []
+
+
+def test_a_real_pdf_is_built_without_a_config(tmp_path, monkeypatch):
+    """実際に、configなしで、PDFができる（Typstとフォントが、ある環境）。先頭の見出しは、表紙に落とされず、本文に残る。"""
+    from text_compositor.deps import ensure_fonts
+    try:
+        ensure_fonts()
+    except SystemExit:
+        pytest.skip("fonts are not available")
+    md = tmp_path / "note.md"
+    md.write_text("# 見出し\n\n本文です。\n", encoding="utf-8")
+    monkeypatch.setattr(sys, "argv", ["text-compositor", str(md), "-q"])
+    build_mod.build()
+    pdf = tmp_path / "note.pdf"
+    assert pdf.is_file() and pdf.read_bytes().startswith(b"%PDF")

{text_compositor-0.4.0 → text_compositor-0.4.2}/tests/test_emphasis_lint.py

@@ -93,7 +93,7 @@ class TestHtmlOutput:
     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()
+            assert '<p data-line="1">これは**「重要」**です。</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"

text_compositor-0.4.2/tests/test_html_line_numbers.py

@@ -0,0 +1,94 @@
+"""HTML出力の、ブロック要素の`data-line`（原稿の行番号。Viewerが、ツールバーに出す。#328・#357）のテスト。"""
+import re
+
+import pytest
+
+from text_compositor.api import render_html
+from text_compositor.html_output import DOCUMENT_CSS, _with_data_line
+
+PLAIN = {"mermaid": False, "plantuml": False, "d2": False}
+
+DOC = """# 見出し
+
+段落その1です。
+続きの行。
+
+- 項目A
+- 項目B
+  - 入れ子B1
+
+1. 番号1
+
+   ゆるい段落
+
+> 引用の段落
+
+| a | b |
+| - | - |
+| 1 | 2 |
+
+```python
+print(1)
+```
+
+$$
+a=b
+$$
+
+最後の段落。
+"""
+
+
+def lines_by_tag(tmp_path, markdown):
+    md = tmp_path / "doc.md"
+    md.write_text(markdown, encoding="utf-8")
+    result = render_html(str(md), plugins=PLAIN)
+    assert result.ok, result.diagnostics
+    html = open(result.html_path, encoding="utf-8").read()
+    body = html[html.index("<body"):]
+    return [(m.group(1), int(m.group(2))) for m in re.finditer(r'<(\w+)[^>]*\sdata-line="(\d+)"', body)], body
+
+
+def test_block_elements_carry_their_manuscript_line(tmp_path):
+    found, _ = lines_by_tag(tmp_path, DOC)
+    assert found == [
+        ("h1", 1), ("p", 3),
+        ("li", 6), ("li", 7), ("li", 8),      # 緊密なリスト: 項目が持つ（中の段落は、隠れている）
+        ("p", 10), ("p", 12),                 # ゆるいリスト: 項目ではなく、中の段落が持つ
+        ("p", 14),                            # 引用: 中の段落が持つ
+        ("table", 16), ("pre", 20), ("div", 24),   # 表・フェンス・数式
+        ("p", 28),
+    ]
+
+
+def test_a_diagram_fence_carries_the_line_on_its_wrapper(tmp_path):
+    svg = tmp_path / "x.svg"
+    svg.write_text('<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"></svg>', encoding="utf-8")
+    found, body = lines_by_tag(tmp_path, "# T\n\n```svg\n" + svg.read_text(encoding="utf-8") + "\n```\n")
+    assert ("div", 3) in found and '<div data-line="3" class="diagram diagram-svg">' in body
+
+
+def test_a_line_is_not_added_twice_or_to_the_wrong_element(tmp_path):
+    _, body = lines_by_tag(tmp_path, DOC)
+    assert len(re.findall(r'data-line="10"', body)) == 1 and len(re.findall(r'data-line="6"', body)) == 1
+    assert "<hr" not in body or 'hr data-line' not in body
+
+
+class TestWithDataLine:
+    def test_it_adds_the_line_to_the_first_tag_only(self):
+        assert _with_data_line('<div class="a"><p>x</p></div>\n', 7) == '<div data-line="7" class="a"><p>x</p></div>\n'
+
+    @pytest.mark.parametrize("html,line", [('<pre>x</pre>', None), ('<pre>x</pre>', 0), ('text', 3), ('', 3)])
+    def test_it_leaves_html_without_a_line_or_a_leading_tag_alone(self, html, line):
+        assert _with_data_line(html, line) == html
+
+
+class TestNoBadgeCss:
+    """行番号は、ツールバーに出す（#357）。文書のCSSには、バッジ（疑似要素）を、持たせない。"""
+
+    def test_the_document_css_has_no_badge(self):
+        assert "data-line-badge" not in DOCUMENT_CSS and "attr(data-line)" not in DOCUMENT_CSS
+
+    def test_the_document_still_has_no_script(self, tmp_path):
+        _, body = lines_by_tag(tmp_path, DOC)
+        assert "<script" not in body

{text_compositor-0.4.0 → text_compositor-0.4.2}/tests/test_html_output.py

@@ -76,10 +76,12 @@ class TestApi:
         assert result.html_path == str(tmp_path / ".text-compositor" / "preview.html")
         assert html.startswith("<!DOCTYPE html>")
         assert "<title>見出し</title>" in html
-        assert "<h1>見出し</h1>" in html
+        assert '<h1 data-line="1">見出し</h1>' in html
         assert "<script" not in html
         # スクリプトは、ブラウザ側でも禁止する（Viewerは、JavaScriptを有効にしたビューで開く）
         assert "script-src 'none'" in html and "object-src 'none'" in html
+        # 外部の画像は、二重の防御として、ブラウザ側でも禁止する（1章の方針・#238）
+        assert "img-src 'self' data:" in html
         assert set(result.timings_ms) >= {"render", "total"}
 
     def test_the_title_falls_back_to_the_file_name(self, tmp_path):
@@ -140,7 +142,7 @@ class TestMarkdown:
         assert "<strong>b</strong>" in b and "<em>i</em>" in b and "<s>s</s>" in b and "<code>c</code>" in b
         assert '<a href="https://example.com">l</a>' in b
         assert "<ul>" in b and "<ol>" in b
-        assert '<pre><code class="language-python">print(1)\n</code></pre>' in b
+        assert re.search(r'<pre data-line="\d+"><code class="language-python">print\(1\)\n</code></pre>', b)
 
     def test_line_breaks_are_kept_like_the_pdf(self, tmp_path):
         _, html = convert(tmp_path, "one\ntwo\n")
@@ -257,9 +259,42 @@ class TestImages:
         warning = result.warnings[0]
         assert "Image not found" in warning.message and warning.line == 3
 
-    def test_external_urls_are_kept(self, tmp_path):
+    def test_external_urls_are_blocked_by_default(self, tmp_path):
+        """方針2章「ローカルに閉じる」: 既定では、外部の画像は読み込まず、プレースホルダと警告にする（#238）。"""
         result, html = convert(tmp_path, "![x](https://example.com/a.png)\n")
+        assert result.ok
+        assert "<img" not in html
+        assert 'class="blocked-image"' in html and "https://example.com/a.png" in html
+        assert "外部の画像は、既定で読み込みません" in html
+        warning = result.warnings[0]
+        assert "External image blocked" in warning.message and "https://example.com/a.png" in warning.message
+        assert warning.line == 1
+
+    def test_external_urls_are_loaded_when_explicitly_allowed(self, tmp_path):
+        result, html = convert(tmp_path, "![x](https://example.com/a.png)\n", allow_external_images=True)
         assert 'src="https://example.com/a.png"' in html and not result.warnings
+        assert 'class="blocked-image"' not in html
+
+    def test_data_uri_images_are_always_kept(self, tmp_path):
+        """`data:`のURIは、ローカルで完結するため、allow_external_imagesによらず、常に読み込む（#238）。"""
+        src = "data:image/png;base64,eA=="
+        result, html = convert(tmp_path, f"![x]({src})\n")
+        assert result.ok and not result.warnings
+        assert f'src="{src}"' in html
+        assert 'class="blocked-image"' not in html
+
+    def test_windows_absolute_paths_are_blocked_by_default(self, tmp_path):
+        """Windows絶対パス（`C:\\...`）は、通信は起きないが、原稿の外側の任意のローカルファイルへアクセス
+        できてしまうため、外部の画像と同じ扱いにする（既定で読み込まず、設定で許可。`file:`のURIと同じ理由、#238。
+        `file:`のURI自体は、markdown-it-py側が既に危険なスキームとして拒否し、リンクにならない）。"""
+        result, html = convert(tmp_path, "![x](C:/Windows/win.ini)\n")
+        assert result.ok
+        assert "<img" not in html
+        assert 'class="blocked-image"' in html
+        assert result.warnings and "External image blocked" in result.warnings[0].message
+
+        result, html = convert(tmp_path, "![x](C:/Windows/win.ini)\n", allow_external_images=True)
+        assert 'src="C:/Windows/win.ini"' in html and not result.warnings
 
     def test_invalid_size_units_are_ignored_with_a_warning(self, tmp_path):
         write(tmp_path / "p.png", "x")
@@ -282,6 +317,8 @@ class TestDependencies:
     def test_the_markdown_itself_and_external_urls_are_not_included(self, tmp_path):
         result, _ = convert(tmp_path, "# a\n\n![x](https://example.com/a.png)\n")
         assert result.dependencies == []
+        result, _ = convert(tmp_path, "# a\n\n![x](https://example.com/a.png)\n", allow_external_images=True)
+        assert result.dependencies == []
 
     def test_a_missing_image_is_included_so_that_creating_it_triggers_an_update(self, tmp_path):
         result, _ = convert(tmp_path, "![x](missing.png)\n")
@@ -430,12 +467,12 @@ class TestFences:
 
     def test_a_disabled_plugin_falls_back_to_code_without_a_warning(self, tmp_path):
         result, html = convert(tmp_path, "```mermaid\ngraph TD\n A-->B\n```\n\n```plantuml\n@startuml\n@enduml\n```\n\n```d2\na -> b\n```\n")
-        assert body(html).count("<pre>") == 3 and "<img" not in html
+        assert len(re.findall(r"<pre[ >]", body(html))) == 3 and "<img" not in html
         assert not result.warnings
 
     def test_other_languages_are_plain_code_blocks(self, tmp_path):
         _, html = convert(tmp_path, "```\n<b>&\n```\n")
-        assert "<pre><code>&lt;b&gt;&amp;\n</code></pre>" in html
+        assert '<pre data-line="1"><code>&lt;b&gt;&amp;\n</code></pre>' in html
 
     def test_a_diagram_source_file_is_a_page_with_that_diagram(self, tmp_path):
         result, html = convert(tmp_path, "graph TD\n A-->B\n", name="flow.mmd")