ea 0.6.123 → 0.6.124

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d897b1e2165c9993420958c081ee3e2eedebbfbb8ac4db1ea8f160fd45913a3d
-  data.tar.gz: 667e5cce39c543c97f96fd7b64c994d72808daf3bf6a875ae112e0efe4b2623b
+  metadata.gz: dd02b1a50cdc130c8d08643767666068e9272158df4592e4bea690c1b1e7e778
+  data.tar.gz: dc499639ec487f46cc5ee952b1fa16ce58a7eb5fc57747ca4b9ff7584488fed4
 SHA512:
-  metadata.gz: e8789c4187a4c72534f2e4d17f1caf650e7da1748aa08bed49764fa6fde0dafdfc1bf8c6811ab7a33e31b6da1ffe0a71397b6ca60b1a8c2e7ee0e65a4798368d
-  data.tar.gz: 37bf77d8c14e921888081ee961506f835b5cd0de1bb28de790d5ba848003915922e83c83e2b29d6db0f58141f25dc1d643059f642950ee6cd2028da87d42b42f
+  metadata.gz: 537cd073276c4eb487d6848c28e5522df1c87cdf55170d2e94e4142f4ed3e6b2dd2544fc8220cbc75373fd33ac47349e25f0f979b126791d567946be3a3a2007
+  data.tar.gz: e07055d655ee0667d604a9089bf243ea3dc7d4e602035ec1a2a58e2db27f744e410dc4b095b3d85f0fdffd02a8068675c24c172bd44062a82d1259191242359d

data/lib/ea/model/legend.rb

@@ -21,6 +21,7 @@ module Ea
 
       attribute :title, :string, default: -> { DEFAULT_TITLE }
       attribute :heading_size, :integer
+      attribute :heading_family, :string
       attribute :font_color, :integer, default: -> { DEFAULT_FONT_COLOR }
       attribute :background_color, :integer, default: -> { DEFAULT_BACKGROUND_COLOR }
       attribute :border_color, :integer, default: -> { DEFAULT_BORDER_COLOR }
@@ -32,6 +33,7 @@ module Ea
         map "name", to: :name
         map "title", to: :title
         map "headingSize", to: :heading_size
+        map "headingFamily", to: :heading_family
         map "fontColor", to: :font_color
         map "backgroundColor", to: :background_color
         map "borderColor", to: :border_color

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

@@ -12,6 +12,7 @@ module Ea
       # Returns nil when no matching xref exists (the Text element
       # is not a legend — caller should render it as a plain note).
       class LegendBuilder
+        DEFAULT_HEADING_FAMILY = "Cambria"
         LEGEND_XREF_NAME = "CustomProperties"
         LEGEND_TYPE_OBJECT_STYLE = "LEGEND_OBJECTSTYLE"
         LEGEND_TYPE_STYLE_SETTINGS = "LEGEND_STYLE_SETTINGS"
