ea 0.6.139 → 0.6.141

data/lib/ea/svg/ea_emitter/markers.rb

@@ -52,17 +52,28 @@ module Ea
           entries = visible_connectors.flat_map { |c| entries_for(c) }
 
           if grouped
-            entries.group_by { |e| [e.style_key, e.stroke_width] }.map do |(key, width), grouped_entries|
+            entries.group_by { |e| [e.style_key, e.stroke_width, e.stroke_color] }.map do |(key, width, color), grouped_entries|
               # EA emits ONE marker per connector regardless of
               # anchor overlap. Verified against plateau Bridge
               # diagram: 9 generalizations fanning from the same
               # parent anchor produce 9 distinct triangle polygons
               # at the same coordinates. The earlier "dedup by
               # anchor" hypothesis is disproven by reference SVGs.
-              marker_layer(key, width, grouped_entries.map(&:body).join("\n  "))
+              marker_layer(key, width, color, grouped_entries.map(&:body).join("\n  "))
             end
           else
-            entries.map { |e| marker_layer(e.style_key, e.stroke_width, e.body) }
+            entries.map { |e| marker_layer(e.style_key, e.stroke_width, e.stroke_color, e.body) }
+          end
+        end
+
+        # One `[connector, Layer]` pair per marker, in diagram link
+        # order, so the sequencer can paint each connector's heads right
+        # after its line like EA does.
+        def connector_layers
+          visible_connectors.flat_map do |connector|
+            entries_for(connector).map do |e|
+              [connector, marker_layer(e.style_key, e.stroke_width, e.stroke_color, e.body)]
+            end
           end
         end
 
@@ -86,7 +97,7 @@ module Ea
         # drives dedup — EA emits one marker per connector.
         Entry = Struct.new(:style_key, :body, :anchor,
                            :connector_waypoint_count, :stroke_width,
-                           keyword_init: true) do
+                           :stroke_color, keyword_init: true) do
           def hash
             anchor.hash
           end
@@ -140,18 +151,18 @@ module Ea
           connector_line: { fill: "#000000", opacity: "0.00" }
         }.freeze
 
-        def marker_layer(key, width, body)
-          Layer.new(style_key: Connectors.layer_key(key, width, stroke_width),
-                    style: style_for(key, width), body: body)
+        def marker_layer(key, width, color, body)
+          Layer.new(style_key: Connectors.layer_key(key, width, stroke_width, color),
+                    style: style_for(key, width, color), body: body)
         end
 
-        def style_for(key, width = stroke_width)
+        def style_for(key, width = stroke_width, color = Connectors::DEFAULT_STROKE)
           spec = STYLE_MAP[key]
           return nil unless spec
 
           "stroke-width:#{width};stroke-linecap:round;stroke-linejoin:bevel; " \
             "fill:#{spec[:fill]};fill-opacity:#{spec[:opacity]}; " \
-            "stroke:#000000; stroke-opacity:1.00"
+            "stroke:#{color}; stroke-opacity:1.00"
         end
 
         def visible_connectors
@@ -171,7 +182,8 @@ module Ea
                       body: body,
                       anchor: anchor_for(spec),
                       connector_waypoint_count: waypoint_count,
-                      stroke_width: Connectors.stroke_width_for(connector, stroke_width))
+                      stroke_width: Connectors.stroke_width_for(connector, stroke_width),
+                      stroke_color: Connectors.stroke_color_for(connector))
           end
         end
 

data/lib/ea/svg/ea_emitter/paint_order.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Ea
+  module Svg
+    module EaEmitter
+      # EA paints connectors (each line followed by its heads) ordered by the
+      # start element's placement row, then the connector id: the
+      # `paint_order` key the diagram builders store. Verified without a
+      # single inversion over 12785 connector pairs of the QEA corpus.
+      # Connectors with an unresolvable key (empty, or with a nil part)
+      # follow the keyed ones, and phantoms (no stored key) come last, each
+      # in link order.
+      module PaintOrder
+        module_function
+
+        def connectors(diagram)
+          (diagram.connectors || []).each_with_index.sort_by do |connector, index|
+            order = connector.paint_order
+            rank = if order.nil?
+                     2
+                   else
+                     order.empty? || order.any?(&:nil?) ? 1 : 0
+                   end
+            [rank, rank.zero? ? order : [], index]
+          end.map(&:first)
+        end
+      end
+    end
+  end
+end

data/lib/ea/svg/ea_emitter/pen.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Ea
+  module Svg
+    module EaEmitter
+      # The [cap, join] stroke pen a drawing leaves behind. EA never sets a
+      # pen on notes and legends: they take whatever the previous drawing
+      # left, so the emitter threads the pen from one element to the next.
+      module Pen
+        ROUND_BEVEL = %w[round bevel].freeze
+        SQUARE_BEVEL = %w[square bevel].freeze
+        SQUARE_MITER = %w[square miter].freeze
+
+        # The pen in force when nothing has been drawn yet.
+        INITIAL = SQUARE_MITER
+      end
+    end
+  end
+end

