ea 0.6.60 → 0.6.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74995f05048489005215ea547e1d10648ef1b4f17be970c6bceda2ff4ca139cf
-  data.tar.gz: a2ec5ef474b301d6cdb7cf27794445d58f82d0d6f08cb4da4f66efbbc52ef822
+  metadata.gz: 30cdaecff7833cb3af1138d6ac1df0667dbdde2e3b6f109ae456cd6c3c5e1dab
+  data.tar.gz: 9d6fc9c8bd00571d092bcb8250260195758514e7edb62993a5e08c3a19ce0bde
 SHA512:
-  metadata.gz: 6062986ad82080887177382bddda45367107116d79289ea5a1b1a4dfd0a5d1bc038185ada0dbaa41f25898469e954b5d48b129ae2e5f79cbbe7f0e202d7bc152
-  data.tar.gz: 0d4310ae1e346347442604db6f92655ce95c3090e5dc287f9c5185f722c9b215df0d59432362af4a42280d3918bed016e0a3a166eaab8fd1e92634a3cea05349
+  metadata.gz: 04b411c70b7d59ec632737088134fdf6cb41205444aa754294f5b6e66406ff49cdcd08fbff7094ecfbd70f62559949255f30783dc1f481a104465e551ce8aabe
+  data.tar.gz: d06fa28bb5c00f669c4d6ac3b99abfc5f410680d1a0a9770ff9969b7ed2ad5dd7753b17964c2553189e217ce67f3ed6875fbaf7e404f3c11d813c7781951a8bb

data/lib/ea/fonts/metrics.rb

@@ -53,16 +53,43 @@ module Ea
 
       # Width of `text` in EA's exported SVG units for the given pt
       # size, or nil when the family is not metric-compatible.
+      #
+      # EA's GDI driver quantizes each glyph advance to an integer
+      # pixel count at the logical font height H = round(pt * 10/7)
+      # (Carlito: 7pt -> H10, 9pt -> H13) and the published
+      # textLength is the SUM of those per-glyph integers - corpus
+      # fitted to 97-100% exact on 10k Carlito texts (bold 7pt
+      # 1666/1671). The legacy sum-then-round model matched only 27%.
       def text_length(text, size_pt, family: nil, weight: nil, style: nil)
         return nil unless supported_family?(family)
         return nil if text.nil? || text.empty?
 
-        latin, cjk_count = split_advance(text, family: family,
-                                                weight: weight, style: style)
-        (latin * size_pt.to_f * factor_for(family, size_pt, weight, style) +
+        resolved = resolve_family(family)
+        if GDI_HEIGHT_FAMILIES.include?(resolved)
+          height = (size_pt.to_f * 10 / 7).round
+          table = table_for(family, weight, style)
+          latin = 0
+          cjk_count = 0
+          text.each_char do |ch|
+            if cjk?(ch.ord)
+              cjk_count += 1
+            else
+              latin += ((table[cp_key(ch)] || DEFAULT_ADVANCE) * height).round
+            end
+          end
+          return latin + cjk_count * CJK_ADVANCE * size_pt.to_f
+        end
+
+        _latin, cjk_count = split_advance(text, family: family,
+                                                 weight: weight, style: style)
+        (_latin * size_pt.to_f * factor_for(family, size_pt, weight, style) +
          cjk_count * CJK_ADVANCE * size_pt.to_f).round(3)
       end
 
+      # Families whose EA driver quantizes per-glyph advances
+      # (fitted from published textLengths).
+      GDI_HEIGHT_FAMILIES = %w[Carlito].freeze
+
       def supported_family?(family)
         !resolve_family(family).nil?
       end

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

@@ -262,18 +262,19 @@ module Ea
         # (+13). Corpus-verified by identity-matched elements:
         # Interface +13 x44 vs +16 x17, Enumeration +13 x13 vs +16
         # x3, Class/Object/DataType +16 x515.
-        # True Interface-typed elements (fallback «interface» label,
-        # no stored stereotype) track the divider at last header + 9
-        # instead of +8: 96EFAA3B/936AA434 compartments sit one
-        # pixel lower than the class rule, while Class-typed elements
-        # carrying an explicit "interface" stereotype keep +8
-        # (5EA23C08's CoordinateSet).
+        # True Interface-typed elements with no stored stereotype
+        # track the divider at last header + 9 instead of +8 - also
+        # when a parent GHOST leads the header (936AA434/Surface:
+        # ghost «interface» name, attrs at 152 not 151), while
+        # Class-typed elements carrying an explicit "interface"
+        # stereotype keep +8 (5EA23C08's CoordinateSet).
         def divider_offset_for(header_lines, classifier)
           first = header_lines.first
           return theme.compartments.divider_offset unless first
 
           if classifier.is_a?(Ea::Model::Interface) &&
-             fallback_stereotype_label?(first.first, classifier)
+             !(classifier.respond_to?(:stereotype_refs) &&
+               classifier.stereotype_refs&.any?)
             9
           else
             theme.compartments.divider_offset

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.60"
+  VERSION = "0.6.62"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.60
+  version: 0.6.62
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-07 00:00:00.000000000 Z
+date: 2026-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model