ea 0.6.51 → 0.6.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bac390d3be1320d1679f33e3ed0e83b0982c02faea48f6ebbc2acdc31aa345b
-  data.tar.gz: c0ffb44d6f3cb775e37edbbe8fc10ddfb10a802c9555846aba5f21188901c3dc
+  metadata.gz: '007348c214ad1a2ed4226d46e55a528dafcb12d9e4b5eae9e4d3a3e7d13b5c8c'
+  data.tar.gz: 7b6af86fe7a76f8661c993b2559345d1538ef5fda6f4fa912f6925be4e4a79f2
 SHA512:
-  metadata.gz: b380504257c1e1b3ad40852561d4535e4a2dd4f6894427715eeb2a192b7ca7b9d43b77bed8d9c6c28bfaacf0d62586f4204fac00d3e6642646f1f3f214f2e0e3
-  data.tar.gz: 80acb5162983cbe2052c63bbb417adb0a019be316eba63aeb54166680f6c68b4865b2da41378eff7fd9dcc5eab117a46bbc2a577e426451b95bc75a222c556d0
+  metadata.gz: 4b75f8f3f76d3c4433f147c7f9afba023c84f7961e5c901465c6d237a8775817d130596b4c75714d0bc367bc7605e5db1b356bc8bff2d23a45b723e77deaadf3
+  data.tar.gz: e6d556ef5bdc04dad2fe196d26114672d7f7b0c9c5e580588279697f3ec5c45538d0fd0729a5847716dd01b98acb64a529aa1d19c38363a99fc307168e5554c6

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

@@ -112,12 +112,14 @@ module Ea
         end
 
         # EA stores the element font size in tenths of a point in the
-        # objectstyle string. 0 means "use default", and 80/90 (8pt /
-        # 9pt) are EA's classic defaults the dialogs write back when
-        # the user never customized — verified against EA-published
-        # reference images, where such elements render at the theme
-        # size. Only genuinely custom sizes are surfaced as explicit
-        # element fonts.
+        # objectstyle string, SHIFTED one point up from what it
+        # renders: explicit fontsz 100 renders 9pt (0D31AED1: every
+        # element stores 100, all 321 texts publish at 9pt), 70
+        # renders 6pt, 140 renders 13pt. 0 means "use default", and
+        # 80/90 (8pt / 9pt) are EA's classic defaults the dialogs
+        # write back when the user never customized — such elements
+        # render at the theme size. Only genuinely custom sizes are
+        # surfaced as explicit element fonts.
         USE_DEFAULT_FONTSZ = [0, 80, 90].freeze
 
         def font_size_from(style_hash)
@@ -126,23 +128,9 @@ module Ea
 
           return nil if raw.to_i.zero?
 
-          stored = (raw.to_f / 10).round
-          return stored - 1 if note_element? && stored > 1
-
           return nil if USE_DEFAULT_FONTSZ.include?(raw.to_i)
 
-          stored
-        end
-
-        # Text/Note elements carry their real font size in fontsz
-        # shifted by one point (stored 100 renders 9pt, 80 renders
-        # 7pt - corpus-verified on EA-published note SVGs);
-        # classifiers keep the use-default convention.
-        def note_element?
-          return false unless database && @current_obj_row
-
-          obj = database.find_object(@current_obj_row.ea_object_id.to_i)
-          obj&.object_type.to_s == "Text"
+          (raw.to_f / 10).round - 1
         end
 
         def build_connectors(diagram_row)

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

@@ -33,6 +33,7 @@ module Ea
             multiplicity_upper_raw: raw_upper(row),
             multiplicity_upper: parse_upper(row),
             default_value: row.default,
+            is_derived: boolean(row.derived),
             is_ordered: boolean(row.isordered),
             is_unique: !boolean(row.allowduplicates),
             visibility: visibility_from_scope(row.scope),

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

@@ -64,6 +64,10 @@ module Ea
           def namespaced_name
             prefix = inherited_namespace_prefix
             base = property.name.to_s
+            # EA flags derived attributes with a '/' on the NAME (the
+            # visibility slot still shows '+'): 096AF2FD/GM_GriddedSurface
+            # renders "+ /columns: Integer" / "+ /rows: Integer".
+            base = "/#{base}" if property.is_derived
             prefix && !prefix.empty? ? "#{prefix}::#{base}" : base
           end
 

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

@@ -129,8 +129,11 @@ module Ea
                                                                 foreign_package_name: foreign_package_name_for(classifier),
                                                                 suppress_stereotypes: suppress_stereotypes?) : []
           is_classifier = classifier.is_a?(Ea::Model::Classifier)
+          # Interfaces DO render attribute compartments when they own
+          # attribute rows (936AA434/Surface lists its nine 19107
+          # attributes); the earlier corpus evidence for
+          # header-only interfaces was zero-attribute leaf types.
           attr_lines = if is_classifier && show_attributes? &&
-                          !classifier.is_a?(Ea::Model::Interface) &&
                           attributes_visible?(element)
                          Element::AttributeRenderer.lines_for(
                            classifier, lookup: attribute_lookup,
@@ -263,7 +266,7 @@ module Ea
           first = header_lines.first
           return theme.compartments.header_top_padding unless first
 
-          if first.last == :italic
+          if first.last == :italic || first.last == :italic_tight
             6 # ghost-led: EA seats the right-aligned ghost at +13
           elsif first.first.to_s.start_with?("«")
             enumeration_or_interface?(classifier) ? 6 : 9

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

@@ -42,8 +42,11 @@ module Ea
           explicit = element&.font_size
           explicit = nil if explicit&.zero?
           return explicit if explicit
-          return diagram_default_size if diagram_default_size
 
+          # An element's own explicit fontsz never re-sizes its
+          # neighbours: default elements always render at the theme
+          # size (9BA1CE54: one 9pt label + six use-default
+          # instances; EA publishes the six at 7pt).
           DEFAULT_ELEMENT_FONT_SIZE
         end
 
@@ -77,13 +80,6 @@ module Ea
           most_common(families)
         end
 
-        def diagram_default_size
-          sizes = element_sizes
-          return nil if sizes.empty?
-
-          most_common(sizes)
-        end
-
         FALLBACK_DEFAULT_FAMILY = "Calibri"
 
         def most_common(values)
@@ -97,10 +93,6 @@ module Ea
           (diagram.elements || []).map(&:font_family).compact
         end
 
-        def element_sizes
-          (diagram.elements || []).map(&:font_size).compact.reject(&:zero?)
-        end
-
         def tally_values(values)
           values.each_with_object(Hash.new(0)) { |v, acc| acc[v] += 1 }
         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.51"
+  VERSION = "0.6.53"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.51
+  version: 0.6.53
 platform: ruby
 authors:
 - Ribose Inc.