pyDiffTools 0.1.51__tar.gz → 0.1.52__tar.gz

{pydifftools-0.1.51/pyDiffTools.egg-info → pydifftools-0.1.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.51
+Version: 0.1.52
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck
@@ -185,9 +185,13 @@ included are (listed in order of fun/utility):
   clearing the entire query shows the full plan, including completed and
   undated tasks. Each embedded SVG and live refresh uses the same URL mode.
   The search button beside Home and Zoom finds text in the visible graph,
-  highlights matches, and centers them at a readable font size. Tab or Enter
-  advances to the next match; Shift+Tab or Shift+Enter goes back. Esc closes
-  search. Phrases can span wrapped lines and formatted text.
+  highlights matches, and centers the containing task at your chosen zoom.
+  Tab or Enter advances to the next match; Shift+Tab or Shift+Enter goes
+  back. Esc closes search. Phrases can span wrapped lines and formatted
+  text. Resizing the window scales the current view with the viewport.
+  The ``1:1`` button displays fonts at their declared pixel sizes, including
+  correction for GraphViz's SVG scaling. Right-click a task and select
+  Jump to source to open its YAML definition in gvim.
   Comparison uses the same repository-relative YAML path; a file absent
   from the revision is treated as an empty plan. Historical file renames
   are not followed, and comparison markup is never written to YAML.
@@ -227,6 +231,10 @@ included are (listed in order of fun/utility):
   changes, an additional red/blue alpha-difference view is included.
   Run ``pydifft gd --install`` to add the matching ``git gd`` alias to
   your global git config.
+  ``pydifft gd --add-to-git`` offers the same installation, retaining the
+  exact command of an existing global ``gd`` alias. If none is configured,
+  it installs ``!f() { pydifft gd "$@"; }; f``. Alias installation is shared
+  with ``pd`` and ``tree``.
 - `pydifft qmdinit [directory]` scaffolds a new Quarto-style project using
   the bundled templates and example ``project1`` hierarchy, then downloads
   MathJax into ``_template/mathjax`` so the builder can run immediately.
@@ -262,6 +270,50 @@ included are (listed in order of fun/utility):
       this rule. The option is shared by ``cpb``, ``wmatch``, ``wr`` and
       ``wrchk``; ``--punctuation-slop`` remains an alias.
 
+- ``pydifft pd OLD NEW [--no-compile]`` ("PDF diff") compares two ``.md``
+  files or two ``.tex`` files. It writes ``NEW_diff.tex`` beside the newer
+  input and, by default, compiles ``NEW_diff.pdf`` there with ``pdflatex``.
+  For example, ``pydifft pd old.md paper.md`` produces ``paper_diff.tex``
+  and ``paper_diff.pdf``. ``--no-compile`` retains the diff TeX without
+  running a compiler and supports TeX fragments as well as full documents.
+
+  Both formats use ``mylatexdiff-preamble.sty`` and the existing custom
+  ``latexdiff`` options and postprocessing. The preamble is searched for
+  in the current directory, beside NEW, then through ``kpsewhich``.
+  Tools must be available on the caller's PATH, including any TeX Live
+  directory configured in your shell. Markdown additionally requires
+  Pandoc and pandoc-crossref; conversion honors declared bibliography and
+  CSL metadata, renders citations and cross-references, and resolves local
+  images beside each source. Converted TeX intermediates are temporary;
+  the Markdown sources are unchanged.
+
+  Markdown code blocks retain Pandoc syntax highlighting. Changed lines
+  get a colored background and a ``+`` or ``-`` marker, with each line
+  processed independently so highlighted code remains valid TeX.
+  Prose keeps the custom preamble styling.
+
+  Python runs ``pdflatex`` beside NEW until references and the table of
+  contents settle (at most six passes), running ``bibtex`` or ``biber``
+  when required. ``latexmk`` and its configuration are not used.
+  Compilation artifacts and the diff TeX remain available if compilation
+  fails. Existing generated outputs can be replaced on a successful rerun.
+  The former ``git-latexdiffnocompile.sh`` is a compatibility wrapper for
+  ``pydifft pd --no-compile``.
+
+  Run ``pydifft pd --add-to-git`` to install the global ``git pd`` alias.
+  It accepts Git diff arguments: ``git pd 00ffaa -- filename.md`` compares
+  that revision with the working file; bare ``git pd`` compares unstaged
+  changes; ``git pd --cached`` compares staged changes; and
+  ``git pd OLD NEW -- filename.md`` compares two revisions. Ranges and
+  Git pathspecs work as usual, including from repository subdirectories.
+  Each changed Markdown or TeX file produces its own ``NAME_diff.tex`` and
+  PDF beside the document's working-tree path. ``git pd --no-compile``
+  generates only TeX. Other file types are skipped, and unchanged files
+  produce no output. Additions, deletions, and renames are supported;
+  unresolved merge conflicts must be resolved first. Historical document
+  snapshots use the current project's bibliography, images, and TeX
+  includes. The shared installer edits only the requested global Git alias.
+
 - `pydifft wd` ("word diff"): generate "track changes" word files starting from pandoc markdown in a git history.  Assuming that you have copied diff-doc.js (copied + licensed from elsewhere) into your home directory, this will use pandoc to convert the markdown files to MS Word, then use the MS Word comparison tool to generate a document where all relevant changes are shown with "track changes."
 
     * by default, this uses the file `template.docx` in the current directory as a pandoc word template

{pydifftools-0.1.51 → pydifftools-0.1.52}/README.rst

@@ -130,9 +130,13 @@ included are (listed in order of fun/utility):
   clearing the entire query shows the full plan, including completed and
   undated tasks. Each embedded SVG and live refresh uses the same URL mode.
   The search button beside Home and Zoom finds text in the visible graph,
-  highlights matches, and centers them at a readable font size. Tab or Enter
-  advances to the next match; Shift+Tab or Shift+Enter goes back. Esc closes
-  search. Phrases can span wrapped lines and formatted text.
+  highlights matches, and centers the containing task at your chosen zoom.
+  Tab or Enter advances to the next match; Shift+Tab or Shift+Enter goes
+  back. Esc closes search. Phrases can span wrapped lines and formatted
+  text. Resizing the window scales the current view with the viewport.
+  The ``1:1`` button displays fonts at their declared pixel sizes, including
+  correction for GraphViz's SVG scaling. Right-click a task and select
+  Jump to source to open its YAML definition in gvim.
   Comparison uses the same repository-relative YAML path; a file absent
   from the revision is treated as an empty plan. Historical file renames
   are not followed, and comparison markup is never written to YAML.
@@ -172,6 +176,10 @@ included are (listed in order of fun/utility):
   changes, an additional red/blue alpha-difference view is included.
   Run ``pydifft gd --install`` to add the matching ``git gd`` alias to
   your global git config.
+  ``pydifft gd --add-to-git`` offers the same installation, retaining the
+  exact command of an existing global ``gd`` alias. If none is configured,
+  it installs ``!f() { pydifft gd "$@"; }; f``. Alias installation is shared
+  with ``pd`` and ``tree``.
 - `pydifft qmdinit [directory]` scaffolds a new Quarto-style project using
   the bundled templates and example ``project1`` hierarchy, then downloads
   MathJax into ``_template/mathjax`` so the builder can run immediately.
@@ -207,6 +215,50 @@ included are (listed in order of fun/utility):
       this rule. The option is shared by ``cpb``, ``wmatch``, ``wr`` and
       ``wrchk``; ``--punctuation-slop`` remains an alias.
 
+- ``pydifft pd OLD NEW [--no-compile]`` ("PDF diff") compares two ``.md``
+  files or two ``.tex`` files. It writes ``NEW_diff.tex`` beside the newer
+  input and, by default, compiles ``NEW_diff.pdf`` there with ``pdflatex``.
+  For example, ``pydifft pd old.md paper.md`` produces ``paper_diff.tex``
+  and ``paper_diff.pdf``. ``--no-compile`` retains the diff TeX without
+  running a compiler and supports TeX fragments as well as full documents.
+
+  Both formats use ``mylatexdiff-preamble.sty`` and the existing custom
+  ``latexdiff`` options and postprocessing. The preamble is searched for
+  in the current directory, beside NEW, then through ``kpsewhich``.
+  Tools must be available on the caller's PATH, including any TeX Live
+  directory configured in your shell. Markdown additionally requires
+  Pandoc and pandoc-crossref; conversion honors declared bibliography and
+  CSL metadata, renders citations and cross-references, and resolves local
+  images beside each source. Converted TeX intermediates are temporary;
+  the Markdown sources are unchanged.
+
+  Markdown code blocks retain Pandoc syntax highlighting. Changed lines
+  get a colored background and a ``+`` or ``-`` marker, with each line
+  processed independently so highlighted code remains valid TeX.
+  Prose keeps the custom preamble styling.
+
+  Python runs ``pdflatex`` beside NEW until references and the table of
+  contents settle (at most six passes), running ``bibtex`` or ``biber``
+  when required. ``latexmk`` and its configuration are not used.
+  Compilation artifacts and the diff TeX remain available if compilation
+  fails. Existing generated outputs can be replaced on a successful rerun.
+  The former ``git-latexdiffnocompile.sh`` is a compatibility wrapper for
+  ``pydifft pd --no-compile``.
+
+  Run ``pydifft pd --add-to-git`` to install the global ``git pd`` alias.
+  It accepts Git diff arguments: ``git pd 00ffaa -- filename.md`` compares
+  that revision with the working file; bare ``git pd`` compares unstaged
+  changes; ``git pd --cached`` compares staged changes; and
+  ``git pd OLD NEW -- filename.md`` compares two revisions. Ranges and
+  Git pathspecs work as usual, including from repository subdirectories.
+  Each changed Markdown or TeX file produces its own ``NAME_diff.tex`` and
+  PDF beside the document's working-tree path. ``git pd --no-compile``
+  generates only TeX. Other file types are skipped, and unchanged files
+  produce no output. Additions, deletions, and renames are supported;
+  unresolved merge conflicts must be resolved first. Historical document
+  snapshots use the current project's bibliography, images, and TeX
+  includes. The shared installer edits only the requested global Git alias.
+
 - `pydifft wd` ("word diff"): generate "track changes" word files starting from pandoc markdown in a git history.  Assuming that you have copied diff-doc.js (copied + licensed from elsewhere) into your home directory, this will use pandoc to convert the markdown files to MS Word, then use the MS Word comparison tool to generate a document where all relevant changes are shown with "track changes."
 
     * by default, this uses the file `template.docx` in the current directory as a pandoc word template

{pydifftools-0.1.51 → pydifftools-0.1.52/pyDiffTools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.51
+Version: 0.1.52
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck
@@ -185,9 +185,13 @@ included are (listed in order of fun/utility):
   clearing the entire query shows the full plan, including completed and
   undated tasks. Each embedded SVG and live refresh uses the same URL mode.
   The search button beside Home and Zoom finds text in the visible graph,
-  highlights matches, and centers them at a readable font size. Tab or Enter
-  advances to the next match; Shift+Tab or Shift+Enter goes back. Esc closes
-  search. Phrases can span wrapped lines and formatted text.
+  highlights matches, and centers the containing task at your chosen zoom.
+  Tab or Enter advances to the next match; Shift+Tab or Shift+Enter goes
+  back. Esc closes search. Phrases can span wrapped lines and formatted
+  text. Resizing the window scales the current view with the viewport.
+  The ``1:1`` button displays fonts at their declared pixel sizes, including
+  correction for GraphViz's SVG scaling. Right-click a task and select
+  Jump to source to open its YAML definition in gvim.
   Comparison uses the same repository-relative YAML path; a file absent
   from the revision is treated as an empty plan. Historical file renames
   are not followed, and comparison markup is never written to YAML.
@@ -227,6 +231,10 @@ included are (listed in order of fun/utility):
   changes, an additional red/blue alpha-difference view is included.
   Run ``pydifft gd --install`` to add the matching ``git gd`` alias to
   your global git config.
+  ``pydifft gd --add-to-git`` offers the same installation, retaining the
+  exact command of an existing global ``gd`` alias. If none is configured,
+  it installs ``!f() { pydifft gd "$@"; }; f``. Alias installation is shared
+  with ``pd`` and ``tree``.
 - `pydifft qmdinit [directory]` scaffolds a new Quarto-style project using
   the bundled templates and example ``project1`` hierarchy, then downloads
   MathJax into ``_template/mathjax`` so the builder can run immediately.
@@ -262,6 +270,50 @@ included are (listed in order of fun/utility):
       this rule. The option is shared by ``cpb``, ``wmatch``, ``wr`` and
       ``wrchk``; ``--punctuation-slop`` remains an alias.
 
+- ``pydifft pd OLD NEW [--no-compile]`` ("PDF diff") compares two ``.md``
+  files or two ``.tex`` files. It writes ``NEW_diff.tex`` beside the newer
+  input and, by default, compiles ``NEW_diff.pdf`` there with ``pdflatex``.
+  For example, ``pydifft pd old.md paper.md`` produces ``paper_diff.tex``
+  and ``paper_diff.pdf``. ``--no-compile`` retains the diff TeX without
+  running a compiler and supports TeX fragments as well as full documents.
+
+  Both formats use ``mylatexdiff-preamble.sty`` and the existing custom
+  ``latexdiff`` options and postprocessing. The preamble is searched for
+  in the current directory, beside NEW, then through ``kpsewhich``.
+  Tools must be available on the caller's PATH, including any TeX Live
+  directory configured in your shell. Markdown additionally requires
+  Pandoc and pandoc-crossref; conversion honors declared bibliography and
+  CSL metadata, renders citations and cross-references, and resolves local
+  images beside each source. Converted TeX intermediates are temporary;
+  the Markdown sources are unchanged.
+
+  Markdown code blocks retain Pandoc syntax highlighting. Changed lines
+  get a colored background and a ``+`` or ``-`` marker, with each line
+  processed independently so highlighted code remains valid TeX.
+  Prose keeps the custom preamble styling.
+
+  Python runs ``pdflatex`` beside NEW until references and the table of
+  contents settle (at most six passes), running ``bibtex`` or ``biber``
+  when required. ``latexmk`` and its configuration are not used.
+  Compilation artifacts and the diff TeX remain available if compilation
+  fails. Existing generated outputs can be replaced on a successful rerun.
+  The former ``git-latexdiffnocompile.sh`` is a compatibility wrapper for
+  ``pydifft pd --no-compile``.
+
+  Run ``pydifft pd --add-to-git`` to install the global ``git pd`` alias.
+  It accepts Git diff arguments: ``git pd 00ffaa -- filename.md`` compares
+  that revision with the working file; bare ``git pd`` compares unstaged
+  changes; ``git pd --cached`` compares staged changes; and
+  ``git pd OLD NEW -- filename.md`` compares two revisions. Ranges and
+  Git pathspecs work as usual, including from repository subdirectories.
+  Each changed Markdown or TeX file produces its own ``NAME_diff.tex`` and
+  PDF beside the document's working-tree path. ``git pd --no-compile``
+  generates only TeX. Other file types are skipped, and unchanged files
+  produce no output. Additions, deletions, and renames are supported;
+  unresolved merge conflicts must be resolved first. Historical document
+  snapshots use the current project's bibliography, images, and TeX
+  includes. The shared installer edits only the requested global Git alias.
+
 - `pydifft wd` ("word diff"): generate "track changes" word files starting from pandoc markdown in a git history.  Assuming that you have copied diff-doc.js (copied + licensed from elsewhere) into your home directory, this will use pandoc to convert the markdown files to MS Word, then use the MS Word comparison tool to generate a document where all relevant changes are shown with "track changes."
 
     * by default, this uses the file `template.docx` in the current directory as a pandoc word template

{pydifftools-0.1.51 → pydifftools-0.1.52}/pyDiffTools.egg-info/SOURCES.txt

@@ -65,6 +65,7 @@ pydifftools/copy_files.py
 pydifftools/diff-doc.js
 pydifftools/doc_contents.py
 pydifftools/forward_search.py
+pydifftools/git_aliases.py
 pydifftools/git_gd.py
 pydifftools/git_gd_history.py
 pydifftools/git_gd_image.py
@@ -77,6 +78,7 @@ pydifftools/match_spaces.py
 pydifftools/onewordify.py
 pydifftools/onewordify_undo.py
 pydifftools/outline.py
+pydifftools/pdf_diff.py
 pydifftools/rearrange_tex.py
 pydifftools/searchacro.py
 pydifftools/separate_comments.py
@@ -111,7 +113,9 @@ tests/test_forward_search.py
 tests/test_git_gd_history.py
 tests/test_git_gd_image.py
 tests/test_git_gd_qt.py
+tests/test_git_pdf_diff.py
 tests/test_line_alignment.py
+tests/test_pdf_diff.py
 tests/test_rrng.py
 tests/test_source_jump.py
 tests/test_tex_to_qmd.py

{pydifftools-0.1.51 → pydifftools-0.1.52}/pydifftools/command_line.py

@@ -36,6 +36,7 @@ from .copy_files import copy_image_files
 from .searchacro import replace_acros
 from .rearrange_tex import run as rearrange_tex_run
 from .git_gd import gd  # registers git difftool review command
+from .pdf_diff import pd, git_pd  # registers PDF diff command
 from .flowchart.watch_graph import wgrph
 from .flowchart.graph import load_graph_yaml
 from .notebook.tex_to_qmd import tex2qmd
@@ -933,6 +934,8 @@ def build_parser():
 def main(argv=None):
     if argv is None:
         argv = sys.argv[1:]
+    if argv[:2] == ["pd", "--git"]:
+        return git_pd(argv[2:])
     if argv and argv[0] in ("--ver", "--version"):
         build_parser().parse_args(argv)
         return

{pydifftools-0.1.51 → pydifftools-0.1.52}/pydifftools/flowchart/source_jump.js

@@ -28,12 +28,21 @@
 
   let phrase = '';
 
+  // Preserve HTML tag boundaries without adding spaces to words such as
+  // H<sub>2</sub>O. Python treats this reserved marker as a formatting gap.
+  function normalizeSourceText(text, trimEnd = true) {
+    const normalized = text.replace(/[\s\uE000]+/g, function (gap) {
+      return /\s/.test(gap) ? ' ' : '\uE000';
+    }).replace(/^[\s\uE000]+/, '');
+    return trimEnd ? normalized.replace(/[\s\uE000]+$/, '') : normalized;
+  }
+
   function hideMenu() {
     menu.style.display = 'none';
   }
 
   function showMenu(event, text) {
-    phrase = (text || '').replace(/\s+/g, ' ').trim();
+    phrase = normalizeSourceText(text || '');
     if (!phrase) {
       hideMenu();
       return;
@@ -71,8 +80,8 @@
     const block = targetElement.closest(
       'p,li,blockquote,h1,h2,h3,h4,h5,h6,dt,dd,td,th'
     ) || targetElement;
-    // Drop rendered math and cross-reference links so the phrase resembles
-    // the searchable Markdown source, where mfs removes those constructs.
+    // Drop rendered math and figure-reference links, whose displayed text
+    // differs from their Markdown source.
     let text = '';
     let clickedOffset = 0;
     let found = false;
@@ -93,11 +102,18 @@
         text += ' ';
         return;
       }
+      const tagBoundary = node !== block && node.nodeType === Node.ELEMENT_NODE;
+      if (tagBoundary) {
+        text += '\uE000';
+      }
       node.childNodes.forEach(collectText);
+      if (tagBoundary) {
+        text += '\uE000';
+      }
     }
     collectText(block);
     const rawText = text;
-    text = rawText.replace(/\s+/g, ' ').trim();
+    text = normalizeSourceText(rawText);
     if (!text) {
       return '';
     }
@@ -107,10 +123,9 @@
 
     // The raw DOM offset is used to find sentence bounds before whitespace is
     // collapsed. Recompute its visible offset after normalization.
-    const normalizedPrefix = rawText
-      .slice(0, clickedOffset)
-      .replace(/\s+/g, ' ')
-      .replace(/^\s+/, '');
+    const normalizedPrefix = normalizeSourceText(
+      rawText.slice(0, clickedOffset), false
+    );
     clickedOffset = normalizedPrefix.length;
     const before = text.slice(0, clickedOffset);
     const after = text.slice(clickedOffset);
@@ -119,7 +134,7 @@
       before.lastIndexOf('!'),
       before.lastIndexOf('?')
     ) + 1;
-    const endMatch = after.match(/[.!?](?:\s|$)/);
+    const endMatch = after.match(/[.!?]\uE000*(?:\s|$)/);
     const end = endMatch ? clickedOffset + endMatch.index + 1 : text.length;
     return text.slice(start, end).trim() || text;
   }

