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

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

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

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

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

{pytex_preprocessor-0.1.1 → pytex_preprocessor-0.1.3}/src/pytex_hsrtreport/voting.py

@@ -9,7 +9,7 @@ from pytex.interface.package import PackageProtocol
 from pytex.interface.tex import TeX
 from pytex.model.concat import Concat
 from pytex.model.package import DefinePackage
-from pytex.packages import FONTAWESOME, MDFRAMED, XCOLOR
+from pytex.packages import CALC, FONTAWESOME, MDFRAMED, XCOLOR
 from pytex.registry import Registry
 
 from .boxes import ColoredBox, CustomBox
@@ -56,7 +56,10 @@ class VotingResults(TeX):
     @property
     @override
     def requires(self) -> frozenset[PackageProtocol]:
-        return frozenset({MDFRAMED, XCOLOR, FONTAWESOME, MULTICOL})
+        # CALC is needed because the nested ColoredBox/CustomBox use infix
+        # length arithmetic; they are built inside `.rendered`, so their own
+        # `requires` (which include CALC) never reach the package collector.
+        return frozenset({MDFRAMED, XCOLOR, FONTAWESOME, MULTICOL, CALC})
 
     @property
     @override

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

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

{pytex_preprocessor-0.1.1 → pytex_preprocessor-0.1.3}/src/pytex_protocol/convert.py

@@ -24,7 +24,7 @@ from .shortcodes import expand_inline_shortcodes
 from .signatures import SignatureLines
 
 if TYPE_CHECKING:
-    from collections.abc import Callable, Mapping
+    from collections.abc import Callable, Iterator, Mapping
 
     from pytex.interface.tex import TeX
 
@@ -66,19 +66,27 @@ def _children(node: object) -> list[object]:
     return cast("list[object]", children) if isinstance(children, list) else []
 
 
-def _all_text(node: object) -> str:
-    """Concatenate every literal text fragment beneath `node`."""
-    text = _text(node)
-    if text is not None:
-        return text
-    return "".join(_all_text(c) for c in _children(node))
-
-
 def _tally(text: str, key: str) -> int:
     match = _TALLY_RE[key].search(text)
     return int(match.group(1)) if match else 0
 
 
+def _is_tally_line(line: str) -> bool:
+    """A line is the vote tally if it carries at least two of yes/no/abstain."""
+    return sum(1 for rx in _TALLY_RE.values() if rx.search(line)) >= 2
+
+
+def _interleave(items: Iterator[TeX]) -> Iterator[TeX]:
+    """Yield `items` separated by LaTeX line breaks (for multi-line box bodies)."""
+    from pytex.model.raw import Raw
+
+    sep = Raw(r"\\")
+    for i, item in enumerate(items):
+        if i:
+            yield sep
+        yield item
+
+
 def _leaf_texts(node: object) -> list[str]:
     """Every leaf text fragment beneath `node`, in order (one per source line)."""
     text = _text(node)
@@ -124,7 +132,7 @@ class ProtocolConverter(MarkdownConverter):
             return super()._as_callout(kids)
         name, title, head_rest, rest_blocks = marker
         if name in _VOTE_MARKERS:
-            return self._vote_callout(title, kids)
+            return self._vote_callout(kids)
         if name in _SIGNATURE_MARKERS:
             return self._signature_callout(kids)
         factory = _PROTOCOL_CALLOUTS.get(name)
@@ -174,13 +182,21 @@ class ProtocolConverter(MarkdownConverter):
             signers.append((role.strip(), person.strip()))
         return SignatureLines(*signers)
 
-    def _vote_callout(self, title: str, kids: list[object]) -> TeX:
-        text = " ".join(_all_text(k) for k in kids)
+    def _vote_callout(self, kids: list[object]) -> TeX:
+        # Per source line: the tally line feeds the counts, every other line is
+        # kept as the box body (otherwise descriptive text would be dropped).
+        lines = [frag for k in kids for frag in _leaf_texts(k)]
+        if lines:
+            lines[0] = CALLOUT_RE.sub("", lines[0], count=1)
+        stripped = [s.strip() for s in lines]
+        full = " ".join(stripped)
+        body_lines = [s for s in stripped if s and not _is_tally_line(s)]
+        body = Concat(*_interleave(self.inline_text(s) for s in body_lines))
         return Vote(
-            yes=_tally(text, "yes"),
-            no=_tally(text, "no"),
-            abstain=_tally(text, "abstain"),
-            body=self.inline_text(title) if title else "",
+            yes=_tally(full, "yes"),
+            no=_tally(full, "no"),
+            abstain=_tally(full, "abstain"),
+            body=body,
         )
 
     def inline_text(self, text: str) -> TeX:

{pytex_preprocessor-0.1.1 → pytex_preprocessor-0.1.3}/src/pytex_protocol/document.py

@@ -135,9 +135,9 @@ def render_protocol(text: str, *, base_level: int = 0) -> HSRTReport:
         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}}"),
+        # chapterless section would number as "0.1"; number them as agenda
+        # items instead, so headings read "TOP 1", "TOP 2", ...
+        user_preamble=Raw(r"\renewcommand*{\thesection}{TOP~\arabic{section}}"),
         body=Concat(converted, *tail),
     )