ea 0.6.140 → 0.6.141

data/lib/ea/svg/ea_emitter/element/legend_renderer.rb

@@ -32,23 +32,24 @@ module Ea
           LABEL_BASELINE_FROM_ICON_TOP = 12
           DEFAULT_ITEM_FONT_SIZE = 9
           # The legend pen is not set explicitly: the panel inherits the pen
-          # left by the previous drawing (round/bevel), or EA's initial pen
-          # (square/miter) when the legend is the first thing painted. Held
-          # across the corpus: 11 of 11 legends painted first are square, 105
-          # of 105 painted later are round.
-          INHERITED_STROKE = "stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;"
-          INITIAL_STROKE = "stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;"
+          # left by the previous drawing, or EA's initial pen (square/miter)
+          # when nothing was drawn before it - the same rule notes follow.
+          # Held across the corpus: 11 of 11 legends painted first are
+          # square/miter, 105 of 105 painted later follow a class-like
+          # drawing that leaves round/bevel.
+          INITIAL_PEN = Element::NoteShapeRenderer::INITIAL_PEN
 
-          def self.render(bounds, legend:, family:, canvas: nil, item_font: {}, first_painted: false)
-            new(bounds, legend, family, canvas, item_font, first_painted: first_painted).to_svg
+          def self.render(bounds, legend:, family:, canvas: nil, item_font: {}, pen: nil)
+            new(bounds, legend, family, canvas, item_font, pen: pen).to_svg
           end
 
-          def initialize(bounds, legend, family, canvas, item_font = {}, first_painted: false)
+          def initialize(bounds, legend, family, canvas, item_font = {}, pen: nil)
             @bounds = bounds
             @legend = legend
             @family = family
             @canvas = canvas
-            @pen = first_painted ? INITIAL_STROKE : INHERITED_STROKE
+            cap, join = pen || INITIAL_PEN
+            @pen = "stroke-width:1;stroke-linecap:#{cap};stroke-linejoin:#{join};"
             @item_font = item_font[:size]&.nonzero? ? item_font : {}
           end
 
@@ -162,10 +163,11 @@ module Ea
             (block_left + (block_right - block_left - title_text_width.round) / 2.0).floor
           end
 
-          def estimated_width(text, size, weight: nil, logical_height: nil, text_family: family)
+          def estimated_width(text, size, weight: nil, logical_height: nil, text_family: family,
+                              legend_title: false)
             TextRenderer.estimate_width(
               text, size, family: text_family, weight: weight,
-                          logical_height: logical_height
+                          logical_height: logical_height, legend_title: legend_title
             ).round
           end
 
@@ -193,7 +195,8 @@ module Ea
           end
 
           def title_text_width
-            estimated_width(legend.title, title_font_size, weight: 700, text_family: heading_family)
+            estimated_width(legend.title, title_font_size, weight: 700, text_family: heading_family,
+                                       legend_title: true)
           end
 
           def heading_family
@@ -206,7 +209,8 @@ module Ea
             TextRenderer.new(
               content: content.to_s, x: tx, y: ty,
               family: weight.zero? ? family : heading_family, size: size, size_unit: size_unit,
-              weight: weight, fill: label_fill, logical_height: weight.zero? ? item_font[:logical_height] : nil
+              weight: weight, fill: label_fill, logical_height: weight.zero? ? item_font[:logical_height] : nil,
+              legend_title: !weight.zero?
             ).to_svg
           end
 

data/lib/ea/svg/ea_emitter/element/note_shape_renderer.rb

@@ -32,14 +32,7 @@ module Ea
           # native notes: 7C44AC09 first (square/miter), 7D960BD8 after
           # square/bevel icons (square/bevel), 676B9C9A, 926AFE38, 9DA6C553
           # and C028B286 after round/bevel shapes (round/bevel).
-          INITIAL_PEN = %w[square miter].freeze
-          PEN_PATTERN = /stroke-linecap:(\w+);stroke-linejoin:(\w+)/
-
-          # The [cap, join] a rendered group leaves behind, or nil.
-          def self.pen_of(group)
-            match = PEN_PATTERN.match(group.to_s)
-            match&.captures
-          end
+          INITIAL_PEN = Pen::INITIAL
 
           def self.render(bounds, body:, fill:, stroke:, stroke_width:, family:, size:, text_fill:, pen: nil)
             new(bounds, body, fill, stroke, stroke_width, family, size, text_fill, pen || INITIAL_PEN).to_svg

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

@@ -33,13 +33,11 @@ module Ea
         def groups
           @drawn_bounds = {}
           @divider_y = {}
-          @painted_any = false
           @previous_pen = nil
           ordered_elements.flat_map do |e|
