ea 0.6.9 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7d2aed2a05d86d6a3d22563b4b00075aefd9434ca1f35688266f4642412f084
-  data.tar.gz: fc75e5261165acd1e12b7d9254cbff578067ab2c4f3519b591f09ab6dd7f065e
+  metadata.gz: c33a8ed4fa47f762a4ced58e7525a0612927510f35c3367423c14651c1aa7017
+  data.tar.gz: d0e757281769b12bbee152bc415d0fdfd441fb022a2dbd29213efb1cce06a41c
 SHA512:
-  metadata.gz: 57a363b3985d2f3035d71fcb955046a6ec15f6fce0e0984cbf98c948e6c8bfccc33f0a1d5e6c4135c705e255f8976a9e5f5592172a0c360655ffc899d1b7cd85
-  data.tar.gz: 0dbc829885ba08e75287a92f09ec6a5ba67d68a253a4afbb7f7b3f3b79276788d54eff61b9fcba4dd024321b210a78fb2e73b1023f89749962456868e918c01d
+  metadata.gz: f76e15be4c2a04d97fdc169ff4bf79da55c72a49c14b8e553c26e4659ec04373bd6b479364c86447a732b8405d5c9c1d108bd8ae8d4e57506ed673cd21e924d4
+  data.tar.gz: '025978b5e6c9ce71457d0a86635072ffc0082bfff9dcd3a0f64657d498adc5ffd6b347097af3974993ef1f5e42f0e2824d5a59197504e6a3839df4dd96167f39'

data/lib/ea/fonts/metrics.rb

@@ -28,8 +28,10 @@ module Ea
       DEFAULT_ADVANCE = 0.25
 
       # Carlito has no CJK glyphs; EA's renderer falls back to a