data/lib/ea/svg/ea_emitter/render_context.rb

@@ -19,7 +19,7 @@ module Ea
         :enum_literals, :tagged_values, :constraints, :marker_lines,
         :package_content_lines,
         :geometry, :theme, :canvas, :diagram, :model_index,
-        :off_canvas_parent_name,
+        :off_canvas_parent_name, :previous_pen,
         keyword_init: true
       )
         def note_body
@@ -57,11 +57,22 @@ module Ea
         # roles; the XMI reads them as ownedAttribute), so a class whose
         # only properties are association ends has no feature compartment
         # and no divider (A59065AF urf::Administration).
+        #
+        # A diagram that suppresses a whole feature kind (Style
+        # HideAtts=1 / HideOps=1) has no such compartment to draw, so
+        # that kind never earns a divider: 4881CEEE (HideAtts=1 and
+        # HideOps=1) draws none over classes that own attributes,
+        # 8FD488EF likewise. Per-attribute visibility toggles are a
+        # different mechanism and keep the divider (10E3E08A).
         def hidden_features_present?
           return false unless classifier.respond_to?(:properties)
 
-          classifier.properties.any? { |property| !property.association_id } ||
-            classifier.operations.any?
+          config = diagram&.display_config
+          shows_attributes = config.nil? || config.show_attributes?
+          shows_operations = config.nil? || config.show_operations?
+
+          (shows_attributes && classifier.properties.any? { |property| !property.association_id }) ||
+            (shows_operations && classifier.operations.any?)
         end
       end
     end

data/lib/ea/svg/ea_emitter/text_renderer.rb

@@ -24,14 +24,15 @@ module Ea
 
         attr_reader :content, :x, :y, :family, :size, :weight, :style,
                     :fill, :text_length, :rotation, :size_unit,
-                    :stroke_in_text, :width_factor, :logical_height
+                    :stroke_in_text, :width_factor, :logical_height, :legend_title
 
         def initialize(content:, x:, y:, family:, size:, weight: 400,
                        style: "normal", fill: DEFAULT_FILL,
                        text_length: nil, rotation: DEFAULT_ROTATION,
                        size_unit: "px", logical_height: nil,
                        stroke_in_text: DEFAULT_STROKE_IN_TEXT,
-                       width_factor: DEFAULT_WIDTH_FACTOR)
+                       width_factor: DEFAULT_WIDTH_FACTOR, legend_title: false)
+          @legend_title = legend_title
           @content = content.to_s
           @x = x
           @y = y
@@ -155,23 +156,38 @@ module Ea
         GLYPH_FALLBACK = 0.61
 
         def self.estimate_width(text, size, _width_factor = nil, family: nil,
-                                weight: nil, style: nil, logical_height: nil)
-          real = Ea::Fonts::Metrics.text_length(text, size, family: family,
-                                                            weight: weight,
-                                                            style: style, logical_height: logical_height)
+                                weight: nil, style: nil, logical_height: nil,
+                                legend_title: false)
+          opts = { family: family, weight: weight, style: style,
+                   logical_height: logical_height, legend_title: legend_title }
+          real = Ea::Fonts::Metrics.text_length(text, size, **opts)
           return real if real
+          return piecewise_width(text, size, opts) if Ea::Fonts::Metrics.piecewise_family?(family, size)
 
+          text.to_s.each_char.sum { |ch| glyph_estimate(ch, size) }
+        end
+
+        # A Cambria run outside 7pt that is not wholly in the measured
+        # table: table characters are exact, the rest are estimated one
+        # at a time with the glyph fallback, so the
+        # width never shrinks when a character is appended.
+        def self.piecewise_width(text, size, opts)
           text.to_s.each_char.sum do |ch|
-            (GLYPH_WIDTHS[ch] || GLYPH_FALLBACK) * size.to_f
+            Ea::Fonts::Metrics.text_length(ch, size, **opts) || glyph_estimate(ch, size)
           end
         end
 
+        def self.glyph_estimate(char, size)
+          (GLYPH_WIDTHS[char] || GLYPH_FALLBACK) * size.to_f
+        end
+
         def formatted_text_length
           return text_length.to_i.to_s if text_length
 
           width = self.class.estimate_width(content, size, width_factor,
                                             family: family, weight: weight,
-                                            style: style, logical_height: logical_height)
+                                            style: style, logical_height: logical_height,
+                                            legend_title: legend_title)
           width.round.to_s
         end
 