-            groups = groups_for(e)
-            @painted_any ||= groups.any?
-            @previous_pen = Element::NoteShapeRenderer.pen_of(groups.last) || @previous_pen
-            groups
+            painted = groups_for(e)
+            @previous_pen = painted.last&.pen || @previous_pen
+            painted.map(&:svg)
           end
         end
 
@@ -58,9 +56,14 @@ module Ea
         private
 
         # EA paints placements by descending Sequence (the lowest
-        # Sequence is on top); equal keys keep their stored order.
+        # Sequence is on top); equal keys keep their stored order. A
+        # placement with no Sequence (no such row in the corpus, so EA's
+        # treatment is unmeasured) is painted first, as before the
+        # descending order, rather than ahead of the numbered ones.
         def ordered_elements
-          (diagram.elements || []).sort_by.with_index { |e, i| [-(e.z_order || 0), i] }
+          (diagram.elements || []).sort_by.with_index do |e, i|
+            e.z_order ? [1, -e.z_order, i] : [0, 0, i]
+          end
         end
 
         def groups_for(element)
@@ -72,7 +75,7 @@ module Ea
           record_drawn_bounds(element, context)
           return [] if element.style&.fetch("connector_proxy", false)
 
-          Compartment.render_all(context).compact
+          Compartment.paint_all(context)
         end
 
         # Logical-space drawn bounds: stored x/y with the RENDERED
@@ -310,7 +313,6 @@ module Ea
             diagram: diagram,
             model_index: model_index,
             off_canvas_parent_name: parent_name,
-            first_painted: !@painted_any,
             previous_pen: @previous_pen
           )
         end

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

@@ -68,7 +68,9 @@ module Ea
         end
 
         def logical_height_for(element)
-          element&.font_logical_height if size_unit_for(element) == "pt"
+          return nil unless size_unit_for(element) == "pt"
+
+          Ea::Fonts::Metrics.source_logical_height(element&.font_logical_height)
         end
 
         def weight_for(element)

data/lib/ea/svg/ea_emitter/label/end_label.rb

@@ -22,6 +22,9 @@ module Ea
           SEAT_FONT_SIZE = 7
           SEAT_X_INSET = 3
           SEAT_STEREOTYPE_GAP = 12
+          SEAT_STEREOTYPE_ONLY_INSET = 8
+          SEAT_STEREOTYPE_ONLY_DROP = 15
+          SEAT_MULT_DROP = 15
           # EA keeps an end-label role's left edge at diagram x >= 3; the
           # stereotype line moves with the role. Measured on the Plateau
           # v5.1 export: of 776 saved end labels, the only three whose
@@ -142,6 +145,7 @@ module Ea
               mult_pos = target_multiplicity_seat(connector, heading, anchor, mult_box) ||
                          target_diagonal_property_multiplicity(connector, heading, anchor, text_box, mult_box) ||
                          face_multiplicity || target_horizontal_multiplicity(heading, anchor, mult_box, mult) ||
+                         target_sloped_rightward_multiplicity(connector, heading, anchor, mult_box, role, mult) ||
                          mult_pos
             end
 
@@ -152,10 +156,14 @@ module Ea
                                                           [text_box, mult_box], mult) || mult_pos
               if external_upward_property_source?(connector, heading, anchor, text_box, source_bounds)
                 text_pos = external_upward_property_role(anchor, role) || text_pos
+                mult_pos = external_upward_property_multiplicity(anchor, mult) || mult_pos
               end
             end
 
-            text_box = text_box.merge("alignment" => 1) if phantom_property_box?(connector, direction, text_box)
+            if phantom_property_box?(connector, direction, text_box) ||
+               rightward_phantom_property_box?(connector, direction, text_box)
+              text_box = text_box.merge("alignment" => 1)
+            end
 
             if end_kind == :target && !from_property
               bend_positions = target_bend_positions(connector, bend, text_box, mult_box, role)
@@ -325,12 +333,30 @@ module Ea
           # fallback.
           def own_stereotype_only(text_box, anchor, connector, end_kind)
             stereo = connector_source_dest_stereotype(connector, end_kind)
-            pos = position_at(text_box, anchor)
+            pos = stereotype_only_seat(text_box, anchor, connector, end_kind, stereo) ||
+                  position_at(text_box, anchor)
             return [] if stereo.nil? || stereo.empty? || pos.nil?
 
             [text_at(pos[0], pos[1], "«#{stereo}»")]
           end
 