-      # full-width CJK font (~1em per glyph) for those ranges.
-      CJK_ADVANCE = 1.0
+      # proportional CJK font whose advances measure ~0.709em at the
+      # NOMINAL size (not scaled by the per-style factors) — fitted
+      # from EA-published textLengths (52 mixed-script samples).
+      CJK_ADVANCE = 0.709
       CJK_RANGES = [
         (0x3000..0x303F),   # CJK punctuation
         (0x3040..0x309F),   # Hiragana
@@ -46,19 +48,28 @@ module Ea
         return nil unless supported_family?(family)
         return nil if text.nil? || text.empty?
 
-        em = advance_em(text, weight: weight, style: style)
-        (em * size_pt.to_f * factor_for(weight, style)).round(3)
+        latin, cjk_count = split_advance(text, weight: weight, style: style)
+        (latin * size_pt.to_f * factor_for(weight, style) +
+         cjk_count * CJK_ADVANCE * size_pt.to_f).round(3)
       end
 
       def supported_family?(family)
         SUPPORTED_FAMILIES.include?(family.to_s)
       end
 
-      def advance_em(text, weight: nil, style: nil)
+      # Returns [latin_em (factor-scaled later), cjk_glyph_count].
+      def split_advance(text, weight: nil, style: nil)
         table = table_for(weight, style)
-        text.each_char.sum do |ch|
-          table[cp_key(ch)] || (cjk?(ch.ord) ? CJK_ADVANCE : DEFAULT_ADVANCE)
+        latin = 0.0
+        cjk = 0
+        text.each_char.each do |ch|
+          if cjk?(ch.ord)
+            cjk += 1
+          else
+            latin += table[cp_key(ch)] || DEFAULT_ADVANCE
+          end
         end
+        [latin, cjk]
       end
 
       def cjk?(cp)

data/lib/ea/sources/qea/diagram_builder.rb

@@ -377,7 +377,10 @@ module Ea
                          element_edge_point(target_placement, :target, edge_out)
 
           intermediate = intermediate_waypoints(link_row)
-          if intermediate.any?
+          if tree_route?(edge_out, intermediate)
+            points = tree_waypoints(source_placement, target_placement,
+                                    intermediate.first)
+          elsif intermediate.any?
             points = [source_point, *intermediate, target_point]
           elsif source_port || target_port
             # Exact ports are known — the SX/SY bend heuristics in
@@ -392,6 +395,26 @@ module Ea
           end
         end
 
+        # EA's tree-style routing (Geometry EDGE=2 with a single Path
+        # bend): the visible line leaves the SOURCE's right edge at
+        # the bend's y, runs horizontally to the bend x, then
+        # vertically to the target's facing edge — replacing the
+        # ray-cast ports entirely. Verified against the
+        # CityObjectGroup reference (parent + groupMember lines).
+        def tree_route?(edge_out, intermediate)
+          edge_out == 2 && intermediate.size == 1
+        end
+
+        def tree_waypoints(source_placement, target_placement, bend)
+          src = bounds_from_rect(source_placement)
+          tgt = bounds_from_rect(target_placement)
+          bend_x = bend[0]
+          source_point = [src.x + src.width, bend[1]]
+          going_up = tgt.y + tgt.height <= src.y
+          target_y = going_up ? tgt.y + tgt.height : tgt.y
+          [source_point, [bend_x, bend[1]], [bend_x, target_y]]
+        end
+
         # Absolute connection point EA docks the connector's visible
         # endpoint at, derived from the Geometry SX/SY (source) and
         # EX/EY (target) offsets. The offsets are measured inward from

data/lib/ea/svg/ea_emitter/element/header_line_provider/name.rb

@@ -33,8 +33,7 @@ module Ea
             end
 
             def self.wrapped_name_lines(classifier, context, weight)
-              name = display_name(classifier, context.diagram_package_id,
-                                  context.visually_nested)
+              name = display_name(classifier)
               unless context.bounds_width && name.include?("::") &&
                      name_exceeds_bounds?(name, context.bounds_width,
                                            context.font_size || 9)
@@ -51,12 +50,10 @@ module Ea
                 (bounds_width - QUALIFIED_WRAP_PADDING)
             end
 
-            # EA renders the plain classifier name in element headers
-            # (element ownership qualification is a display option the
-            # corpus diagrams leave off - verified against EA-published
-            # reference SVGs).
-            def self.display_name(classifier, _diagram_package_id = nil,
-                                  _visually_nested = false)
+            # EA renders the plain classifier name in element headers.
+            # (Some ISO-corpus diagrams show "Pkg::Name" headers — the
+            # storage of that flag is not in the QEA; render plain.)
+            def self.display_name(classifier, *_)
               classifier.name.to_s
             end
           end

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

@@ -17,8 +17,8 @@ module Ea
 
           # Delegate to the Name provider so historical callers and
           # specs that test display_name keep working.
-          def display_name(classifier, diagram_package_id = nil, *_)
-            HeaderLineProvider::Name.display_name(classifier, diagram_package_id)
+          def display_name(classifier, *_)
+            HeaderLineProvider::Name.display_name(classifier)
           end
         end
       end

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

@@ -136,21 +136,25 @@ module Ea
           end
 
           # EA centers the title over the ITEM BLOCK (icon left edge
-          # to the right end of the widest label), not the container
-          # box - verified against EA-published reference SVGs.
+          # to the right end of the widest label) by its INTEGER
+          # textLength and floors x - verified against EA-published
+          # reference SVGs.
           def title_x
             icon_left = bounds.x + ICON_X_OFFSET
             block_right = icon_left + ICON_LABEL_GAP +
                           widest_item_label_width
             block_left = icon_left
-            block_left + (block_right - block_left - title_text_width) / 2.0
+            (block_left + (block_right - block_left - title_text_width.round) / 2.0).floor
           end
 
           CJK_RANGE = /[\u3000-\u9fff\uff00-\uffef]/
 
-          # CJK glyphs run ~0.82em, others ~0.612em (regressed from
-          # EA's own textLength values on mixed-script labels).
+          # Real font metrics when available; legacy per-char
+          # estimate otherwise (families without metric tables).
           def estimated_width(text, size)
+            measured = Ea::Fonts::Metrics.text_length(text, size, family: family)
+            return measured if measured
+
             text.to_s.each_char.sum do |ch|
               ch.match?(CJK_RANGE) ? size * 0.70 : size * 0.612
             end
@@ -181,8 +185,7 @@ module Ea
             TextRenderer.new(
               content: content.to_s, x: tx, y: ty,
               family: family, size: size, size_unit: "pt",
-              weight: weight, fill: label_fill,
-              text_length: (content.to_s.length * size * 0.65).round
+              weight: weight, fill: label_fill
             ).to_svg
           end
 

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.9"
+  VERSION = "0.6.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-09-28 00:00:00.000000000 Z
+date: 2026-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model