pytex-preprocessor 0.1.0__tar.gz → 0.1.1__tar.gz

{pytex_preprocessor-0.1.0 → pytex_preprocessor-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytex-preprocessor
-Version: 0.1.0
+Version: 0.1.1
 Summary: Type-safe LaTeX document generation with Python
 Author-email: Frederik Beimgraben <frederik@beimgraben.net>
 Requires-Python: >=3.13

{pytex_preprocessor-0.1.0 → pytex_preprocessor-0.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pytex-preprocessor"
-version = "0.1.0"
+version = "0.1.1"
 authors = [
   { name="Frederik Beimgraben", email="frederik@beimgraben.net" },
 ]

{pytex_preprocessor-0.1.0 → pytex_preprocessor-0.1.1}/src/pytex_builder/build.py

@@ -8,6 +8,7 @@ acronyms resolve.
 from __future__ import annotations
 
 import argparse
+import re
 import sys
 from dataclasses import dataclass
 from pathlib import Path
@@ -42,16 +43,28 @@ def _default_output(inp: Path, build_dir: Path) -> Path:
     ``build_dir`` so the ``.out.tex`` and its inline assets (fonts, logos,
     images) stay out of the source tree:
 
-    * ``example.tex.py`` -> ``<build_dir>/example.out.tex``
-    * ``report.py``      -> ``<build_dir>/report.out.tex``
-    * ``paper.tex``      -> ``<build_dir>/paper.out.tex``
+    The stem is also slugified (whitespace and shell/TeX-hostile characters
+    become ``_``) because it becomes the TeX ``\\jobname``; spaces there break
+    tectonic's biber/makeindex steps (the ``.bcf`` path cannot be opened):
+
+    * ``example.tex.py``        -> ``<build_dir>/example.out.tex``
+    * ``report.py``             -> ``<build_dir>/report.out.tex``
+    * ``2026-06-15 STUPA.md``   -> ``<build_dir>/2026-06-15_STUPA.md.out.tex``
     """
     base = inp
     if base.suffix.lower() in {".py", ".tex"}:
         base = base.with_suffix("")
     if base.suffix.lower() == ".tex":
         base = base.with_suffix("")
-    return build_dir / f"{base.name}.out.tex"
+    return build_dir / f"{_slug(base.name)}.out.tex"
+
+
+def _slug(name: str) -> str:
+    """Make `name` safe as a TeX jobname: collapse whitespace and drop
+    characters that confuse tectonic/biber/makeindex."""
+    name = re.sub(r"\s+", "_", name.strip())
+    name = re.sub(r"[^\w.\-]", "", name)
+    return name or "document"
 
 
 def _parse_args(argv: list[str]) -> Config:

{pytex_preprocessor-0.1.0 → pytex_preprocessor-0.1.1}/src/pytex_hsrtreport/tex/pagesetup.tex

@@ -1,3 +1,4 @@
+\usepackage{lastpage}
 \makeatletter
 \def\@title{}
 \def\@author{}
@@ -12,14 +13,13 @@
 \def\chaptermark#1{\def\Chaptername{#1}\Chaptermark{#1}}
 \let\Sectionmark\sectionmark
 \def\sectionmark#1{\def\Sectionname{#1}\Sectionmark{#1}}
-\AtEndDocument{\immediate\write\@auxout{\string\gdef\string\@lastpage{\thepage}}}
 \clearpairofpagestyles
 \setkomafont{pageheadfoot}{\color{gray}\blenderfont}
 \setkomafont{pagenumber}{\color{gray}\blenderfont}
 \setlength{\footskip}{20pt}
 \ohead*{\ifHSRTBackMatter\else\ifnum\value{chapter}>0\relax\Roman{\thechapter}~–~\Chaptername\fi\fi}
 \ifoot{\@author}
-\cfoot{\ifHSRTBackMatter\else Seite~\thepage\if@mainmatter\@ifundefined{@lastpage}{}{~von~\@lastpage}\fi\fi}
+\cfoot{\ifHSRTBackMatter\else Seite~\thepage\if@mainmatter~von~\pageref{LastPage}\fi\fi}
 \ohead{\ifHSRTBackMatter\else\ifnum\value{chapter}>0\relax\thechapter~–~\Chaptername\fi\fi}
 \ihead{\@title}
 \pagestyle{scrheadings}

{pytex_preprocessor-0.1.0 → pytex_preprocessor-0.1.1}/src/pytex_hsrtreport/titlepage.py

@@ -1,3 +1,4 @@
+from collections.abc import Iterator
 from dataclasses import dataclass, field
 from typing import Final, override
 
@@ -20,12 +21,22 @@ from pytex.commands.tables import Tabular
 from pytex.helpers.parenting import attach
 from pytex.interface.tex import TeX
 from pytex.model.concat import Concat
+from pytex.model.empty import Empty
 from pytex.model.environment import Environment
 from pytex.model.raw import Raw
 from pytex.registry import Registry
 
 from .logos import titlepage_logo_overlay
 
+
+def _is_blank(node: TeX | str) -> bool:
+    """True for an empty string or the `Empty` node — used to skip empty
+    title-page sections (a protocol has no abstract or keywords)."""
+    if isinstance(node, str):
+        return not node.strip()
+    return node is Empty
+
+
 __all__ = ["TitlePage", "TitlePageDataLine"]
 
 
@@ -75,62 +86,63 @@ class TitlePage(TeX):
         )
         return tuple(v for v in candidates if isinstance(v, TeX))
 
-    @property
-    @override
-    def rendered(self) -> str:
+    def _title_block(self) -> TeX:
+        return Environment(
+            "flushleft",
+            Concat(
+                Raw(r"\hyphenpenalty=10000\exhyphenpenalty=10000"),
+                Noindent(),
+                SelectColor("black"),
+                Textbf(
+                    Concat(
+                        Blenderfont(),
+                        HugeBig(),
+                        Hspace("-2.5pt", star=True),
+                        self.title,
+                    )
+                ),
+                Raw(r"\par"),
+                Vspace("-0.5em"),
+                Rule(r"\textwidth", "0.5mm"),
+            ),
+        )
+
+    def _content(self) -> Iterator[TeX | str]:
         # Tikz overlay: logos chained left-to-right from the top-left corner,
         # matching tmp/Pages/Titlepage.tex but with the foreach unrolled here.
-        logo_overlay = Raw(
-            titlepage_logo_overlay(self.logo_names),
-            allow_replacements=False,
+        yield Raw(titlepage_logo_overlay(self.logo_names), allow_replacements=False)
+        yield Vspace("4cm")
+        yield self._title_block()
+        yield Vspace("2em")
+        yield Setstretch("1.0")
+        # Abstract and keywords are optional — skip the labels when empty
+        # (e.g. a meeting protocol has neither).
+        if not _is_blank(self.abstract):
+            yield SectionStar("Abstract")
+            yield Vspace("-1em")
+            yield self.abstract
+            yield Vspace("1em", star=True)
+        if not _is_blank(self.keywords):
+            yield Raw(r"\par\noindent ")
+            yield Textbf("Keywords")
+            yield Raw(r"\par\noindent ")
+            yield self.keywords
+        yield Vfill()
+        yield Noindent()
+        yield Setstretch("1.0")
+        yield Tabular(
+            r"@{} p{30mm} p{\dimexpr\textwidth-30mm-2\tabcolsep\relax} @{}",
+            _data_table_body(self.data_lines),
         )
-        # Flag true while the titlepage ships out so footer_logo_hook
-        # suppresses the bottom-right footer logos on this page only.
-        # Reset after \end{titlepage} (which \clearpages, shipping the page
-        # while the flag is still true).
+
+    @property
+    @override
+    def rendered(self) -> str:
+        # `\HSRTTitlePagetrue` while the titlepage ships out so footer_logo_hook
+        # suppresses the bottom-right footer logos on this page only; reset
+        # after \end{titlepage} (which \clearpages while the flag is still set).
         return Concat(
             Raw(r"\HSRTTitlePagetrue", allow_replacements=False),
-            TitlepageEnv(
-                Concat(
-                    logo_overlay,
-                    Vspace("4cm"),
-                    Environment(
-                        "flushleft",
-                        Concat(
-                            Raw(r"\hyphenpenalty=10000\exhyphenpenalty=10000"),
-                            Noindent(),
-                            SelectColor("black"),
-                            Textbf(
-                                Concat(
-                                    Blenderfont(),
-                                    HugeBig(),
-                                    Hspace("-2.5pt", star=True),
-                                    self.title,
-                                )
-                            ),
-                            Raw(r"\par"),
-                            Vspace("-0.5em"),
-                            Rule(r"\textwidth", "0.5mm"),
-                        ),
-                    ),
-                    Vspace("2em"),
-                    Setstretch("1.0"),
-                    SectionStar("Abstract"),
-                    Vspace("-1em"),
-                    self.abstract,
-                    Vspace("1em", star=True),
-                    Raw(r"\par\noindent "),
-                    Textbf("Keywords"),
-                    Raw(r"\par\noindent "),
-                    self.keywords,
-                    Vfill(),
-                    Noindent(),
-                    Setstretch("1.0"),
-                    Tabular(
-                        r"@{} p{30mm} p{\dimexpr\textwidth-30mm-2\tabcolsep\relax} @{}",
-                        _data_table_body(self.data_lines),
-                    ),
-                )
-            ),
+            TitlepageEnv(Concat(*self._content())),
             Raw(r"\HSRTTitlePagefalse", allow_replacements=False),
         ).rendered

{pytex_preprocessor-0.1.0 → pytex_preprocessor-0.1.1}/src/pytex_preprocessor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytex-preprocessor
-Version: 0.1.0
+Version: 0.1.1
 Summary: Type-safe LaTeX document generation with Python
 Author-email: Frederik Beimgraben <frederik@beimgraben.net>
 Requires-Python: >=3.13

pytex_preprocessor-0.1.1/src/pytex_protocol/document.py

@@ -0,0 +1,154 @@
+"""Render a STUPA/AStA meeting protocol from Obsidian-flavoured Markdown.
+
+The protocol is an :class:`~pytex_hsrtreport.document.HSRTReport`: a full HSRT
+title page carries the meeting metadata as data lines, agenda items become
+numbered sections, and protocol entries (decisions, votes, action items) render
+as HSRT callout boxes. An optional signature block closes the document.
+"""
+
+from __future__ import annotations
+
+import re
+from pathlib import Path
+from typing import TYPE_CHECKING
+
+import marko
+
+from pytex.model.concat import Concat
+from pytex.model.raw import Raw
+from pytex.registry import Registry
+from pytex_hsrtreport.document import HSRTReport
+from pytex_hsrtreport.titlepage import TitlePageDataLine
+from pytex_hsrtreport.variants import Variant
+
+from .convert import ProtocolConverter
+from .frontmatter import FrontmatterValue, split_frontmatter
+from .signatures import signature_block_from_meta
+
+if TYPE_CHECKING:
+    from collections.abc import Mapping
+
+    from pytex.interface.tex import TeX
+
+__all__ = ["IncludeProtocol", "Protocol", "render_protocol"]
+
+_PARSER = marko.Markdown()
+
+_VARIANTS: dict[str, Variant] = {
+    "stupa": Variant.STUPA,
+    "asta": Variant.ASTA,
+    "echo": Variant.ECHO,
+}
+
+# Title-page rows: (label, frontmatter keys to try), single-value fields first.
+_SCALAR_ROWS: tuple[tuple[str, tuple[str, ...]], ...] = (
+    ("Datum", ("datum", "date")),
+    ("Ort", ("ort",)),
+    ("Sitzungsleitung", ("sitzungsleitung",)),
+    ("Protokoll", ("protokoll",)),
+)
+_LIST_ROWS: tuple[tuple[str, tuple[str, ...]], ...] = (
+    ("Anwesend", ("anwesend",)),
+    ("Entschuldigt", ("entschuldigt",)),
+    ("Abwesend", ("abwesend",)),
+    ("Gäste", ("gaeste", "gäste")),
+)
+
+
+def _scalar(meta: Mapping[str, FrontmatterValue], *keys: str) -> str:
+    for key in keys:
+        value = meta.get(key)
+        if isinstance(value, str) and value:
+            return value
+    return ""
+
+
+def _joined(meta: Mapping[str, FrontmatterValue], *keys: str) -> str:
+    for key in keys:
+        value = meta.get(key)
+        if isinstance(value, list) and value:
+            return ", ".join(value)
+        if isinstance(value, str) and value:
+            return value
+    return ""
+
+
+def _variant(meta: Mapping[str, FrontmatterValue]) -> Variant:
+    return _VARIANTS.get(_scalar(meta, "gremium").lower(), Variant.STUPA)
+
+
+def _format_date(value: str) -> str:
+    """ISO ``YYYY-MM-DD`` -> German ``DD.MM.YYYY``; anything else is kept as-is."""
+    match = re.fullmatch(r"(\d{4})-(\d{2})-(\d{2})", value)
+    return f"{match[3]}.{match[2]}.{match[1]}" if match else value
+
+
+def _title(meta: Mapping[str, FrontmatterValue]) -> str:
+    gremium = _scalar(meta, "gremium")
+    datum = _format_date(_scalar(meta, "datum", "date"))
+    if gremium and datum:
+        return f"Protokoll der Sitzung des {gremium} vom {datum}"
+    if gremium:
+        return f"Protokoll der Sitzung des {gremium}"
+    return "Sitzungsprotokoll"
+
+
+def _data_lines(meta: Mapping[str, FrontmatterValue]) -> tuple[TitlePageDataLine, ...]:
+    lines: list[TitlePageDataLine] = []
+    for label, keys in _SCALAR_ROWS:
+        value = _scalar(meta, *keys)
+        if value:
+            lines.append(TitlePageDataLine(label, value))
+        if label == "Datum":
+            # Append the time range right after the date when present.
+            span = " – ".join(  # noqa: RUF001 (EN DASH between start/end)
+                t
+                for t in (
+                    _scalar(meta, "beginn", "start"),
+                    _scalar(meta, "ende", "end"),
+                )
+                if t
+            )
+            if span:
+                lines.append(TitlePageDataLine("Zeit", span))
+    for label, keys in _LIST_ROWS:
+        value = _joined(meta, *keys)
+        if value:
+            lines.append(TitlePageDataLine(f"{label} ({value.count(',') + 1})", value))
+    return tuple(lines)
+
+
+def render_protocol(text: str, *, base_level: int = 0) -> HSRTReport:
+    """Build an `HSRTReport` from the Markdown source of a protocol."""
+    meta, body_md = split_frontmatter(text)
+    converter = ProtocolConverter(meta=meta, base_level=base_level)
+    converted = converter.block(_PARSER.parse(body_md))
+    # Optional sign-off block, appended when the frontmatter lists `unterschriften`.
+    signatures = signature_block_from_meta(meta)
+    tail = (Raw("\n\n"), signatures) if signatures is not None else ()
+    return HSRTReport(
+        variant=_variant(meta),
+        document_class="scrbook",
+        show_titlepage=True,
+        show_toc=False,
+        show_footer_logos=True,
+        title=_title(meta),
+        data_lines=_data_lines(meta),
+        # Agenda items are top-level `#` headings -> \section. In scrbook a
+        # chapterless section would number as "0.1"; flatten it to a plain
+        # arabic counter so TOPs read 1, 2, 3, ...
+        user_preamble=Raw(r"\renewcommand*{\thesection}{\arabic{section}}"),
+        body=Concat(converted, *tail),
+    )
+
+
+@Registry.add
+def Protocol(text: str, *, base_level: int = 0) -> TeX:
+    """Convert a protocol Markdown string to a renderable `HSRTReport`."""
+    return render_protocol(text, base_level=base_level)
+
+
+@Registry.add
+def IncludeProtocol(path: str | Path, *, encoding: str = "utf-8") -> TeX:
+    """Read a protocol Markdown file and render it (see :func:`render_protocol`)."""
+    return render_protocol(Path(path).read_text(encoding=encoding))

pytex_preprocessor-0.1.0/src/pytex_protocol/document.py

@@ -1,91 +0,0 @@
-"""Render a STUPA/AStA meeting protocol from Obsidian-flavoured Markdown.
-
-The protocol is an :class:`~pytex_hsrtreport.document.HSRTReport` configured for
-a short minutes document: no title page, a compact header block (built from the
-frontmatter) at the top, agenda items as numbered sections, and protocol
-entries (decisions, votes, action items) rendered as HSRT callout boxes.
-"""
-
-from __future__ import annotations
-
-from pathlib import Path
-from typing import TYPE_CHECKING
-
-import marko
-
-from pytex.model.concat import Concat
-from pytex.model.raw import Raw
-from pytex.registry import Registry
-from pytex_hsrtreport.document import HSRTReport
-from pytex_hsrtreport.variants import Variant
-
-from .convert import ProtocolConverter
-from .frontmatter import FrontmatterValue, split_frontmatter
-from .header import header_from_meta
-from .signatures import signature_block_from_meta
-
-if TYPE_CHECKING:
-    from pytex.interface.tex import TeX
-
-__all__ = ["IncludeProtocol", "Protocol", "render_protocol"]
-
-_PARSER = marko.Markdown()
-
-_VARIANTS: dict[str, Variant] = {
-    "stupa": Variant.STUPA,
-    "asta": Variant.ASTA,
-    "echo": Variant.ECHO,
-}
-
-
-def _variant(meta: dict[str, FrontmatterValue]) -> Variant:
-    gremium = meta.get("gremium", "")
-    key = gremium.lower().strip() if isinstance(gremium, str) else ""
-    return _VARIANTS.get(key, Variant.STUPA)
-
-
-def _document_title(meta: dict[str, FrontmatterValue]) -> str:
-    gremium = meta.get("gremium")
-    datum = meta.get("datum")
-    head = (
-        f"{gremium} — Protokoll"
-        if isinstance(gremium, str) and gremium
-        else "Protokoll"
-    )
-    return f"{head} ({datum})" if isinstance(datum, str) and datum else head
-
-
-def render_protocol(text: str, *, base_level: int = 0) -> HSRTReport:
-    """Build an `HSRTReport` from the Markdown source of a protocol."""
-    meta, body_md = split_frontmatter(text)
-    converter = ProtocolConverter(meta=meta, base_level=base_level)
-    converted = converter.block(_PARSER.parse(body_md))
-    header = header_from_meta(meta)
-    # Optional sign-off block, appended when the frontmatter lists `unterschriften`.
-    signatures = signature_block_from_meta(meta)
-    tail = (Raw("\n\n"), signatures) if signatures is not None else ()
-    return HSRTReport(
-        variant=_variant(meta),
-        document_class="scrbook",
-        show_titlepage=False,
-        show_toc=False,
-        show_footer_logos=True,
-        title=_document_title(meta),
-        # Agenda items are top-level `#` headings -> \section. In scrbook a
-        # chapterless section would number as "0.1"; flatten it to a plain
-        # arabic counter so TOPs read 1, 2, 3, ...
-        user_preamble=Raw(r"\renewcommand*{\thesection}{\arabic{section}}"),
-        body=Concat(header, Raw("\n\n"), converted, *tail),
-    )
-
-
-@Registry.add
-def Protocol(text: str, *, base_level: int = 0) -> TeX:
-    """Convert a protocol Markdown string to a renderable `HSRTReport`."""
-    return render_protocol(text, base_level=base_level)
-
-
-@Registry.add
-def IncludeProtocol(path: str | Path, *, encoding: str = "utf-8") -> TeX:
-    """Read a protocol Markdown file and render it (see :func:`render_protocol`)."""
-    return render_protocol(Path(path).read_text(encoding=encoding))