{pydifftools-0.1.51 → pydifftools-0.1.52}/pydifftools/flowchart/watch_graph.py

@@ -239,6 +239,8 @@ def _watch_html(
         "</button>"
         "<button id='wgrph-zoom-in' title='Zoom in'>+</button>"
         "<button id='wgrph-zoom-out' title='Zoom out'>&#8722;</button>"
+        "<button id='wgrph-actual-size' title='Actual size: native font size'"
+        " aria-label='Actual size'>1:1</button>"
         "<button id='wgrph-search' title='Search graph (Ctrl+F)'"
         " aria-label='Search graph' aria-expanded='false'"
         " aria-controls='wgrph-search-panel'>&#128269;</button>"

{pydifftools-0.1.51 → pydifftools-0.1.52}/pydifftools/flowchart/wgrph_view.js

@@ -43,19 +43,23 @@
     matchIndex = (matchIndex + step + matches.length) % matches.length;
     searchStatus.textContent = `${matchIndex + 1} of ${matches.length}`;
     const sizes = panZoom.getSizes();
-    const pan = panZoom.getPan();
+    const viewport = svgDoc.querySelector('.svg-pan-zoom_viewport');
+    // DOM ranges reflect the last rendered frame, which can lag behind the
+    // pan/zoom state while typing. Use that frame's matrix for highlights.
+    const matrix = viewport.getScreenCTM();
     const highlight = svgDoc.createElementNS(
       'http://www.w3.org/2000/svg', 'g'
     );
     highlight.id = 'wgrph-search-highlight';
     highlight.setAttribute('pointer-events', 'none');
-    const boxes = matches[matchIndex].map(function (range) {
+    const match = matches[matchIndex];
+    match.ranges.forEach(function (range) {
       const bounds = range.getBoundingClientRect();
       const box = {
-        x: (bounds.x - pan.x) / sizes.realZoom,
-        y: (bounds.y - pan.y) / sizes.realZoom,
-        width: bounds.width / sizes.realZoom,
-        height: bounds.height / sizes.realZoom,
+        x: (bounds.x - matrix.e) / matrix.a,
+        y: (bounds.y - matrix.f) / matrix.d,
+        width: bounds.width / matrix.a,
+        height: bounds.height / matrix.d,
       };
       const rect = svgDoc.createElementNS('http://www.w3.org/2000/svg', 'rect');
       for (const key of ['x', 'y', 'width', 'height']) {
@@ -66,25 +70,20 @@
       rect.setAttribute('stroke', '#b77900');
       rect.setAttribute('vector-effect', 'non-scaling-stroke');
       highlight.appendChild(rect);
-      return box;
     });
-    svgDoc.querySelector('.svg-pan-zoom_viewport').appendChild(highlight);
+    viewport.appendChild(highlight);
     if (focus) {
-      const left = Math.min(...boxes.map(b => b.x));
-      const right = Math.max(...boxes.map(b => b.x + b.width));
-      const top = Math.min(...boxes.map(b => b.y));
-      const bottom = Math.max(...boxes.map(b => b.y + b.height));
-      const element = matches[matchIndex][0].startContainer.parentElement;
-      const fontSize = parseFloat(svgDoc.defaultView.getComputedStyle(element)
-        .fontSize) || 14;
-      // Target an 18 CSS-pixel font regardless of the graph's initial fit.
-      const zoom = panZoom.getZoom() * 18 / fontSize / sizes.realZoom;
-      panZoom.setMaxZoom(Math.max(50, zoom));
-      panZoom.zoom(zoom);
-      const realZoom = panZoom.getSizes().realZoom;
+      // Center the containing task while keeping the user's chosen scale.
+      const bounds = match.node.getBBox();
+      const point = svgDoc.documentElement.createSVGPoint();
+      point.x = bounds.x + bounds.width / 2;
+      point.y = bounds.y + bounds.height / 2;
+      const center = point.matrixTransform(
+        matrix.inverse().multiply(match.node.getScreenCTM())
+      );
       panZoom.pan({
-        x: sizes.width / 2 - (left + right) / 2 * realZoom,
-        y: sizes.height / 2 - (top + bottom) / 2 * realZoom,
+        x: sizes.width / 2 - center.x * sizes.realZoom,
+        y: sizes.height / 2 - center.y * sizes.realZoom,
       });
     }
   }
@@ -115,7 +114,7 @@
             }
           }
           if (ranges.length) {
-            matches.push(ranges);
+            matches.push({ ranges, node: entry.node });
           }
           start = entry.text.indexOf(query, start + query.length);
         }
