pyDiffTools 0.1.48__tar.gz → 0.1.50__tar.gz

{pydifftools-0.1.48/pyDiffTools.egg-info → pydifftools-0.1.50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.48
+Version: 0.1.50
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck
@@ -215,10 +215,21 @@ included are (listed in order of fun/utility):
 
     * this allows you to use an original file with good whitespace formatting as a "template" that you can match other (e.g. pandoc converted file) onto another
 
-    * changed prose lines exceeding 1.5 times the nearby reference width are
-      wrapped using the same sentence and punctuation rules as ``wr``.
-      Existing surrounding line breaks are retained; the fallback width is
-      80 columns when the reference provides too little prose.
+    * ``cpb`` and ``wmatch`` share a matcher that finds changed hunks, aligns
+      their words using Git's minimal diff, and restores reference whitespace.
+      It then considers extra breaks that preserve an unchanged reference line
+      without stranding a tiny edited fragment, and checks wrapping rules.
+
+    * ``--wrapnumber`` sets the maximum width (79 for ``cpb`` and ``wmatch``).
+      Wmatch also uses nearby reference widths for large edits, retaining
+      unchanged reference lines and protected Markdown blocks.
+
+    * ``--trailing-dependent-phrase`` defaults to 20: a clause boundary within
+      20 characters of the maximum width must end the line, even when its
+      trailing phrase would still fit. Commas, semicolons, colons, parentheses,
+      dashes, and inline-math boundaries are supported. Set it to 0 to disable
+      this rule. The option is shared by ``cpb``, ``wmatch``, ``wr`` and
+      ``wrchk``; ``--punctuation-slop`` remains an 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."
 

{pydifftools-0.1.48 → pydifftools-0.1.50}/README.rst

@@ -160,10 +160,21 @@ included are (listed in order of fun/utility):
 
     * this allows you to use an original file with good whitespace formatting as a "template" that you can match other (e.g. pandoc converted file) onto another
 
-    * changed prose lines exceeding 1.5 times the nearby reference width are
-      wrapped using the same sentence and punctuation rules as ``wr``.
-      Existing surrounding line breaks are retained; the fallback width is
-      80 columns when the reference provides too little prose.
+    * ``cpb`` and ``wmatch`` share a matcher that finds changed hunks, aligns
+      their words using Git's minimal diff, and restores reference whitespace.
+      It then considers extra breaks that preserve an unchanged reference line
+      without stranding a tiny edited fragment, and checks wrapping rules.
+
+    * ``--wrapnumber`` sets the maximum width (79 for ``cpb`` and ``wmatch``).
+      Wmatch also uses nearby reference widths for large edits, retaining
+      unchanged reference lines and protected Markdown blocks.
+
+    * ``--trailing-dependent-phrase`` defaults to 20: a clause boundary within
+      20 characters of the maximum width must end the line, even when its
+      trailing phrase would still fit. Commas, semicolons, colons, parentheses,
+      dashes, and inline-math boundaries are supported. Set it to 0 to disable
+      this rule. The option is shared by ``cpb``, ``wmatch``, ``wr`` and
+      ``wrchk``; ``--punctuation-slop`` remains an 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."
 

{pydifftools-0.1.48 → pydifftools-0.1.50/pyDiffTools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.48
+Version: 0.1.50
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck
@@ -215,10 +215,21 @@ included are (listed in order of fun/utility):
 
     * this allows you to use an original file with good whitespace formatting as a "template" that you can match other (e.g. pandoc converted file) onto another
 
-    * changed prose lines exceeding 1.5 times the nearby reference width are
-      wrapped using the same sentence and punctuation rules as ``wr``.
-      Existing surrounding line breaks are retained; the fallback width is
-      80 columns when the reference provides too little prose.
+    * ``cpb`` and ``wmatch`` share a matcher that finds changed hunks, aligns
+      their words using Git's minimal diff, and restores reference whitespace.
+      It then considers extra breaks that preserve an unchanged reference line
+      without stranding a tiny edited fragment, and checks wrapping rules.
+
+    * ``--wrapnumber`` sets the maximum width (79 for ``cpb`` and ``wmatch``).
+      Wmatch also uses nearby reference widths for large edits, retaining
+      unchanged reference lines and protected Markdown blocks.
+
+    * ``--trailing-dependent-phrase`` defaults to 20: a clause boundary within
+      20 characters of the maximum width must end the line, even when its
+      trailing phrase would still fit. Commas, semicolons, colons, parentheses,
+      dashes, and inline-math boundaries are supported. Set it to 0 to disable
+      this rule. The option is shared by ``cpb``, ``wmatch``, ``wr`` and
+      ``wrchk``; ``--punctuation-slop`` remains an 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."
 

{pydifftools-0.1.48 → pydifftools-0.1.50}/pyDiffTools.egg-info/SOURCES.txt

@@ -70,6 +70,7 @@ pydifftools/git_gd_image.py
 pydifftools/git_gd_qt.py
 pydifftools/html_comments.py
 pydifftools/html_uncomments.py
+pydifftools/line_alignment.py
 pydifftools/log_example.py
 pydifftools/match_spaces.py
 pydifftools/onewordify.py
@@ -78,16 +79,19 @@ pydifftools/outline.py
 pydifftools/rearrange_tex.py
 pydifftools/searchacro.py
 pydifftools/separate_comments.py
+pydifftools/source_jump.py
 pydifftools/split_conflict.py
 pydifftools/unseparate_comments.py
 pydifftools/update_check.py
 pydifftools/wrap_sentences.py
+pydifftools/wrapping_options.py
 pydifftools/xml2xlsx.vbs
 pydifftools/zotero.py
 pydifftools/flowchart/__init__.py
 pydifftools/flowchart/comparison.py
 pydifftools/flowchart/dot_to_yaml.py
 pydifftools/flowchart/graph.py
+pydifftools/flowchart/source_jump.js
 pydifftools/flowchart/svg-pan-zoom.min.js
 pydifftools/flowchart/watch_graph.py
 pydifftools/flowchart/wgrph_view.js
@@ -105,7 +109,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_line_alignment.py
 tests/test_rrng.py
+tests/test_source_jump.py
 tests/test_tex_to_qmd.py
 tests/test_update_check.py
 tests/test_wrap_check.py

{pydifftools-0.1.48 → pydifftools-0.1.50}/pydifftools/browser_lifecycle.py

@@ -1,12 +1,72 @@
 import os
+import re
 import shutil
 import subprocess
+import sys
 
 # callbacks that run before any dialog needs the user; cpb registers one
 # that closes its live preview, so issues are dealt with before it reopens
 dialog_callbacks = []
 
 
+def launch_chrome(webdriver, **kwargs):
+    """Start Chrome, retrying version mismatches with a warning."""
+    from selenium.common.exceptions import SessionNotCreatedException
+    from selenium.webdriver.chrome.service import Service
+
+    try:
+        return webdriver.Chrome(**kwargs)
+    except SessionNotCreatedException as exc:
+        # {{{ Retry only ChromeDriver's explicit browser-version rejection
+        details = str(exc)
+        driver_match = re.search(
+            r"ChromeDriver only supports Chrome version (\d+)", details
+        )
+        browser_match = re.search(
+            r"Current browser version is (\d+)", details
+        )
+        if driver_match is None or browser_match is None:
+            raise
+        print(
+            "pydifft: warning: ChromeDriver "
+            f"{driver_match.group(1)} and Chrome {browser_match.group(1)} "
+            "do not match; retrying with the driver version check disabled.",
+            file=sys.stderr,
+        )
+        service = kwargs.get("service")
+        kwargs["service"] = Service(
+            executable_path=service.path if service else None,
+            service_args=[
+                *(service.service_args if service else []),
+                "--disable-build-check",
+            ],
+        )
+        return webdriver.Chrome(**kwargs)
+        # }}}
+
+
+def start_chrome():
+    """Use an installed driver without an online Selenium Manager lookup."""
+    # Keep Selenium imports lazy, as in the watch commands.
+    from selenium import webdriver
+    from selenium.webdriver.chrome.service import Service
+
+    driver_path = shutil.which("chromedriver")
+    if driver_path:
+        options = webdriver.ChromeOptions()
+        # Debian's driver defaults to Chromium even if Chrome is installed;
+        # retain Selenium Manager's preference for Google Chrome.
+        browser_path = shutil.which("google-chrome") or shutil.which(
+            "google-chrome-stable"
+        )
+        if browser_path:
+            options.binary_location = browser_path
+        return launch_chrome(
+            webdriver, service=Service(driver_path), options=options
+        )
+    return launch_chrome(webdriver)
+
+
 def prepare_for_dialog():
     """Let watch commands close their preview before a dialog appears."""
     for callback in list(dialog_callbacks):

{pydifftools-0.1.48 → pydifftools-0.1.50}/pydifftools/command_line.py

@@ -11,6 +11,7 @@ import nbformat
 import difflib
 import shutil
 import importlib.util
+import importlib.metadata
 from pathlib import Path
 from . import (
     match_spaces,
@@ -46,6 +47,9 @@ from .notebook.fast_build import (
 )
 
 from .command_registry import _COMMAND_SPECS, register_command
+from .wrapping_options import (
+    DEFAULT_WIDTH, DEFAULT_TRAILING_DEPENDENT_PHRASE, WRAPPING_ARGUMENTS,
+)
 
 _ARGCOMPLETE_SPEC = importlib.util.find_spec("argcomplete")
 if (
@@ -366,9 +370,19 @@ def gvr(arguments):
 @register_command(
     "match whitespace",
     filename_extensions={"arguments": [".md", ".tex"]},
+    argument_options={
+        **WRAPPING_ARGUMENTS,
+        "arguments": {
+            "nargs": 2, "metavar": ("REFERENCE", "FILE"),
+            "help": "Reference file and current file to reflow.",
+        },
+    },
 )
-def wmatch(arguments):
-    match_spaces.run(arguments)
+def wmatch(
+    arguments, wrapnumber=DEFAULT_WIDTH,
+    trailing_dependent_phrase=DEFAULT_TRAILING_DEPENDENT_PHRASE,
+):
+    match_spaces.run(arguments, wrapnumber, trailing_dependent_phrase)
 
 
 @register_command("split conflict")
@@ -879,6 +893,12 @@ def build_parser():
         formatter_class=argparse.RawDescriptionHelpFormatter,
         is_root_parser=True,
     )
+    parser.add_argument(
+        "--ver",
+        "--version",
+        action="version",
+        version=importlib.metadata.version("pyDiffTools"),
+    )
     parser.epilog = _subcommand_help_hint(parser.prog)
     parser._pydifft_subparsers = {}
     subparsers = parser.add_subparsers(dest="command")
@@ -913,6 +933,9 @@ def build_parser():
 def main(argv=None):
     if argv is None:
         argv = sys.argv[1:]
+    if argv and argv[0] in ("--ver", "--version"):
+        build_parser().parse_args(argv)
+        return
     # Run the PyPI update check once per UTC day so users see a notice but
     # startup stays fast when offline. The date is stored in the
     # PYDIFFTOOLS_UPDATE_CHECK_LAST_RAN_UTC_DATE environment variable.
@@ -959,6 +982,16 @@ def main(argv=None):
             parser._pydifft_subparsers[subcommand].print_help()
             return
     namespace = parser.parse_args(argv)
+    # Shared wrapping arguments are validated identically for each command.
+    if hasattr(namespace, "wrapnumber") and namespace.wrapnumber < 1:
+        parser._pydifft_subparsers[namespace.command].error(
+            "--wrapnumber must be at least 1"
+        )
+    if getattr(namespace, "trailing_dependent_phrase",
+               getattr(namespace, "punctuation_slop", 0)) < 0:
+        parser._pydifft_subparsers[namespace.command].error(
+            "--trailing-dependent-phrase must be nonnegative"
+        )
     if (
         namespace.command == "cpb"
         and namespace.comments_to_margin

{pydifftools-0.1.48 → pydifftools-0.1.50}/pydifftools/command_registry.py

@@ -15,6 +15,7 @@ def register_command(
     description=None,
     help=None,
     filename_extensions=None,
+    argument_options=None,
 ):
     """Register a command handler for the CLI dispatcher."""
 
@@ -108,6 +109,12 @@ def register_command(
                     kwargs["type"] = type(parameter.default)
             if parameter.name in argument_help:
                 kwargs["help"] = argument_help[parameter.name].strip()
+            if argument_options is not None:
+                kwargs.update(argument_options.get(parameter.name, {}))
+                override_flags = kwargs.pop("flags", None)
+                if override_flags is not None:
+                    flags = override_flags
+                    kwargs["dest"] = parameter.name
             argument_spec = {"flags": flags, "kwargs": kwargs}
             if parameter.name in completion_allowednames:
                 argument_spec["completion_allowednames"] = (

{pydifftools-0.1.48 → pydifftools-0.1.50}/pydifftools/comment_tags.lua

@@ -237,9 +237,13 @@ local function detect_block_opener(block)
   end
 
   if para_like_t(block) then
-    for k, opener_spec in pairs(OPENERS) do
-      local found, before, after = split_inline_block_at_tag(block, k)
-      if found then
+    -- Scan the paragraph once, regardless of the number of authors.
+    local content = block.content
+    for index = 1, #content do
+      local tag = raw_inline_html(content[index])
+      local opener_spec = tag and OPENERS[tag] or nil
+      if opener_spec then
+        local _, before, after = split_inline_block_at_tag(block, tag)
         return opener_spec, before, after
       end
     end
@@ -452,3 +456,6 @@ function Pandoc(doc)
   end
   return doc:walk({ Inlines = Inlines, Blocks = Blocks, Div = Div })
 end
+
+-- Initialize authors before walking comments, without an implicit first walk.
+return {{ Pandoc = Pandoc }}

{pydifftools-0.1.48 → pydifftools-0.1.50}/pydifftools/comment_tags_margin.lua

@@ -273,9 +273,13 @@ local function detect_block_opener(block)
   end
 
   if para_like_t(block) then
-    for k, opener_spec in pairs(OPENERS) do
-      local found, before, after = split_inline_block_at_tag(block, k)
-      if found then
+    -- Scan the paragraph once, regardless of the number of authors.
+    local content = block.content
+    for index = 1, #content do
+      local tag = raw_inline_html(content[index])
+      local opener_spec = tag and OPENERS[tag] or nil
+      if opener_spec then
+        local _, before, after = split_inline_block_at_tag(block, tag)
         return opener_spec, before, after
       end
     end
@@ -487,3 +491,6 @@ function Pandoc(doc)
   end
   return doc:walk({ Inlines = Inlines, Blocks = Blocks, Div = Div })
 end
+
+-- Initialize authors before walking comments, without an implicit first walk.
+return {{ Pandoc = Pandoc }}

{pydifftools-0.1.48 → pydifftools-0.1.50}/pydifftools/comment_tags_no_comments.lua

@@ -166,9 +166,13 @@ local function detect_block_opener(block)
   end
 
   if para_like_t(block) then
-    for k, opener_spec in pairs(OPENERS) do
-      local found, before, after = split_inline_block_at_tag(block, k)
-      if found then
+    -- Scan the paragraph once, regardless of the number of authors.
+    local content = block.content
+    for index = 1, #content do
+      local tag = raw_inline_html(content[index])
+      local opener_spec = tag and OPENERS[tag] or nil
+      if opener_spec then
+        local _, before, after = split_inline_block_at_tag(block, tag)
         return opener_spec, before, after
       end
     end
@@ -348,3 +352,6 @@ function Pandoc(doc)
   end
   return doc:walk({ Inlines = Inlines, Blocks = Blocks, Div = Div })
 end
+
+-- Initialize authors before walking comments, without an implicit first walk.
+return {{ Pandoc = Pandoc }}

{pydifftools-0.1.48 → pydifftools-0.1.50}/pydifftools/comment_toggle.js

@@ -34,7 +34,7 @@
   }
 
   function positionComments() {
-    const useMobileFlow = window.matchMedia("(max-width: 900px)").matches;
+    const useMobileFlow = window.matchMedia("(max-width: 600px)").matches;
     // Inline comment bubbles are absolutely positioned relative to a zero-width
     // pin. We nudge overlapping bubbles so adjacent <comment> tags visibly
     // separate, and we raise the bubbles so the pointer aims at the source point.

{pydifftools-0.1.48 → pydifftools-0.1.50}/pydifftools/comments.css

@@ -4,9 +4,10 @@ html {
 }
 body {
   margin: 0 auto;
-  max-width: 36em;
-  padding-left: 50px;
-  padding-right: 50px;
+  /* Keep 75% of the previous side margins and give the rest to the text. */
+  max-width: calc(27em + 25%);
+  padding-left: 37.5px;
+  padding-right: 37.5px;
   padding-top: 50px;
   padding-bottom: 50px;
   hyphens: auto;
@@ -311,7 +312,7 @@ span.comment-pin > span.comment-left::after {
 }
 
 /* ---------- Mobile fallback ---------- */
-@media (max-width: 900px) {
+@media (max-width: 600px) {
   div.comment-right,
   div.comment-left,
   span.comment-pin > span.comment-right,