canon 0.1.21 → 0.1.23

data/lib/canon/diff_formatter.rb

@@ -168,7 +168,8 @@ module Canon
                    character_map_file: nil, character_definitions: nil,
                    show_diffs: :all, verbose_diff: false,
                    show_raw_inputs: false, show_preprocessed_inputs: false,
-                   show_line_numbered_inputs: false)
+                   show_line_numbered_inputs: false,
+                   diff_mode: :separate, legacy_terminal: false)
       # rubocop:enable Metrics/ParameterLists
       @use_color = use_color
       @mode = mode
@@ -179,6 +180,8 @@ module Canon
       @show_raw_inputs = show_raw_inputs
       @show_preprocessed_inputs = show_preprocessed_inputs
       @show_line_numbered_inputs = show_line_numbered_inputs
+      @diff_mode = legacy_terminal ? :separate : diff_mode
+      @legacy_terminal = legacy_terminal
       @visualization_map = build_visualization_map(
         visualization_map: visualization_map,
         character_map_file: character_map_file,
@@ -259,19 +262,16 @@ module Canon
     # @param html_version [Symbol, nil] HTML version (:html4 or :html5)
     # @return [String] Formatted output
     def format(differences, format, doc1: nil, doc2: nil, html_version: nil)
-      # In by-line mode with doc1/doc2, always perform diff regardless of differences
+      # In by-line mode, always use by-line diff
       if @mode == :by_line && doc1 && doc2
         return by_line_diff(doc1, doc2, format: format,
                                         html_version: html_version,
                                         differences: differences)
       end
 
-      # Check if no differences (handle both ComparisonResult and legacy Array)
       no_diffs = if differences.respond_to?(:equivalent?)
-                   # ComparisonResult object (production path)
                    differences.equivalent?
                  else
-                   # Legacy Array (for low-level tests)
                    differences.empty?
                  end
       return success_message if no_diffs
@@ -644,10 +644,12 @@ differences: [])
 
       return output.join("\n") if doc1.nil? || doc2.nil?
 
-      # Extract differences array from ComparisonResult if needed
+      # Extract differences array and equivalent status from ComparisonResult if needed
       diffs_array = if differences.is_a?(Canon::Comparison::ComparisonResult)
+                      @comparison_equivalent = differences.equivalent?
                       differences.differences
                     else
+                      @comparison_equivalent = nil
                       differences
                     end
 
@@ -660,6 +662,9 @@ differences: [])
         visualization_map: @visualization_map,
         show_diffs: @show_diffs,
         differences: diffs_array,
+        diff_mode: @legacy_terminal ? :separate : @diff_mode,
+        legacy_terminal: @legacy_terminal,
+        equivalent: @comparison_equivalent,
       )
 
       output << formatter.format(doc1, doc2)

data/lib/canon/tree_diff/matchers/hash_matcher.rb

@@ -88,9 +88,24 @@ module Canon
 
         def match_node(node2)
           sig2 = Core::NodeSignature.for(node2)
-          candidates = (@signature_map[sig2] || []).reject { |n| @matched_tree1.include?(n) }
+          candidates = (@signature_map[sig2] || []).reject do |n|
+            @matched_tree1.include?(n)
+          end
           return if candidates.empty?
 
+          # When multiple candidates have identical signatures (common with
+          # duplicate subtrees like MathML formulas), sort by sibling position
+          # proximity to prefer matching nodes at the same position within
+          # their parent. This reduces cross-matching that causes cascading
+          # prefix closure failures.
+          if candidates.size > 1
+            pos2 = node2.position || 0
+            candidates = candidates.sort_by do |c|
+              pos1 = c.position || 0
+              (pos1 - pos2).abs
+            end
+          end
+
           # Try each candidate until one passes both subtree matching
           # AND the prefix closure constraint in matching.add.
           # When multiple candidates have identical subtrees (e.g., labels

data/lib/canon/tree_diff/matchers/similarity_matcher.rb

@@ -96,6 +96,7 @@ module Canon
         def match_group(nodes1, nodes2)
           # Create similarity matrix
           matches = []
+          ambiguous = nodes1.size > 1
 
           nodes2.each do |node2|
             next if @matching.matched2?(node2)
@@ -116,6 +117,15 @@ module Canon
 
               similarity = node1.similarity_to(node2)
 