@@ -232,9 +231,11 @@
       home();
     } else {
       const restore = savedView;
-      panZoom.zoom(
-        (restore.realZoom / panZoom.getSizes().realZoom) * panZoom.getZoom()
-      );
+      const zoom = (restore.realZoom / panZoom.getSizes().realZoom) *
+        panZoom.getZoom();
+      panZoom.setMinZoom(Math.min(0.1, zoom));
+      panZoom.setMaxZoom(Math.max(50, zoom));
+      panZoom.zoom(zoom);
       panZoom.pan(restore.pan);
     }
     saveView();
@@ -264,7 +265,7 @@
           }
         }
       }
-      return { text, positions };
+      return { text, positions, node };
     });
     // }}}
     search(false);
@@ -390,11 +391,44 @@
   init();
   window.addEventListener('resize', function () {
     if (panZoom !== null) {
+      // Keep the same magnification relative to the whole-graph fit.
+      const before = panZoom.getSizes();
+      const pan = panZoom.getPan();
+      const zoom = panZoom.getZoom();
+      const atHome = Math.abs(zoom - 1) < 1e-6 &&
+        Math.abs(pan.x + before.viewBox.x * before.realZoom -
+          (before.width - before.viewBox.width * before.realZoom) / 2) < 0.5 &&
+        Math.abs(pan.y + before.viewBox.y * before.realZoom) < 0.5;
       panZoom.resize();
+      if (atHome) {
+        home();
+      } else {
+        panZoom.zoom(zoom);
+        const after = panZoom.getSizes();
+        const factor = after.realZoom / before.realZoom;
+        panZoom.pan({
+          x: after.width / 2 + (pan.x - before.width / 2) * factor,
+          y: after.height / 2 + (pan.y - before.height / 2) * factor,
+        });
+      }
+      saveView();
     }
   });
   document.addEventListener('keydown', handleKeys);
   document.getElementById('wgrph-home').addEventListener('click', home);