+          # EMPIRICAL FIT (34FF671B and 5038EEE3, the only two ends in the
+          # Plateau v5.1 corpus that draw a Property stereotype with no role
+          # or multiplicity): a one-line centred target box is seated at its
+          # corner, anchor + (OX, OY) with no sign flip, like the source-end
+          # corner seat; the stereotype ends 8px left of the corner and its
+          # baseline sits 15px below it. Both reproduce the native SVG exactly.
+          def stereotype_only_seat(text_box, anchor, connector, end_kind, stereo)
+            return nil unless end_kind == :target && property_label?(connector, end_kind)
+            return nil unless seat_font? && cambria_box?(text_box) && text_box.values_at("alignment", "cy") == [1, 16]
+
+            width = Ea::Fonts::Metrics.text_length("«#{stereo}»", font_size, family: font_family)
+            return nil unless width
+
+            x, y = seat_corner(anchor, text_box)
+            [x - width - SEAT_STEREOTYPE_ONLY_INSET, y + SEAT_STEREOTYPE_ONLY_DROP]
+          end
+
           # EA's tree-route label clusters (hand-verified against the
           # EA-published reference, SY 8542 with canvas=(0,0)):
           # source-end pairs stack at the exit point (role +3/-23,
@@ -374,8 +400,8 @@ module Ea
                          role.to_s.length * 6
             mult_width = Ea::Fonts::Metrics.text_length(mult.to_s, font_size, family: font_family) ||
                          mult.to_s.length * 6
-            [[anchor[0] - 60 - role_width, anchor[1] - 7],
-             [anchor[0] - mult_width - 3, anchor[1] + 15]]
+            [[[anchor[0] - 60 - role_width, MIN_ROLE_X].max, anchor[1] - 7],
+             [[anchor[0] - mult_width - 3, MIN_ROLE_X].max, anchor[1] + 15]]
           end
 
           # Stored source-end boxes on a 7pt label whose first leg
@@ -461,10 +487,10 @@ module Ea
           end
 
           # Measured box heights: left/down Property clusters store CY 35,
-          # right-seat clusters CY 31. Phantom outlines leaving down carry a
-          # synthesized zero box that centers the same way.
+          # right-seat and up clusters CY 31. Phantom outlines leaving down
+          # carry a synthesized zero box that centers the same way.
           def centered_property_box?(connector, direction, box)
-            cy = { left: 35, down: 35, right: 31 }[direction]
+            cy = { left: 35, down: 35, right: 31, up: 31 }[direction]
             (cy && box.values_at("cy", "alignment") == [cy, 1]) ||
               (direction == :down && phantom_property_box?(connector, direction, box))
           end
@@ -486,6 +512,16 @@ module Ea
               property_label?(connector, :source)
           end
 
+          # A rightward phantom keeps the plain role seat; only its stereotype
+          # is centred under the role (0BE81AC5: native stereotype 4px right of
+          # the role for a 52px role over a 44px stereotype).
+          def rightward_phantom_property_box?(connector, direction, box)
+            direction == :right && seat_font? && cambria_box?(box) &&
+              box["alignment"].nil? && stored_offsets_zero?(box) &&
+              connector.style.to_h[:phantom_outline] == true &&
+              property_label?(connector, :source)
+          end
+
           def property_role_x(direction, origin, offset)
             direction == :right ? origin + offset : origin - offset
           end
@@ -526,6 +562,17 @@ module Ea
             [[anchor[0] - inset - width, MIN_ROLE_X].max, anchor[1] + baseline]
           end
 
+          # Multiplicity of a floating upward source (5038EEE3: both such
+          # ends, QEA; native "0..1" at anchor.x - width - 3, anchor.y + 15).
+          def external_upward_property_multiplicity(anchor, mult)
+            return nil if mult_empty?(mult)
+
+            width = Ea::Fonts::Metrics.text_length(mult, font_size, family: font_family)
+            return nil unless width
+
+            [anchor[0] - width - SEAT_X_INSET, anchor[1] + SEAT_MULT_DROP]
+          end
+
           def external_upward_property_source?(connector, heading, anchor, box, bounds)
             upward_source_heading?(heading) &&
               zero_source_property_box?(box) && cambria_box?(box) && source_property_cambria?(connector) &&
@@ -886,6 +933,18 @@ module Ea
             mult_seat(:right, anchor, box)
           end
 
+          # EMPIRICAL FIT (5038EEE3, the only connector in the Plateau v5.1
+          # corpus with a Property source and a role-less target whose leg
+          # arrives sloped from the right):
+          # the multiplicity takes the rightward corner seat, as on a
+          # horizontal rightward leg. Reproduces the native SVG exactly.
+          def target_sloped_rightward_multiplicity(connector, heading, anchor, box, role, mult)
+            return nil unless seat_font? && role_empty?(role) && !mult_empty?(mult)
+            return nil unless heading && heading[0] > heading[1].abs && property_label?(connector, :source)
+
+            mult_seat(:right, anchor, box)
+          end
+
           def target_left_face_multiplicity?(connector, heading, box, mult, target_face)
             seat_font? && !mult_empty?(mult) && property_label?(connector, :target) && cambria_box?(box) &&
               stored_offsets_zero?(box) && target_left_face_heading?(heading, target_face)