data/lib/ea/svg/ea_emitter.rb

@@ -26,10 +26,15 @@ module Ea
     #
     module EaEmitter
       autoload :Canvas, "ea/svg/ea_emitter/canvas"
+      autoload :CanvasAnchor, "ea/svg/ea_emitter/canvas_anchor"
+      autoload :BottomMargin, "ea/svg/ea_emitter/bottom_margin"
+      autoload :ContentExtent, "ea/svg/ea_emitter/content_extent"
       autoload :Background, "ea/svg/ea_emitter/background"
       autoload :BoundsCalculator, "ea/svg/ea_emitter/bounds_calculator"
       autoload :Style, "ea/svg/ea_emitter/style"
+      autoload :Pen, "ea/svg/ea_emitter/pen"
       autoload :Elements, "ea/svg/ea_emitter/elements"
+      autoload :PaintOrder, "ea/svg/ea_emitter/paint_order"
       autoload :Connectors, "ea/svg/ea_emitter/connectors"
       autoload :ConnectorBridges, "ea/svg/ea_emitter/connector_bridges"
       private_constant :ConnectorBridges

data/lib/ea/svg/parity/source.rb

@@ -44,7 +44,7 @@ module Ea
         private
 
         def load_qea
-          raise NotImplementedError, "QEA Document loading not yet wired into bench"
+          Ea::Sources::Qea::Adapter.from_path(path)
         end
 
         def load_xmi

data/lib/ea/version.rb

@@ -4,5 +4,5 @@ module Ea
   # Gem release version. Extracted to its own file so the
   # `gem-release` tool's `gem bump` can find and update it via the
   # standard `lib/<gem>/version.rb` convention.
-  VERSION = "0.6.139"
+  VERSION = "0.6.141"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.139
+  version: 0.6.141
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-21 00:00:00.000000000 Z
+date: 2026-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -854,6 +854,7 @@ files:
 - lib/ea/sources/xmi/diagram_builder.rb
 - lib/ea/sources/xmi/diagram_builder/association_class_metadata.rb
 - lib/ea/sources/xmi/diagram_builder/connector_metadata.rb
+- lib/ea/sources/xmi/diagram_builder/element_borders.rb
 - lib/ea/sources/xmi/diagram_builder/font_settings.rb
 - lib/ea/sources/xmi/diagram_builder/stereotype_profiles.rb
 - lib/ea/sources/xmi/diagram_builder/umldi_edges.rb
@@ -875,6 +876,7 @@ files:
 - lib/ea/sources/xmi/relationship_type_map.rb
 - lib/ea/sources/xmi/stereotype_builder.rb
 - lib/ea/sources/xmi/stored_route.rb
+- lib/ea/sources/xmi/stored_route/reversed_routes.rb
 - lib/ea/sources/xmi/tag_builder.rb
 - lib/ea/sources/xmi/type_classifier_map.rb
 - lib/ea/sources/xmi/umldi_keyword_extractor.rb
@@ -898,8 +900,10 @@ files:
 - lib/ea/svg/connector_router.rb
 - lib/ea/svg/ea_emitter.rb
 - lib/ea/svg/ea_emitter/background.rb
+- lib/ea/svg/ea_emitter/bottom_margin.rb
 - lib/ea/svg/ea_emitter/bounds_calculator.rb
 - lib/ea/svg/ea_emitter/canvas.rb
+- lib/ea/svg/ea_emitter/canvas_anchor.rb
 - lib/ea/svg/ea_emitter/color_resolver.rb
 - lib/ea/svg/ea_emitter/compartment.rb
 - lib/ea/svg/ea_emitter/compartment/attributes.rb
@@ -922,6 +926,7 @@ files:
 - lib/ea/svg/ea_emitter/connector_bridges.rb
 - lib/ea/svg/ea_emitter/connector_redock.rb
 - lib/ea/svg/ea_emitter/connectors.rb
+- lib/ea/svg/ea_emitter/content_extent.rb
 - lib/ea/svg/ea_emitter/diagram_frame.rb
 - lib/ea/svg/ea_emitter/document.rb
 - lib/ea/svg/ea_emitter/element.rb
@@ -976,6 +981,8 @@ files:
 - lib/ea/svg/ea_emitter/marker/registry.rb
 - lib/ea/svg/ea_emitter/markers.rb
 - lib/ea/svg/ea_emitter/orthogonal_ray.rb
+- lib/ea/svg/ea_emitter/paint_order.rb
+- lib/ea/svg/ea_emitter/pen.rb
 - lib/ea/svg/ea_emitter/render_context.rb
 - lib/ea/svg/ea_emitter/segment_geometry.rb
 - lib/ea/svg/ea_emitter/style.rb