+  document.getElementById('wgrph-actual-size').addEventListener('click', function () {
+    // Graphviz may scale its graph group before viewer zoom is applied.
+    const viewport = initializedDoc.querySelector('.svg-pan-zoom_viewport');
+    const text = initializedDoc.querySelector('g.node text');
+    const matrix = text ? viewport.getScreenCTM().inverse().multiply(
+      text.getScreenCTM()
+    ) : { a: 1, b: 0 };
+    const zoom = panZoom.getZoom() / panZoom.getSizes().realZoom /
+      Math.hypot(matrix.a, matrix.b);
+    panZoom.setMinZoom(Math.min(0.1, zoom));
+    panZoom.setMaxZoom(Math.max(50, zoom));
+    panZoom.zoom(zoom);
+  });
   document
     .getElementById('wgrph-zoom-in')
     .addEventListener('click', function () {

pydifftools-0.1.52/pydifftools/git_aliases.py

@@ -0,0 +1,30 @@
+"""Shared installation of the package's global Git aliases."""
+
+import subprocess
+
+
+def install_git_alias(name, command, preserve_existing=False):
+    """Install an alias, optionally retaining its exact configured command."""
+    if preserve_existing:
+        current = subprocess.run(
+            ["git", "config", "--global", "--null", "--get", f"alias.{name}"],
+            capture_output=True,
+            text=True,
+        )
+        if current.returncode == 0 and current.stdout:
+            # Remove only Git's terminator, preserving command whitespace.
+            command = current.stdout[:-1]
+        elif current.returncode not in (0, 1):
+            raise SystemExit(
+                f"Cannot read global alias.{name}: {current.stderr.strip()}"
+            )
+    try:
+        subprocess.run(
+            ["git", "config", "--global", f"alias.{name}", command],
+            check=True,
+        )
+    except (OSError, subprocess.CalledProcessError) as exc:
+        raise SystemExit(
+            f"Cannot install global alias.{name}: {exc}"
+        ) from None
+    print(f"Installed global git alias: alias.{name} -> {command}")

{pydifftools-0.1.51 → pydifftools-0.1.52}/pydifftools/git_gd.py

@@ -24,6 +24,7 @@ from pathlib import Path
 from typing import Sequence
 
 from .command_registry import register_command
+from .git_aliases import install_git_alias
 
 INSTALL_ALIAS_VALUE = '!f() { pydifft gd "$@"; }; f'
 DIFFTOOL_NAME = "mygvim"
@@ -186,6 +187,7 @@ def changed_paths(
     return [entry.path for entry in changed_entries(diff_args, pathspec)]
 
 
+# also used by: git_gd_qt.py and tests/test_git_gd_history.py.
 def numstat_for_paths(diff_args: Sequence[str], paths: Sequence[str]):
     cmd = [
         "diff",
@@ -435,7 +437,7 @@ def main(argv: Sequence[str]) -> int:
     "With no arguments, review unstaged changes, like git diff.\n"
     "Use pydifft tree to browse Git history.\n\n"
     "Install the matching git alias automatically with:\n"
-    "  pydifft gd --install\n\n"
+    "  pydifft gd --add-to-git (or --install)\n\n"
     "or add it yourself with:\n"
     "  git config --global alias.gd '!f() { pydifft gd \"$@\"; }; f'\n\n"
     "This command shells out to git difftool --tool=mygvim, so keep\n"
@@ -446,19 +448,26 @@ def main(argv: Sequence[str]) -> int:
             "runs this subcommand."
         ),
     },
+    argument_options={
+        "add_to_git": {
+            "help": (
+                "Install the global git gd alias, preserving its current "
+                "command."
+            ),
+        },
+    },
 )
-def gd(arguments, install=False):
+def gd(arguments, install=False, add_to_git=False):
     """Mirror ``git_gd_qt.py`` and optionally install ``git gd``."""
 
-    if install:
+    if install or add_to_git:
         if arguments:
-            raise SystemExit("pydifft gd --install does not take diff args")
+            flag = "--add-to-git" if add_to_git else "--install"
+            raise SystemExit(f"pydifft gd {flag} does not take diff args")
         # {{{ install the Git alias and check difftool configuration
-        subprocess.run(
-            ["git", "config", "--global", "alias.gd", INSTALL_ALIAS_VALUE],
-            check=True,
+        install_git_alias(
+            "gd", INSTALL_ALIAS_VALUE, preserve_existing=True,
         )
-        print("Installed global git alias: alias.gd -> pydifft gd")
         tool_cmd = subprocess.run(
             ["git", "config", "--global", "--get", "difftool.mygvim.cmd"],
             capture_output=True,
@@ -490,12 +499,9 @@ def tree(install=False):
     """Open the history browser or install its Git alias."""
     try:
         if install:
-            subprocess.run(
-                ["git", "config", "--global", "alias.tree",
-                 '!f() { pydifft tree "$@"; }; f'],
-                check=True,
+            install_git_alias(
+                "tree", '!f() { pydifft tree "$@"; }; f',
             )
-            print("Installed global git alias: alias.tree -> pydifft tree")
             return
         from PySide6.QtWidgets import QApplication
         from .git_gd_history import HistoryWindow, load_history