@@ -77,6 +78,7 @@ module Ea
           Ea::Model::Legend.new(
             title: style["TITLE"] || Ea::Model::Legend::DEFAULT_TITLE,
             heading_size: int_or_nil(style["HEADINGSIZE"]),
+            heading_family: DEFAULT_HEADING_FAMILY,
             font_color: int_or(style["FONTCOLOR"],
                                Ea::Model::Legend::DEFAULT_FONT_COLOR),
             background_color: int_or(style["BACKGROUNDCOLOR"],

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

@@ -256,12 +256,14 @@ module Ea
         end
         private_class_method :default_model_connector?
 
-        # A thin straight Generalization/Aggregation/Association between two elements
-        # drawn with a 2px border stops on the outer edge of those borders.
+        # Thin connectors between explicitly bordered elements stop on the outer
+        # edge of their 2px borders, including package imports.
         def bordered_outline?(connector, diagram, refs, bounds)
           style = connector.style.to_h
           return false unless style[:lwidth] == "0" && !style[:tree]
-          return false unless %w[Generalization Aggregation Association Dependency].include?(connector.connector_type)
+          return false unless %w[Generalization Aggregation Association Dependency Package].include?(
+            connector.connector_type
+          )
           return false unless bounds.all? { |box| box.width.positive? && box.height.positive? }
 
           ends = [[refs.first, style[:soid]], [refs.last, style[:eoid]]]

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

@@ -40,6 +40,7 @@ module Ea
                           attr_line_offset: 6,
                           attr_first_offset: 7,
                           attr_group_lead: 0,
+                         compact_standard_operations: false,
                          family: nil, size_unit: "pt", logical_height: nil,
                           header_ghost: false,
                           header_ghost_tight: false)
@@ -61,6 +62,7 @@ module Ea
             @attr_line_offset = attr_line_offset
             @attr_first_offset = attr_first_offset
             @attr_group_lead = attr_group_lead
+            @compact_standard_operations = compact_standard_operations
             @header_ghost = header_ghost
             @header_ghost_tight = header_ghost_tight
           end
@@ -137,24 +139,29 @@ module Ea
           end
 
           def op_divider_y
+            return attr_bottom_y + line_height(attr_line_offset || 6) / 2.0 if compact_operation_spacing?
+
             attr_bottom_y + size + 5
           end
 
-          # EA's op block: first row 21 below the last attribute row
-          # (9pt... 7pt: attr_bottom + 21), uniform 13px pitch across
-          # attrs AND ops (6D4C665D: attrs ..520, ops 541..658 step 13).
-          # Attribute-empty boxes anchor on the divider instead:
-          # first op at divider + 14 (001A64C1: EA ops 104 vs our
-          # 125 when attrs were absent).
+          # Compact standard classes end attributes with a half row cell;
+          # operations then use the same inset as an attribute-empty box.
           def op_first_y
             return nil unless op_lines_count&.positive?
 
-            if attr_lines_count.to_i.positive?
-              attr_bottom_y + size + 14
-            else
-              divider_y + size + 7
-            end
+            anchor = if attr_lines_count.to_i.positive?
+                       compact_operation_spacing? ? op_divider_y : attr_bottom_y + 7
+                     else
+                       divider_y
+                     end
+            anchor + size + 7
+          end
+
+          def compact_operation_spacing?
+            @compact_standard_operations && attr_lines_count.to_i.positive? &&
+              Ea::Fonts::Metrics.compact_compartment_font?(size, family: @family, unit: @size_unit)
           end
+          private :compact_operation_spacing?
 
           def op_bottom_y
             return op_divider_y unless op_lines_count&.positive?

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

@@ -126,10 +126,16 @@ module Ea
 
           def item_label(item, index)
             x = bounds.x + ICON_X_OFFSET + ICON_LABEL_GAP
-            y = item_top_y(index) + LABEL_BASELINE_FROM_ICON_TOP
+            y = item_top_y(index) + item_label_baseline
             build_text(item.name, x: x, y: y, size: item_font_size, weight: 0)
           end
 
+          def item_label_baseline
+            return LABEL_BASELINE_FROM_ICON_TOP unless (item_font[:unit] || "pt") == "pt"
+
+            item_font[:logical_height] || LABEL_BASELINE_FROM_ICON_TOP
+          end
+
           def title_text
             x = title_x
             y = bounds.y + TITLE_Y_OFFSET
@@ -152,8 +158,8 @@ module Ea
 
           # Real font metrics when available; legacy per-char
           # estimate otherwise (families without metric tables).
-          def estimated_width(text, size, weight: nil, logical_height: nil)
-            measured = Ea::Fonts::Metrics.text_length(text, size, family: family, weight: weight,
+          def estimated_width(text, size, weight: nil, logical_height: nil, text_family: family)
+            measured = Ea::Fonts::Metrics.text_length(text, size, family: text_family, weight: weight,
                                                                   logical_height: logical_height)
             return measured if measured
 
@@ -186,7 +192,11 @@ module Ea
           end
 
           def title_text_width
-            estimated_width(legend.title, title_font_size, weight: 700)
+            estimated_width(legend.title, title_font_size, weight: 700, text_family: heading_family)
+          end
+
+          def heading_family
+            legend.heading_family || family
           end
 
           def build_text(content, x:, y:, size:, weight:)
@@ -194,7 +204,7 @@ module Ea
             size_unit = weight.zero? ? (item_font[:unit] || "pt") : "pt"
             TextRenderer.new(
               content: content.to_s, x: tx, y: ty,
-              family: family, size: size, size_unit: size_unit,
+              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
             ).to_svg
           end

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

@@ -332,8 +332,22 @@ module Ea
                                  constraints_count: 0, marker_count: 0,
                                  enum_literals_count: 0,
                                  attr_group_lead: 0, family: nil, size_unit: "pt", logical_height: nil)
+          divider_offset = divider_offset_for(header_lines, classifier)
+          attr_first_offset = attr_first_offset_for(attr_lines)
+          compact_standard = compact_header_offsets?(
+            classifier, header_lines, size,
+            family: family, size_unit: size_unit, logical_height: logical_height,
+            marker_count: marker_count, enum_literals_count: enum_literals_count,
+            divider_offset: divider_offset, attr_first_offset: attr_first_offset
+          )
+          if compact_standard
+            divider_offset = 7
+            # Attribute baselines retain their anchor when the divider moves up.
+            attr_first_offset = 8
+          end
           CompartmentGeometry.new(bounds: bounds, size: size, family: family,
                                   size_unit: size_unit, logical_height: logical_height,
+                                   compact_standard_operations: compact_standard,
                                    header_ghost: header_lines.any? &&
                                                   %i[italic italic_tight].include?(header_lines.first.last),
                                    header_ghost_tight: Element::HeaderLines.parent_ghost_gap(header_lines) == 3,
@@ -346,12 +360,21 @@ module Ea
                                    enum_literals_count: enum_literals_count,
                                    header_top_padding: header_padding_for(header_lines, classifier),
                                    header_line_offset: theme.compartments.header_line_offset,
-                                   divider_offset: divider_offset_for(header_lines, classifier),
+                                   divider_offset: divider_offset,
                                    attr_line_offset: theme.compartments.attr_line_offset,
-                                   attr_first_offset: attr_first_offset_for(attr_lines),
+                                   attr_first_offset: attr_first_offset,
                                    attr_group_lead: attr_group_lead)
         end
 
+        def compact_header_offsets?(classifier, header_lines, size, **options)
+          classifier.is_a?(Ea::Model::Klass) &&
+            Ea::Fonts::Metrics.compact_compartment_font?(size, family: options[:family], unit: options[:size_unit]) &&
+            !%i[italic italic_tight].include?(header_lines.dig(0, 1)) &&
+            options.values_at(:logical_height, :marker_count, :enum_literals_count,
+                              :divider_offset, :attr_first_offset) == [nil, 0, 0, 8, 7] &&
+            theme.compartments.header_line_offset == 6 && theme.compartments.attr_line_offset == 6
+        end
+
         # EA seats a stereotype line 3px higher than a bare class name
         # (first baseline +16 vs +19 at 7pt) - and Enumeration /
         # Interface elements seat their stereotype 3px higher still

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.123"
+  VERSION = "0.6.124"
 end

metadata

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