+              # When multiple candidates exist, penalize attribute value
+              # mismatches to prevent cross-matching of nodes with same
+              # structure but different IDs. Uses TreeNode#attribute_difference
+              # for consistent attribute comparison across the tree_diff module.
+              if similarity >= @threshold && ambiguous && !node1.attributes.empty?
+                attr_diff = node1.attribute_difference(node2)
+                similarity *= (1.0 - attr_diff) if attr_diff.positive?
+              end
+
               if similarity > best_similarity
                 best_similarity = similarity
                 best_match = node1

data/lib/canon/tree_diff/operations/operation_detector.rb

@@ -518,7 +518,11 @@ module Canon
           return false if text1.empty? || text2.empty?
 
           similarity = text_similarity(text1, text2)
-          similarity >= 0.9 # 90% similarity for hierarchy changes
+          return false unless similarity >= 0.9
+
+          # Verify attribute values match to prevent false upgrade/downgrade
+          # detection on nodes with same text but different attribute values
+          node1.attributes == node2.attributes
         end
 
         # Extract all text content from a node and its descendants

data/lib/canon/tree_diff/tree_diff_integrator.rb

@@ -188,7 +188,7 @@ module Canon
       # @return [Integer, nil] Max node count
       def get_max_node_count
         # Get from options if provided, otherwise use default
-        @options[:max_node_count] || 10_000
+        @options[:max_node_count] || 30_000
       end
     end
   end

data/lib/canon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Canon
-  VERSION = "0.1.21"
+  VERSION = "0.1.23"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canon
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.23
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-27 00:00:00.000000000 Z
+date: 2026-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -155,6 +155,7 @@ files:
 - docs/features/diff-formatting/context-and-grouping.adoc
 - docs/features/diff-formatting/display-filtering.adoc
 - docs/features/diff-formatting/index.adoc
+- docs/features/diff-formatting/themes.adoc
 - docs/features/environment-configuration/index.adoc
 - docs/features/environment-configuration/override-system.adoc
 - docs/features/environment-configuration/size-limits.adoc
@@ -172,6 +173,7 @@ files:
 - docs/interfaces/index.adoc
 - docs/interfaces/rspec/index.adoc
 - docs/interfaces/ruby-api/index.adoc
+- docs/internals/diff-char-range-pipeline.adoc
 - docs/internals/diffnode-enrichment.adoc
 - docs/internals/index.adoc
 - docs/lychee.toml
@@ -190,6 +192,7 @@ files:
 - docs/understanding/formats/xml.adoc
 - docs/understanding/formats/yaml.adoc
 - docs/understanding/index.adoc
+- examples/show_themes.rb
 - exe/canon
 - lib/canon.rb
 - lib/canon/cache.rb
@@ -248,17 +251,22 @@ files:
 - lib/canon/data_model.rb
 - lib/canon/diff/diff_block.rb
 - lib/canon/diff/diff_block_builder.rb
+- lib/canon/diff/diff_char_range.rb
 - lib/canon/diff/diff_classifier.rb
 - lib/canon/diff/diff_context.rb
 - lib/canon/diff/diff_context_builder.rb
 - lib/canon/diff/diff_line.rb
+- lib/canon/diff/diff_line_builder.rb
 - lib/canon/diff/diff_node.rb
+- lib/canon/diff/diff_node_enricher.rb
 - lib/canon/diff/diff_node_mapper.rb
 - lib/canon/diff/diff_report.rb
 - lib/canon/diff/diff_report_builder.rb
 - lib/canon/diff/formatting_detector.rb
 - lib/canon/diff/node_serializer.rb
 - lib/canon/diff/path_builder.rb
+- lib/canon/diff/source_locator.rb
+- lib/canon/diff/text_decomposer.rb
 - lib/canon/diff/xml_serialization_formatter.rb
 - lib/canon/diff_formatter.rb
 - lib/canon/diff_formatter/by_line/base_formatter.rb
@@ -280,6 +288,7 @@ files:
 - lib/canon/diff_formatter/diff_detail_formatter/node_utils.rb
 - lib/canon/diff_formatter/diff_detail_formatter/text_utils.rb
 - lib/canon/diff_formatter/legend.rb
+- lib/canon/diff_formatter/theme.rb
 - lib/canon/errors.rb
 - lib/canon/formatters/html4_formatter.rb
 - lib/canon/formatters/html5_formatter.rb