pyDiffTools 0.1.47__tar.gz → 0.1.48__tar.gz

{pydifftools-0.1.47 → pydifftools-0.1.48}/MANIFEST.in

@@ -4,6 +4,7 @@ include LICENSE.md
 include pydifftools/diff-doc.js
 include pydifftools/xml2xlsx.vbs
 include pydifftools/comments.css
+include pydifftools/comments_author_colors.css
 include pydifftools/comment_tags.lua
 include pydifftools/comment_tags_margin.lua
 include pydifftools/comment_tags_no_comments.lua

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.47
+Version: 0.1.48
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.47
+Version: 0.1.48
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck

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

@@ -58,6 +58,7 @@ pydifftools/comment_tags_margin.lua
 pydifftools/comment_tags_no_comments.lua
 pydifftools/comment_toggle.js
 pydifftools/comments.css
+pydifftools/comments_author_colors.css
 pydifftools/continuous.py
 pydifftools/copy_files.py
 pydifftools/diff-doc.js

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

@@ -34,6 +34,24 @@ local OPENERS = {
 }
 local AUTHOR_COLORS = {}
 
+local function author_color_style(color)
+  local red = tonumber(color:sub(2, 3), 16)
+  local green = tonumber(color:sub(4, 5), 16)
+  local blue = tonumber(color:sub(6, 7), 16)
+  local function tint(component)
+    return math.floor(component * 0.13 + 255 * 0.87 + 0.5)
+  end
+  local background = string.format(
+    "#%02x%02x%02x", tint(red), tint(green), tint(blue)
+  )
+  return string.format(
+    "--comment-accent-color: %s; "
+      .. "--comment-accent-background-color: %s; "
+      .. "border-color: %s; background-color: %s;",
+    color, background, color, background
+  )
+end
+
 local comment_id = 0
 local function next_id()
   comment_id = comment_id + 1
@@ -43,7 +61,7 @@ end
 local function make_inline_comment(side, content_inlines, spec)
   local attributes = {}
   if spec and spec.color then
-    attributes["style"] = "--comment-accent-color: " .. spec.color .. ";"
+    attributes["style"] = author_color_style(spec.color)
     attributes["data-comment-author"] = spec.author
   end
   local inner = pandoc.Span(
@@ -66,7 +84,7 @@ local function make_block_overlay(side, id, content_blocks, spec)
       ["data-comment-id"] = id,
       ["data-comment-author"] = spec and spec.author or nil,
       ["style"] = spec and spec.color
-        and ("--comment-accent-color: " .. spec.color .. ";") or nil,
+        and author_color_style(spec.color) or nil,
     })
   )
 end
@@ -402,7 +420,7 @@ function Div(el)
       if #style > 0 and not style:match(";%s*$") then
         style = style .. ";"
       end
-      el.attributes.style = style .. "--comment-accent-color: " .. color .. ";"
+      el.attributes.style = style .. author_color_style(color)
       el.attributes["data-comment-author"] = author
     end
   end

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

@@ -35,6 +35,24 @@ local OPENERS = {
 }
 local AUTHOR_COLORS = {}
 
+local function author_color_style(color)
+  local red = tonumber(color:sub(2, 3), 16)
+  local green = tonumber(color:sub(4, 5), 16)
+  local blue = tonumber(color:sub(6, 7), 16)
+  local function tint(component)
+    return math.floor(component * 0.13 + 255 * 0.87 + 0.5)
+  end
+  local background = string.format(
+    "#%02x%02x%02x", tint(red), tint(green), tint(blue)
+  )
+  return string.format(
+    "--comment-accent-color: %s; "
+      .. "--comment-accent-background-color: %s; "
+      .. "border-color: %s; background-color: %s;",
+    color, background, color, background
+  )
+end
+
 local comment_id = 0
 local function next_id()
   comment_id = comment_id + 1
@@ -69,7 +87,7 @@ local function make_inline_comment(side, content_inlines, spec)
           ["data-comment-author"] = spec and spec.author or nil,
           ["style"] = "font-size: 6pt;"
             .. (spec and spec.color
-              and (" --comment-accent-color: " .. spec.color .. ";") or ""),
+              and (" " .. author_color_style(spec.color)) or ""),
         }
       )
     )
@@ -101,7 +119,7 @@ local function make_block_overlay(side, id, content_blocks, spec)
         ["data-comment-author"] = spec and spec.author or nil,
         ["style"] = "font-size: 6pt;"
           .. (spec and spec.color
-            and (" --comment-accent-color: " .. spec.color .. ";") or ""),
+            and (" " .. author_color_style(spec.color)) or ""),
       }
     )
   )
@@ -441,7 +459,7 @@ function Div(el)
       if #style > 0 and not style:match(";%s*$") then
         style = style .. ";"
       end
-      el.attributes.style = style .. "--comment-accent-color: " .. color .. ";"
+      el.attributes.style = style .. author_color_style(color)
       el.attributes["data-comment-author"] = author
     end
   end

