texdiff 0.2.3__tar.gz → 0.2.5__tar.gz

{texdiff-0.2.3/src/texdiff.egg-info → texdiff-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: texdiff
-Version: 0.2.3
+Version: 0.2.5
 Summary: AST-driven semantic diff for LaTeX documents
 Author: GoBobr
 License: MIT License

{texdiff-0.2.3 → texdiff-0.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "texdiff"
-version = "0.2.3"
+version = "0.2.5"
 description = "AST-driven semantic diff for LaTeX documents"
 readme = "README.md"
 license = { file = "LICENSE" }

{texdiff-0.2.3 → texdiff-0.2.5}/src/texdiff/__init__.py

@@ -42,4 +42,4 @@ __all__ = [
     "word_diff",
 ]
 
-__version__ = "0.2.2"
+__version__ = "0.2.5"

{texdiff-0.2.3 → texdiff-0.2.5}/src/texdiff/align.py

@@ -690,8 +690,12 @@ def _sibling_swap_rescue(edits: list[Edit], _pair) -> list[Edit]:
     for i, j in swaps.items():
         swap_new[i] = edits[j].new
         edits[j] = Insert(new=modifies[i].new)
+    # pair through _pair, NOT raw Modify: the swapped-in sibling can
+    # be verbatim-equal to the old node (the rescue often trades a
+    # mis-pairing for the node's TRUE counterpart). A raw Modify then
+    # renders an unchanged table as wholesale retired + reinserted.
     return [
-        Modify(old=modifies[idx].old, new=swap_new[idx])
+        _pair(modifies[idx].old, swap_new[idx])
         if idx in swaps
         else e
         for idx, e in enumerate(edits)

{texdiff-0.2.3 → texdiff-0.2.5}/src/texdiff/emit.py

@@ -1556,7 +1556,13 @@ def _is_safe_inline(text: str) -> bool:
         return False
     if "\n" in text:
         return False
-    if _ARG_MACRO_RE.search(text) or _ARG_MACRO_BR_RE.search(text):
+    # decoration macros (\\emph, \\textbf, ...) with pure-text
+    # arguments are LR-safe inside \\DIFdel/\\DIFadd - font commands
+    # survive \\sout/\\uwave. Mask them before the macro-argument
+    # probe or cells like ``\\emph{valid\\_min} to \\emph{valid\\_max}``
+    # degrade to the colour-only fallback: red but never struck.
+    probe = _SAFE_DECOR_RE.sub(lambda m: m.group(2), text)
+    if _ARG_MACRO_RE.search(probe) or _ARG_MACRO_BR_RE.search(probe):
         return False
     if _LIST_ITEM_RE.search(text):
         # \item / \par inside a strikeout/wave is LR-mode illegal
@@ -2239,6 +2245,11 @@ def _escape_cell_pair(old_cell: str, new_cell: str) -> str:
         if _is_safe_inline(new_cell):
             return f"\\DIFadd{{{new_cell}}}"
         return f"\\DIFaddbegin{{}} {new_cell} \\DIFaddend{{}}"
+    if not new_cell:
+        # text -> empty: strike the old cell (blue adds nothing)
+        if _is_safe_inline(old_cell):
+            return f"\\DIFdel{{{old_cell}}}"
+        return f"\\DIFdelbegin{{}} {old_cell} \\DIFdelend{{}}"
     # underscore-escape-only difference: the OLD ADS generator emits
     # raw ``_`` in variable paths while the NEW one escapes it as
     # ``\_`` - both render identically in LaTeX. A cell pair that
@@ -2459,7 +2470,9 @@ def _merge_keyed_rows(
     parts: list[str] = []
     for oc, nc in zip(old_cells, new_cells):
         oc_s, nc_s = oc.strip(), nc.strip()
-        if oc_s == nc_s or not nc_s:
+        if oc_s == nc_s:
+            parts.append(oc)
+        elif not nc_s and not oc_s:
             parts.append(oc)
         else:
             parts.append(_escape_cell_pair(oc_s, nc_s))

{texdiff-0.2.3 → texdiff-0.2.5/src/texdiff.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: texdiff
-Version: 0.2.3
+Version: 0.2.5
 Summary: AST-driven semantic diff for LaTeX documents
 Author: GoBobr
 License: MIT License

{texdiff-0.2.3 → texdiff-0.2.5}/tests/test_align.py

@@ -89,3 +89,41 @@ class TestSameSignatureDifferentText:
         new = [group(text_node("schemas")), group(text_node("handlers")), text_node("tail\n\n")]
         edits = align(old, new)
         assert [type(e).__name__ for e in edits] == ["Insert", "Match", "Match"]
+
+
+def test_sibling_swap_rescue_pairs_verbatim_equal_swap_as_match():
+    """A swap that lands on a verbatim-equal sibling must Match.
+
+    The sibling-swap rescue re-pairs a Modify with the same-signature
+    Insert the old side actually resembles. When the swapped-in
+    sibling is byte-identical to the old node - an unchanged table
+    re-inserted next to a new sibling table (PGS "consumed
+    variables" band table) - the rescue used to construct a raw
+    Modify. Emit then rendered the IDENTICAL table as a wholesale
+    retired (red, unstruck) copy followed by a blue re-inserted
+    copy. The swap must go through _pair so equal text degrades to
+    a plain Match.
+    """
+    from texdiff.align import _sibling_swap_rescue
+    from texdiff.parse import parse
+
+    def _env(body: str):
+        return parse(f"\\begin{{savenotes}}\n{body}\n\\end{{savenotes}}\n")[0]
+
+    def _pair(o, n):
+        if o.text == n.text:
+            return Match(node=o)
+        return Modify(old=o, new=n)
+
+    old_node = _env("alpha beta gamma delta epsilon zeta")
+    wrong_new = _env("an unrelated climatology tail with other words")
+    right_new = _env("alpha beta gamma delta epsilon zeta")
+
+    edits = [Modify(old=old_node, new=wrong_new), Insert(new=right_new)]
+    out = _sibling_swap_rescue(edits, _pair)
+    # the identical counterpart matches: renders black, not retired
+    assert type(out[0]).__name__ == "Match"
+    assert out[0].node is old_node
+    # the previously (wrongly) chosen sibling stays visible as insert
+    assert type(out[1]).__name__ == "Insert"
+    assert out[1].new is wrong_new

{texdiff-0.2.3 → texdiff-0.2.5}/tests/test_tables_render.py

@@ -1018,3 +1018,61 @@ class TestGroupedPairingRegressions:
             assert name in out[nearest : nearest + 12], (
                 f"{unit} merged into the wrong group"
             )
+
+    def test_decorated_macro_cell_strikes_not_just_colours(self):
+        r"""Range-cell case: \emph{..} cells must strike, not just colour.
+
+        A changed cell containing only decoration macros with
+        pure-text arguments (``\emph{valid\_min} to
+        \emph{valid\_max}``) is LR-safe inside \DIFdel/\DIFadd:
+        font commands survive \sout/\uwave. It must render with the
+        inline strike markup, not degrade to the colour-switch-only
+        fallback (\DIFdelbegin..\DIFdelend), which paints the old
+        text red without striking it.
+        """
+        old_src = (
+            "\\documentclass{article}\\begin{document}\n"
+            "\\begin{longtable}{ll}\n\\caption{vars}\\\\\n"
+            "\\rowcolor{lightcyan} \\textbf{lat} & Latitude & float & "
+            "\\emph{valid\\_min} to \\emph{valid\\_max} & d1\\\\\n"
+            "\\end{longtable}\\end{document}\n"
+        )
+        new_src = old_src.replace(
+            "\\emph{valid\\_min} to \\emph{valid\\_max} & d1",
+            "defined by \\emph{valid\\_range} & lat",
+        )
+        out = diff_documents(old_src, new_src, inject_preamble=False).marked_up
+        # the old range cell is STRUCK inside \DIFdel{..}, not merely
+        # coloured by the block fallback
+        assert "\\DIFdel{\\emph{valid\\_min} to \\emph{valid\\_max}}" in out
+        # no colour-only degradation for the pair
+        assert "\\DIFdelbegin{} \\emph{valid" not in out
+        # new side waves its markup too
+        assert "\\DIFadd{defined by \\emph{valid\\_range}}" in out
+
+    def test_text_to_empty_cell_change_is_marked(self):
+        r"""Text->empty cell change must strike the old cell.
+
+        When a cell's content is removed entirely (the regenerated
+        spec leaves the Range column blank), the per-cell merge used
+        to emit the OLD cell verbatim with no markup at all: the
+        retired value silently appeared as unchanged text. It must
+        render struck red (and its counterpart, empty->text, wavy
+        blue).
+        """
+        old_src = (
+            "\\documentclass{article}\\begin{document}\n"
+            "\\begin{longtable}{lll}\n"
+            "z0 & 0 & 0 \\\\\n"
+            "z1 & 1 & 1 \\\\\n"
+            "\\rowcolor{lightcyan} \\textbf{day} & Date of Day & "
+            "\\emph{valid\\_min} to \\emph{valid\\_max} \\\\\n"
+            "w & 5 & 6 \\\\\n"
+            "\\end{longtable}\\end{document}\n"
+        )
+        new_src = old_src.replace(
+            "\\emph{valid\\_min} to \\emph{valid\\_max} \\\\",
+            " \\\\",
+        )
+        out = diff_documents(old_src, new_src, inject_preamble=False).marked_up
+        assert "\\DIFdel{\\emph{valid\\_min} to \\emph{valid\\_max}}" in out