@@ -905,9 +964,12 @@ module Ea
           end
 
           def target_multiplicity_box?(connector, box)
-            # Property targets seat at the stored corner; plain moved labels
-            # retain their explicit offsets.
-            cambria_box?(box) && (stored_offsets_zero?(box) || property_label?(connector, :target))
+            # Property targets and vertical tree targets (5038EEE3) seat at
+            # the stored corner; plain moved labels retain their explicit
+            # offsets.
+            cambria_box?(box) &&
+              (stored_offsets_zero?(box) || property_label?(connector, :target) ||
+               connector.style.to_h[:tree] == "LV")
           end
 
           def cambria_box?(box)

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

@@ -91,8 +91,8 @@ module Ea
           stored_tgt = end_boxes(boxes, :lrt, :lrb)
           umldi_bounds = connector.umldi_label_bounds || {}
           stored_labels = !(stored_src.nil? && stored_tgt.nil?) || !umldi_bounds.empty?
-          src_tb, src_mb = stored_src || unstored_label_boxes(points, :source, stored_labels)
-          tgt_tb, tgt_mb = stored_tgt || unstored_label_boxes(points, :target, stored_labels)
+          src_tb, src_mb = stored_src || unstored_label_boxes(points, :source, stored_labels, connector)
+          tgt_tb, tgt_mb = stored_tgt || unstored_label_boxes(points, :target, stored_labels, connector)
 
           texts = []
           end_renderer.texts(text_box: src_tb, mult_box: src_mb,
@@ -126,8 +126,15 @@ module Ea
 
         # A connector that stores label boxes for only one end seats the
         # other end's labels at its anchor, like a stored zero offset.
-        def unstored_label_boxes(points, end_kind, stored_labels)
+        #
+        # A phantom outline has no saved link row, so EA draws its default
+        # (centred) label: the synthesized zero box carries no alignment,
+        # exactly like the QEA phantom's DEFAULT_LABEL_BOXES. Measured on
+        # the Plateau v5.1 export (A081C63E: 4 «property» lines, centred
+        # under the role in the native SVG, left-aligned from XMI).
+        def unstored_label_boxes(points, end_kind, stored_labels, connector)
           return default_label_boxes(points, end_kind) unless stored_labels
+          return [{ "ox" => 0, "oy" => 0 }, { "ox" => 0, "oy" => 0 }] if connector.style.to_h[:phantom_outline] == true
 
           [{ "ox" => 0, "oy" => 0, "alignment" => 0 }, { "ox" => 0, "oy" => 0, "alignment" => 0 }]
         end

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

@@ -32,14 +32,11 @@ module Ea
           @document = document
         end
 
+        # Emitted once per sequencer: the canvas, diagram and options
+        # are fixed at construction, so a re-layout builds a new
+        # sequencer rather than re-emitting this one.
         def layers
-          layers = [Background.render(canvas)]
-          layers += frame_layers if frame_enabled
-          layers += element_layers
-          layers += connector_layers
-          layers << labels_layer
-          layers << ghost_labels_layer
-          layers
+          @layers ||= build_layers.freeze
         end
 
         # Final drawn Bounds per model element ref (grown heights,
@@ -67,6 +64,16 @@ module Ea
 
         private
 
+        def build_layers
+          layers = [Background.render(canvas)]
+          layers += frame_layers if frame_enabled
+          layers += element_layers
+          layers += connector_layers
+          layers << labels_layer
+          layers << ghost_labels_layer
+          layers
+        end
+
         def frame_layers
           DiagramFrame.new(canvas: canvas, theme: theme).layers(diagram).map(&:to_svg)
         end

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

@@ -7,8 +7,9 @@ module Ea
       # 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 follow the keyed ones, and
-      # phantoms (no stored key) come last, each in link order.
+      # 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
 
@@ -18,9 +19,9 @@ module Ea
             rank = if order.nil?
                      2
                    else
-                     order.empty? ? 1 : 0
+                     order.empty? || order.any?(&:nil?) ? 1 : 0
                    end
-            [rank, order || [], index]
+            [rank, rank.zero? ? order : [], index]
           end.map(&:first)
         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, :first_painted, :previous_pen,
+        :off_canvas_parent_name, :previous_pen,
         keyword_init: true
       )
         def note_body

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

@@ -32,6 +32,7 @@ module Ea
       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"

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.140"
+  VERSION = "0.6.141"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.140
+  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
@@ -982,6 +982,7 @@ files:
 - 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