pydifftools-0.1.48/pydifftools/comments_author_colors.css

@@ -0,0 +1,20 @@
+/* Keep comment pointer triangles in sync with per-author bubble colors. */
+span.comment-pin > span.comment-right::before,
+.comment-overlay.comment-right::before {
+  border-color: transparent var(--comment-accent-color, #5aa0ff) transparent transparent;
+}
+
+span.comment-pin > span.comment-right::after,
+.comment-overlay.comment-right::after {
+  border-color: transparent var(--comment-accent-background-color, #eaf3ff) transparent transparent;
+}
+
+span.comment-pin > span.comment-left::before,
+.comment-overlay.comment-left::before {
+  border-color: transparent transparent transparent var(--comment-accent-color, #5aa0ff);
+}
+
+span.comment-pin > span.comment-left::after,
+.comment-overlay.comment-left::after {
+  border-color: transparent transparent transparent var(--comment-accent-background-color, #eaf3ff);
+}

{pydifftools-0.1.47 → pydifftools-0.1.48}/pydifftools/continuous.py

@@ -75,19 +75,24 @@ def confirm_restore_comment_filter(active_mode):
             "but you ran without the --no-comments flag.\n\n"
             "Note that you have not locally edited the filter relative to "
             "the library default.\n\n"
-            "Do you want to show comments, or continue with no comments?"
+            "Do you want to update the filter and comment styles to the "
+            "library versions and show comments, or keep no comments?"
         )
         default_choice = "restore"
+        update_label = "update filter and styles; show comments"
+        keep_label = "keep no comments"
     elif active_mode == "custom":
         message = (
-            "The current lua filter does not match the pyDiffTools library "
-            "default or the no-comments filter, but you ran without the "
-            "--no-comments flag.\n\n"
-            "Note that this looks like a locally edited filter.\n\n"
-            "Do you want to show comments using the library default, or "
-            "continue with no comments?"
+            "The current lua filter differs from the pyDiffTools library "
+            "filters, but you ran without the --no-comments flag. It may be "
+            "an older distributed filter or a local edit.\n\n"
+            "Do you want to update the filter and comment styles to the "
+            "library versions and show comments, or keep the current "
+            "filter and styles?"
         )
         default_choice = "keep"
+        update_label = "update filter and styles; show comments"
+        keep_label = "keep current filter"
     else:
         raise ValueError(
             "Comment filter restore prompt is only valid for custom or "
@@ -102,12 +107,8 @@ box = QMessageBox()
 box.setWindowTitle("pydifft cpb")
 box.setIcon(QMessageBox.Icon.Question)
 box.setText(sys.argv[1])
-keep_button = box.addButton(
-    "no comments", QMessageBox.ButtonRole.RejectRole
-)
-restore_button = box.addButton(
-    "show comments", QMessageBox.ButtonRole.AcceptRole
-)
+keep_button = box.addButton(sys.argv[3], QMessageBox.ButtonRole.RejectRole)
+restore_button = box.addButton(sys.argv[4], QMessageBox.ButtonRole.AcceptRole)
 if sys.argv[2] == "restore":
     box.setDefaultButton(restore_button)
 else:
@@ -119,7 +120,10 @@ sys.exit(1)
 """
     prepare_for_dialog()
     result = subprocess.run(
-        [sys.executable, "-c", prompt_script, message, default_choice],
+        [
+            sys.executable, "-c", prompt_script, message, default_choice,
+            keep_label, update_label,
+        ],
         capture_output=True,
         text=True,
     )
@@ -530,6 +534,10 @@ def run_pandoc(
                     shutil.copy2(
                         packaged_filters["default"], active_filter
                     )
+                    shutil.copy2(
+                        os.path.join(package_dir, "comments.css"),
+                        os.path.join(source_dir, "comments.css"),
+                    )
                     effective_filter_mode = "default"
                 else:
                     effective_filter_mode = active_mode
@@ -581,7 +589,10 @@ def run_pandoc(
         # }}}
         # Only copy the comment UI assets when comments should be rendered.
         if effective_filter_mode != "none":
-            for asset_name in ["comments.css", "comment_toggle.js"]:
+            for asset_name in [
+                "comments.css", "comments_author_colors.css",
+                "comment_toggle.js",
+            ]:
                 target_path = os.path.join(source_dir, asset_name)
                 if not os.path.exists(target_path):
                     shutil.copy2(

{pydifftools-0.1.47 → pydifftools-0.1.48}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyDiffTools"
-version = "0.1.47"
+version = "0.1.48"
 authors = [{ name = "J M Franck" }]
 description = "Diff tools"
 readme = "README.rst"
@@ -44,6 +44,7 @@ pydifftools = [
     "diff-doc.js",
     "xml2xlsx.vbs",
     "comments.css",
+    "comments_author_colors.css",
     "comment_tags.lua",
     "comment_tags_margin.lua",
     "comment_tags_no_comments.lua",